[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:38:57
Message-ID: 1218735537.888594.25902.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 847081 by hdevalence:
Reverse accidentally committed changes
M +1 -1 CMakeLists.txt
M +1 -5 satellites/SatellitesPlugin.cpp
M +1 -58 satellites/SatellitesPlugin.h
--- trunk/KDE/kdeedu/marble/src/plugins/marble/CMakeLists.txt #847080:847081
@@ -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/satellites/SatellitesPlugin.cpp \
#847080:847081 @@ -63,15 +63,11 @@
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 m_init;
+ return true;
}
bool SatellitesPlugin::render( GeoPainter *painter, ViewportParams *viewport, const \
QString& renderPos, GeoSceneLayer * layer )
--- trunk/KDE/kdeedu/marble/src/plugins/marble/satellites/SatellitesPlugin.h \
#847080:847081 @@ -19,57 +19,6 @@
{
/**
- * \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).
*
*/
@@ -91,14 +40,8 @@
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;
-
};
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic