Observability.cpp   Observability.cpp 
skipping to change at line 104 skipping to change at line 104
, selRA(0.) , selRA(0.)
, selDec(0.) , selDec(0.)
, alti(0.) , alti(0.)
, horizH(0.) , horizH(0.)
, culmAlt(0.) , culmAlt(0.)
, MoonRise(0.) , MoonRise(0.)
, MoonSet(0.) , MoonSet(0.)
, MoonCulm(0.) , MoonCulm(0.)
, lastJDMoon(0.) , lastJDMoon(0.)
, ObserverLoc(0.) , ObserverLoc(0.)
, myPlanet(NULL) , myPlanet(Q_NULLPTR)
, nDays(0) , nDays(0)
, dmyFormat(false) , dmyFormat(false)
, hasRisen(false) , hasRisen(false)
, configChanged(false) , configChanged(false)
, souChanged(false) , souChanged(false)
, lastType(0) , lastType(0)
, show_AcroCos(false) , show_AcroCos(false)
, show_Good_Nights(false) , show_Good_Nights(false)
, show_Best_Night(false) , show_Best_Night(false)
, show_Today(false) , show_Today(false)
, show_FullMoon(false) , show_FullMoon(false)
, flagShowReport(false) , flagShowReport(false)
, fontSize(14) , fontSize(14)
, button(NULL) , button(Q_NULLPTR)
{ {
setObjectName("Observability"); setObjectName("Observability");
// Dummy initial values for parameters and data vectors: // Dummy initial values for parameters and data vectors:
mylat = 1000.; mylat = 1000.;
mylon = 1000.; mylon = 1000.;
myJD.first = 0.; myJD.first = 0.;
myJD.second = 0.; myJD.second = 0.;
curYear = 0; curYear = 0;
isStar = true; isStar = true;
skipping to change at line 164 skipping to change at line 164
memset(objectDec, 0, 366*sizeof(double)); memset(objectDec, 0, 366*sizeof(double));
memset(sunSidT, 0, 2*366*sizeof(double)); memset(sunSidT, 0, 2*366*sizeof(double));
memset(objectSidT, 0, 2*366*sizeof(double)); memset(objectSidT, 0, 2*366*sizeof(double));
memset(objectH0, 0, 366*sizeof(double)); memset(objectH0, 0, 366*sizeof(double));
} }
Observability::~Observability() Observability::~Observability()
{ {
// Shouldn't this be in the deinit()? --BM // Shouldn't this be in the deinit()? --BM
if (configDialog != NULL) if (configDialog != Q_NULLPTR)
delete configDialog; delete configDialog;
} }
void Observability::updateMessageText() void Observability::updateMessageText()
{ {
// Set names of the months: // Set names of the months:
monthNames.clear(); monthNames.clear();
monthNames << qc_("Jan", "short month name") monthNames << qc_("Jan", "short month name")
<< qc_("Feb", "short month name") << qc_("Feb", "short month name")
<< qc_("Mar", "short month name") << qc_("Mar", "short month name")
skipping to change at line 244 skipping to change at line 244
N_("Observability"), N_("Observability"),
N_("Observability"), N_("Observability"),
"flagShowReport"); "flagShowReport");
// actionShow->setChecked(flagShowReport); //Unnecessary? // actionShow->setChecked(flagShowReport); //Unnecessary?
addAction("actionShow_Observability_ConfigDialog", addAction("actionShow_Observability_ConfigDialog",
N_("Observability"), N_("Observability"),
N_("Observability configuration window"), N_("Observability configuration window"),
configDialog, "visible"); configDialog, "visible");
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
if (gui!=NULL) if (gui!=Q_NULLPTR)
{ {
button = new StelButton(NULL, button = new StelButton(Q_NULLPTR,
QPixmap(":/observability/bt_observab _on.png"), QPixmap(":/observability/bt_observab _on.png"),
QPixmap(":/observability/bt_observab _off.png"), QPixmap(":/observability/bt_observab _off.png"),
QPixmap(":/graphicGui/glow32x32.png" ), QPixmap(":/graphicGui/glow32x32.png" ),
actionShow); actionShow);
gui->getButtonBar()->addButton(button, "065-pluginsGroup"); gui->getButtonBar()->addButton(button, "065-pluginsGroup");
} }
updateMessageText(); updateMessageText();
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
this, SLOT(updateMessageText())); this, SLOT(updateMessageText()));
skipping to change at line 405 skipping to change at line 405
{ {
souChanged = false; souChanged = false;
} }
else else
{ // Check also if the (new) source belongs to the Solar Sys tem: { // Check also if the (new) source belongs to the Solar Sys tem:
souChanged = true; souChanged = true;
selName = name; selName = name;
Planet* planet = dynamic_cast<Planet*>(selectedObjec t.data()); Planet* planet = dynamic_cast<Planet*>(selectedObjec t.data());
isStar = (planet == NULL); isStar = (planet == Q_NULLPTR);
if (!isStar && !isMoon && !isSun) // Object in the Solar System, but is not Sun nor Moon. if (!isStar && !isMoon && !isSun) // Object in the Solar System, but is not Sun nor Moon.
{ {
int gene = -1; int gene = -1;
// If object is a planet's moon, we get its parent p lanet: // If object is a planet's moon, we get its parent p lanet:
ssObject = GETSTELMODULE(SolarSystem)->searc hByEnglishName(selName); ssObject = GETSTELMODULE(SolarSystem)->searc hByEnglishName(selName);
// TODO: Isn't it easier just to use the pla net object we just cast? --BM // TODO: Isn't it easier just to use the pla net object we just cast? --BM
 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/