Satellite.cpp   Satellite.cpp 
skipping to change at line 195 skipping to change at line 195
QVariantList col, orbitCol; QVariantList col, orbitCol;
col << roundToDp(hintColor[0],3) << roundToDp(hintColor[1], 3) << ro undToDp(hintColor[2], 3); col << roundToDp(hintColor[0],3) << roundToDp(hintColor[1], 3) << ro undToDp(hintColor[2], 3);
orbitCol << roundToDp(orbitColor[0], 3) << roundToDp(orbitColor[1], 3) << roundToDp(orbitColor[2],3); orbitCol << roundToDp(orbitColor[0], 3) << roundToDp(orbitColor[1], 3) << roundToDp(orbitColor[2],3);
map["hintColor"] = col; map["hintColor"] = col;
map["orbitColor"] = orbitCol; map["orbitColor"] = orbitCol;
QVariantList commList; QVariantList commList;
foreach(const CommLink &c, comms) foreach(const CommLink &c, comms)
{ {
QVariantMap commMap; QVariantMap commMap;
commMap["frequency"] = c.frequency; commMap["frequency"] = c.frequency;
if (!c.modulation.isEmpty() && c.modulation != "") commMap[" if (!c.modulation.isEmpty()) commMap["modulation"] = c.modul
modulation"] = c.modulation; ation;
if (!c.description.isEmpty() && c.description != "") commMap if (!c.description.isEmpty()) commMap["description"] = c.des
["description"] = c.description; cription;
commList << commMap; commList << commMap;
} }
map["comms"] = commList; map["comms"] = commList;
QVariantList groupList; QVariantList groupList;
foreach(const QString &g, groups) foreach(const QString &g, groups)
{ {
groupList << g; groupList << g;
} }
map["groups"] = groupList; map["groups"] = groupList;
skipping to change at line 570 skipping to change at line 570
RCMag rcMag; RCMag rcMag;
Vec3f color = Vec3f(1.f,1.f,1.f); Vec3f color = Vec3f(1.f,1.f,1.f);
StelProjectorP origP = painter.getProjector(); // Sa ve projector state StelProjectorP origP = painter.getProjector(); // Sa ve projector state
painter.setProjector(prj); painter.setProjector(prj);
sd->preDrawPointSource(&painter); sd->preDrawPointSource(&painter);
if (mag <= sd->getLimitMagnitude()) if (mag <= sd->getLimitMagnitude())
{ {
sd->computeRCMag(mag, &rcMag); sd->computeRCMag(mag, &rcMag);
sd->drawPointSource(&painter, Vec3f(XYZ[0], XYZ[1], XYZ[2]), rcMag, color, true); sd->drawPointSource(&painter, Vec3f(XYZ[0],X YZ[1],XYZ[2]), rcMag, color, true);
painter.setColor(color[0], color[1], color[2 ], 1); painter.setColor(color[0], color[1], color[2 ], 1);
if (Satellite::showLabels) if (Satellite::showLabels)
painter.drawText(XYZ, name, 0, 10, 1 0, false); painter.drawText(XYZ, name, 0, 10, 1 0, false);
} }
sd->postDrawPointSource(&painter); sd->postDrawPointSource(&painter);
painter.setProjector(origP); // Restrore projector s tate painter.setProjector(origP); // Restrore projector s tate
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 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/