Satellite.hpp   Satellite.hpp 
skipping to change at line 31 skipping to change at line 31
#define _SATELLITE_HPP_ 1 #define _SATELLITE_HPP_ 1
#include <QVariant> #include <QVariant>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QFont> #include <QFont>
#include <QList> #include <QList>
#include <QDateTime> #include <QDateTime>
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelTextureTypes.hpp"
#include "StelSphereGeometry.hpp" #include "StelSphereGeometry.hpp"
#include "StelProjectorType.hpp"
#include "StelPainter.hpp"
#include "gSatWrapper.hpp" #include "gSatWrapper.hpp"
class StelPainter;
class StelLocation; class StelLocation;
typedef struct typedef struct
{ {
double frequency; double frequency;
QString modulation; QString modulation;
QString description; QString description;
} commLink; } commLink;
//! @class Satellite //! @class Satellite
skipping to change at line 122 skipping to change at line 120
static QString extractInternationalDesignator(const QString& tle1); static QString extractInternationalDesignator(const QString& tle1);
static int extractLaunchYear(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(class StelRenderer* renderer, StelProjectorP projecto r);
//! 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.
float calculateOrbitSegmentIntensity(int segNum); float calculateOrbitSegmentIntensity(int segNum);
void setNightColors(bool night); void setNightColors(bool night);
private: private:
bool initialized; bool initialized;
bool visible; bool visible;
bool orbitVisible; // draw orbit enabled/disabled bool orbitVisible; // draw orbit enabled/disabled
bool newlyAdded; bool newlyAdded;
skipping to change at line 157 skipping to change at line 155
double jdLaunchYearJan1; 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 SphericalCap viewportHalfspace; static SphericalCap viewportHalfspace;
static float hintBrightness; static float hintBrightness;
static float hintScale; static float hintScale;
static int orbitLineSegments; static int orbitLineSegments;
static int orbitLineFadeSegments; static int orbitLineFadeSegments;
static int orbitLineSegmentDuration; //measured in seconds static int orbitLineSegmentDuration; //measured in seconds
static bool orbitLinesFlag; static bool orbitLinesFlag;
void draw(const StelCore* core, StelPainter& painter, float maxMagHi void draw(const StelCore* core, class StelRenderer* renderer,
nts); StelProjectorP projector, class StelTextureNew* hintTextur
e);
//Satellite Orbit Position calculation //Satellite Orbit Position calculation
gSatWrapper *pSatWrapper; gSatWrapper *pSatWrapper;
Vec3d position; Vec3d position;
Vec3d velocity; Vec3d velocity;
Vec3d latLongSubPointPosition; Vec3d latLongSubPointPosition;
Vec3d elAzPosition; Vec3d elAzPosition;
int visibility; int visibility;
//Satellite Orbit Draw //Satellite Orbit Draw
QFont font; QFont font;
Vec3f orbitColorNormal; Vec3f orbitColorNormal;
Vec3f orbitColorNight; Vec3f orbitColorNight;
Vec3f* orbitColor; Vec3f* orbitColor;
double lastEpochCompForOrbit; //measured in Julian Days double lastEpochCompForOrbit; //measured in Julian Days
double epochTime; //measured in Julian Days double epochTime; //measured in Julian Days
QList<Vec3d> orbitPoints; //orbit points represented by ElAzPos vect ors QList<Vec3d> orbitPoints; //orbit points represented by ElAzPos vect ors
 End of changes. 8 change blocks. 
14 lines changed or deleted 12 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/