Satellite.hpp   Satellite.hpp 
skipping to change at line 93 skipping to change at line 93
virtual float getVMagnitude(const StelCore* core=NULL, bool withExti nction=false) const; virtual float getVMagnitude(const StelCore* core=NULL, bool withExti nction=false) const;
virtual double getAngularSize(const StelCore* core) const; virtual double getAngularSize(const StelCore* core) const;
virtual QString getNameI18n(void) const virtual QString getNameI18n(void) const
{ {
return name; return name;
} }
virtual QString getEnglishName(void) const virtual QString getEnglishName(void) const
{ {
return name; return name;
} }
//! Returns the (NORAD) catalog number. (For now, the ID string.)
QString getCatalogNumberString() const {return id;}
//! Set new tleElements. This assumes the designation is already se t, populates //! Set new tleElements. This assumes the designation is already se t, populates
//! the tleElements values and configures internal orbit parameters. //! the tleElements values and configures internal orbit parameters.
void setNewTleElements(const QString& tle1, const QString& tle2); void setNewTleElements(const QString& tle1, const QString& tle2);
// calculate faders, new position // calculate faders, new position
void update(double deltaTime); void update(double deltaTime);
double getDoppler(double freq) const; double getDoppler(double freq) const;
static float showLabels; static float showLabels;
static double roundToDp(float n, int dp); static double roundToDp(float n, int dp);
// when the observer location changes we need to // when the observer location changes we need to
void recalculateOrbitLines(void); void recalculateOrbitLines(void);
void setNew() {newlyAdded = true;} void setNew() {newlyAdded = true;}
bool isNew() const {return newlyAdded;} bool isNew() const {return newlyAdded;}
static QString extractInternationalDesignator(const QString& tle1); static QString extractInternationalDesignator(const QString& tle1);
static int extractLaunchYear(const QString& tle1);
public: public:
void enableDrawOrbit(bool b); void enableDrawOrbit(bool b);
private: private:
//draw orbits methods //draw orbits methods
void computeOrbitPoints(); void computeOrbitPoints();
void drawOrbit(StelPainter& painter); void drawOrbit(StelPainter& painter);
//! returns 0 - 1.0 for the DRAWORBIT_FADE_NUMBER segments at //! returns 0 - 1.0 for the DRAWORBIT_FADE_NUMBER segments at
//! each end of an orbit, with 1 in the middle. //! each end of an orbit, with 1 in the middle.
skipping to change at line 143 skipping to change at line 146
//! Currently, the Satellite Catalog Number is used. It is contained in both //! Currently, the Satellite Catalog Number is used. It is contained in both
//! numbered lines of TLE sets. //! numbered lines of TLE sets.
QString id; QString id;
//! Human-readable name of the satellite. //! Human-readable name of the satellite.
//! Usually the string in the "Title line" of TLE sets. //! Usually the string in the "Title line" of TLE sets.
QString name; QString name;
//! Longer description of the satellite. //! Longer description of the satellite.
QString description; QString description;
//! International Designator / COSPAR designation / NSSDC ID //! International Designator / COSPAR designation / NSSDC ID
QString internationalDesignator; QString internationalDesignator;
//! JD for Jan 1st of launch year, extracted from TLE (will be for 1
957-1-1 if extraction fails). Used to hide objects before launch year.
double jdLaunchYearJan1;
//! Contains the J2000 position //! Contains the J2000 position
Vec3d XYZ; Vec3d XYZ;
QPair< QByteArray, QByteArray > tleElements; QPair< QByteArray, QByteArray > tleElements;
double height, range, rangeRate; double height, range, rangeRate;
QList<commLink> comms; QList<commLink> comms;
Vec3f hintColor; Vec3f hintColor;
QStringList groupIDs; QStringList groupIDs;
QDateTime lastUpdated; QDateTime lastUpdated;
static StelTextureSP hintTexture; static StelTextureSP hintTexture;
 End of changes. 3 change blocks. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/