Satellite.cpp   Satellite.cpp 
skipping to change at line 120 skipping to change at line 120
QVariantMap commMap; QVariantMap commMap;
commMap["frequency"] = c.frequency; commMap["frequency"] = c.frequency;
if (!c.modulation.isEmpty() && c.modulation != "") commMap[" modulation"] = c.modulation; if (!c.modulation.isEmpty() && c.modulation != "") commMap[" modulation"] = c.modulation;
if (!c.description.isEmpty() && c.description != "") commMap ["description"] = c.description; if (!c.description.isEmpty() && c.description != "") commMap ["description"] = c.description;
commList << commMap; commList << commMap;
} }
map["comms"] = commList; map["comms"] = commList;
return map; return map;
} }
float Satellite::getSelectPriority(const StelNavigator *nav) const float Satellite::getSelectPriority(const StelNavigator*) const
{ {
return -10.; return -10.;
} }
QString Satellite::getInfoString(const StelCore *core, const InfoStringGrou p& flags) const QString Satellite::getInfoString(const StelCore *core, const InfoStringGrou p& flags) const
{ {
QString str; QString str;
QTextStream oss(&str); QTextStream oss(&str);
if (flags&Name) if (flags&Name)
skipping to change at line 196 skipping to change at line 196
} }
obs_geodetic.lon = l.longitude * de2ra; obs_geodetic.lon = l.longitude * de2ra;
obs_geodetic.lat = l.latitude * de2ra; obs_geodetic.lat = l.latitude * de2ra;
obs_geodetic.alt = l.altitude / 1000.0; obs_geodetic.alt = l.altitude / 1000.0;
} }
Vec3f Satellite::getInfoColor(void) const { Vec3f Satellite::getInfoColor(void) const {
return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : hintColor; return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : hintColor;
} }
float Satellite::getVMagnitude(const StelNavigator* nav) const float Satellite::getVMagnitude(const StelNavigator*) const
{ {
return 5.0; return 5.0;
} }
double Satellite::getAngularSize(const StelCore *core) const double Satellite::getAngularSize(const StelCore*) const
{ {
return 0.00001; return 0.00001;
} }
void Satellite::update(double deltaTime) void Satellite::update(double)
{ {
ClearFlag(ALL_FLAGS); ClearFlag(ALL_FLAGS);
Get_Next_Tle_Set(elements, &tle); Get_Next_Tle_Set(elements, &tle);
memcpy(&localtle, &tle, sizeof(tle_t)); memcpy(&localtle, &tle, sizeof(tle_t));
select_ephemeris(&tle); select_ephemeris(&tle);
double jul_epoch, jul_utc, tsince, phase; double jul_epoch, jul_utc, tsince, phase;
vector_t vel = {0,0,0,0}; vector_t vel = {0,0,0,0};
vector_t pos = {0,0,0,0}; vector_t pos = {0,0,0,0};
vector_t obs_set; vector_t obs_set;
geodetic_t sat_geodetic; geodetic_t sat_geodetic;
skipping to change at line 248 skipping to change at line 248
} }
double Satellite::getDoppler(double freq) const double Satellite::getDoppler(double freq) const
{ {
double result; double result;
double f = freq * 1000000; double f = freq * 1000000;
result = -f*((rangeRate*1000.0)/SPEED_OF_LIGHT); result = -f*((rangeRate*1000.0)/SPEED_OF_LIGHT);
return result/1000000; return result/1000000;
} }
void Satellite::draw(const StelCore* core, StelPainter& painter, float maxM agLabel) void Satellite::draw(const StelCore* core, StelPainter& painter, float)
{ {
float a = (azimuth-90)*M_PI/180; float a = (azimuth-90)*M_PI/180;
Vec3f pos(sin(a),cos(a), tan(elevation * M_PI / 180.)); Vec3d pos(sin(a),cos(a), tan(elevation * M_PI / 180.));
XYZ = core->getNavigator()->j2000ToEquinoxEqu(core->getNavigator()-> altAzToEquinoxEqu(pos)); XYZ = core->getNavigator()->j2000ToEquinoxEqu(core->getNavigator()-> altAzToEquinoxEqu(pos));
StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0, 1.0) : glColor4f(hintColor[0],hintColor[1],hintColor[2], Satellite::hintBri ghtness); StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0, 1.0) : glColor4f(hintColor[0],hintColor[1],hintColor[2], Satellite::hintBri ghtness);
StelProjectorP prj = core->getProjection(StelCore::FrameJ2000); StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
Vec3d xy; Vec3d xy;
if (prj->project(XYZ,xy)) if (prj->project(XYZ,xy))
{ {
if (Satellite::showLabels) if (Satellite::showLabels)
{ {
painter.drawText(xy[0], xy[1], designation, 0, 10, 1 0, false); painter.drawText(xy[0], xy[1], designation, 0, 10, 1 0, false);
 End of changes. 6 change blocks. 
6 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/