[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/plugins/marble
From:       Henry de Valence <hdevalence () gmail ! com>
Date:       2008-08-14 17:24:09
Message-ID: 1218734649.257750.25527.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 847078 by hdevalence:

Fix Krazy spelling errors


 M  +1 -1      CMakeLists.txt  
 M  +1 -1      panoramio/jsonparser.h  
 M  +5 -1      satellites/SatellitesPlugin.cpp  
 M  +58 -1     satellites/SatellitesPlugin.h  
 M  +1 -1      twitter/jsonparser.h  
 M  +1 -1      twitter/twitterPlugin.h  


--- trunk/KDE/kdeedu/marble/src/plugins/marble/CMakeLists.txt #847077:847078
@@ -8,4 +8,4 @@
 add_subdirectory( stars )
 # add_subdirectory( panoramio )
 # add_subdirectory ( twitter )
-# add_subdirectory( navigation )
+add_subdirectory( navigation )
--- trunk/KDE/kdeedu/marble/src/plugins/marble/panoramio/jsonparser.h #847077:847078
@@ -20,7 +20,7 @@
 #include <QtScript/QScriptEngine>
 /**
 This is a generic class built up for parsing Json that is JavaScript Object \
                Notification
-FIXME: the class presently has no sanity checking mechanism,, it just can't check \
wether the input given to it is only JSON or Javascript ; a point of potential breach \
for the software. +FIXME: the class presently has no sanity checking mechanism, it \
just can't check whether the input given to it is only JSON or Javascript ; a point \
of potential breach for the software.  sanity checking would include :
 (1)regex matching for following characters "" {} , [a-zA-Z] everything else should \
be discarded (but some unicode names could pose problem)  (2)checking for javascript \
                constructs and eliminating them.
--- trunk/KDE/kdeedu/marble/src/plugins/marble/satellites/SatellitesPlugin.cpp \
#847077:847078 @@ -63,11 +63,15 @@
 
 void SatellitesPlugin::initialize ()
 {
+    QStoragePolicy policy = dynamic_cast<StoragePolicy*>(new FileStoragePolicy
+    m_dlman = new HttpDownloadManager( QUrl( "http://celestrak.com" ),
+                                       new FileStoragePolicy( \
MarbleDirs::localPath() ) ); +    
 }
 
 bool SatellitesPlugin::isInitialized () const
 {
-    return true;
+    return m_init;
 }
 
 bool SatellitesPlugin::render( GeoPainter *painter, ViewportParams *viewport, const \
                QString& renderPos, GeoSceneLayer * layer )
--- trunk/KDE/kdeedu/marble/src/plugins/marble/satellites/SatellitesPlugin.h \
#847077:847078 @@ -19,6 +19,57 @@
 {
 
 /**
+ * \brief This class represents the data from the NASA/NORAD Two-line-elements \
format. + * See http://en.wikipedia.org/wiki/Orbital_elements#Two_line_elements
+ */
+class tleSatellite : public QObject
+{
+    Q_OBJECT
+public:
+    Satellite( QString firstLine, QString secondLine );
+    bool isValid();
+    //line 1
+    int getCatalogNum();
+    QChar securityClass();
+    QString internationalId();
+    QDateTime epochTime();
+    qreal  firstTimeDeriv();
+    qreal secondTimeDeriv();
+    qreal bstarDrag();
+    int elementNum();
+    //line 2
+    qreal inclination(); // in RADIANS
+    qreal raAscendingNode(); // in RADIANS
+    qreal eccentricity();
+    qreal argPerigee();  // in RADIANS
+    qreal meanAnomaly(); // in RADIANS
+    qreal meanMotion(); //revs per day
+    
+public slots:
+    update( QString firstLine, QString secondLine );
+private:
+    QString m_firstLine;
+    QString m_secondLine;
+    parse();
+    
+    int m_catalogNum;
+    QChar m_securityClass;
+    QString m_internationalId;
+    QDateTime m_epochTime;
+    qreal m_firstTimeDeriv;
+    qreal m_secondTimeDeriv;
+    qreal m_bstarDrag;
+    int m_elementNum;
+    
+    qreal m_inclination; // in RADIANS
+    qreal m_raAscendingNode; // in RADIANS
+    qreal m_eccentricity;
+    qreal m_argPerigee;  // in RADIANS
+    qreal m_meanAnomaly; // in RADIANS
+    qreal m_meanMotion; //revs per day
+};
+    
+/**
  * \brief This class displays a layer of satellites (which satellites TBD).
  *
  */
@@ -40,8 +91,14 @@
     void initialize ();
     bool isInitialized () const;
     bool render( GeoPainter *painter, ViewportParams *viewport, const QString& \
                renderPos, GeoSceneLayer * layer = 0 );
-
+public slots:
+    void tleDownloadComplete( QString fname, QString id );
 //    QTimer* m_timer; /**< Timer to set the update interval */
+private:
+    HttpDownloadManager *m_dlman;
+    QString 
+	bool m_init;
+    
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/plugins/marble/twitter/jsonparser.h #847077:847078
@@ -20,7 +20,7 @@
 #include <QtScript/QScriptEngine>
 /**
 This is a generic class built up for parsing Json that is JavaScript Object \
                Notification
-FIXME: the class presently has no sanity checking mechanism,, it just can't check \
wether the input given to it is only JSON or Javascript ; a point of potential breach \
for the software. +FIXME: the class presently has no sanity checking mechanism, it \
just can't check whether the input given to it is only JSON or Javascript ; a point \
of potential breach for the software.  sanity checking would include :
 (1)regex matching for following characters "" {} , [a-zA-Z] everything else should \
be discarded (but some unicode names could pose problem)  (2)checking for javascript \
                constructs and eliminating them.
--- trunk/KDE/kdeedu/marble/src/plugins/marble/twitter/twitterPlugin.h #847077:847078
@@ -80,7 +80,7 @@
     HttpDownloadManager *m_downloadManager;
     jsonParser twitterJsonParser;
     void downloadtwitter(int, int, double, double, double, double);
-    QList <twitterStructure > twitsWithLocation;//this list will hold pointers to \
TWITT we have downloaded succesfully figured out :) +    QList <twitterStructure > \
twitsWithLocation;//this list will hold pointers to TWITT we have downloaded \
successfully figured out :)  QList <twitterDataStructure> parsedData;
     void findLatLonOfStreetAddress(QString streetAddress);
     int privateFlagForRenderingTwitts;//this flag is one when globe has an Image  \
(downloaded or already there in cache)


[prev in list] [next in list] [prev in thread] [next in thread]