ViewDialog.cpp   ViewDialog.cpp 
skipping to change at line 201 skipping to change at line 201
// Shooting stars section // Shooting stars section
MeteorMgr* mmgr = GETSTELMODULE(MeteorMgr); MeteorMgr* mmgr = GETSTELMODULE(MeteorMgr);
Q_ASSERT(mmgr); Q_ASSERT(mmgr);
updateZhrControls(mmgr->getZHR()); updateZhrControls(mmgr->getZHR());
connect(mmgr, SIGNAL(zhrChanged(int)), connect(mmgr, SIGNAL(zhrChanged(int)),
this, SLOT(updateZhrControls(int))); this, SLOT(updateZhrControls(int)));
connect(ui->zhrNone, SIGNAL(clicked()), this, SLOT(setZhrFromControl s())); connect(ui->zhrNone, SIGNAL(clicked()), this, SLOT(setZhrFromControl s()));
connect(ui->zhr10, SIGNAL(clicked()), this, SLOT(setZhrFromControls( ))); connect(ui->zhr10, SIGNAL(clicked()), this, SLOT(setZhrFromControls( )));
connect(ui->zhr80, SIGNAL(clicked()), this, SLOT(setZhrFromControls( ))); connect(ui->zhr80, SIGNAL(clicked()), this, SLOT(setZhrFromControls( )));
connect(ui->zhr1000, SIGNAL(clicked()), this, SLOT(setZhrFromControl s()));
connect(ui->zhr10000, SIGNAL(clicked()), this, SLOT(setZhrFromContro ls())); connect(ui->zhr10000, SIGNAL(clicked()), this, SLOT(setZhrFromContro ls()));
connect(ui->zhr144000, SIGNAL(clicked()), this, SLOT(setZhrFromContr ols())); connect(ui->zhr144000, SIGNAL(clicked()), this, SLOT(setZhrFromContr ols()));
// Labels section // Labels section
StarMgr* smgr = GETSTELMODULE(StarMgr); StarMgr* smgr = GETSTELMODULE(StarMgr);
ui->starLabelCheckBox->setChecked(smgr->getFlagLabels()); ui->starLabelCheckBox->setChecked(smgr->getFlagLabels());
connect(ui->starLabelCheckBox, SIGNAL(toggled(bool)), smgr, SLOT(set FlagLabels(bool))); connect(ui->starLabelCheckBox, SIGNAL(toggled(bool)), smgr, SLOT(set FlagLabels(bool)));
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr); NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr);
skipping to change at line 248 skipping to change at line 249
connect(a, SIGNAL(toggled(bool)), ui->showAtmosphereCheckBox, SLOT(s etChecked(bool))); connect(a, SIGNAL(toggled(bool)), ui->showAtmosphereCheckBox, SLOT(s etChecked(bool)));
connect(ui->showAtmosphereCheckBox, SIGNAL(toggled(bool)), a, SLOT(s etChecked(bool))); connect(ui->showAtmosphereCheckBox, SIGNAL(toggled(bool)), a, SLOT(s etChecked(bool)));
ui->landscapePositionCheckBox->setChecked(lmgr->getFlagLandscapeSets Location()); ui->landscapePositionCheckBox->setChecked(lmgr->getFlagLandscapeSets Location());
connect(ui->landscapePositionCheckBox, SIGNAL(toggled(bool)), lmgr, SLOT(setFlagLandscapeSetsLocation(bool))); connect(ui->landscapePositionCheckBox, SIGNAL(toggled(bool)), lmgr, SLOT(setFlagLandscapeSetsLocation(bool)));
ui->lightPollutionSpinBox->setValue(StelApp::getInstance().getCore() ->getSkyDrawer()->getBortleScale()); ui->lightPollutionSpinBox->setValue(StelApp::getInstance().getCore() ->getSkyDrawer()->getBortleScale());
connect(ui->lightPollutionSpinBox, SIGNAL(valueChanged(int)), lmgr, SLOT(setAtmosphereBortleLightPollution(int))); connect(ui->lightPollutionSpinBox, SIGNAL(valueChanged(int)), lmgr, SLOT(setAtmosphereBortleLightPollution(int)));
connect(ui->lightPollutionSpinBox, SIGNAL(valueChanged(int)), StelAp p::getInstance().getCore()->getSkyDrawer(), SLOT(setBortleScale(int))); connect(ui->lightPollutionSpinBox, SIGNAL(valueChanged(int)), StelAp p::getInstance().getCore()->getSkyDrawer(), SLOT(setBortleScale(int)));
ui->autoChangeLandscapesCheckBox->setChecked(lmgr->getFlagLandscapeA
utoSelection());
connect(ui->autoChangeLandscapesCheckBox, SIGNAL(toggled(bool)), lmg
r, SLOT(setFlagLandscapeAutoSelection(bool)));
// GZ: changes for refraction // GZ: changes for refraction
//ui->pressureDoubleSpinBox->setValue(StelApp::getInstance().getCore ()->getSkyDrawer()->getAtmospherePressure()); //ui->pressureDoubleSpinBox->setValue(StelApp::getInstance().getCore ()->getSkyDrawer()->getAtmospherePressure());
//connect(ui->pressureDoubleSpinBox, SIGNAL(valueChanged(double)), S telApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmospherePressure (double))); //connect(ui->pressureDoubleSpinBox, SIGNAL(valueChanged(double)), S telApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmospherePressure (double)));
//ui->temperatureDoubleSpinBox->setValue(StelApp::getInstance().getC ore()->getSkyDrawer()->getAtmosphereTemperature()); //ui->temperatureDoubleSpinBox->setValue(StelApp::getInstance().getC ore()->getSkyDrawer()->getAtmosphereTemperature());
//connect(ui->temperatureDoubleSpinBox, SIGNAL(valueChanged(double)) , StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmosphereTempe rature(double))); //connect(ui->temperatureDoubleSpinBox, SIGNAL(valueChanged(double)) , StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmosphereTempe rature(double)));
//ui->extinctionDoubleSpinBox->setValue(StelApp::getInstance().getCo re()->getSkyDrawer()->getExtinctionCoefficient()); //ui->extinctionDoubleSpinBox->setValue(StelApp::getInstance().getCo re()->getSkyDrawer()->getExtinctionCoefficient());
//connect(ui->extinctionDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setExtinctionCoeffi cient(double))); //connect(ui->extinctionDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setExtinctionCoeffi cient(double)));
//// instead //// instead
connect(ui->pushButtonAtmosphereDetails, SIGNAL(clicked()), this, SL OT(showAtmosphereDialog())); connect(ui->pushButtonAtmosphereDetails, SIGNAL(clicked()), this, SL OT(showAtmosphereDialog()));
// GZ: Done // GZ: Done
skipping to change at line 584 skipping to change at line 588
zhr = 0; zhr = 0;
} }
else else
{ {
mmgr->setFlagShow(true); mmgr->setFlagShow(true);
} }
if (ui->zhr10->isChecked()) if (ui->zhr10->isChecked())
zhr = 10; zhr = 10;
if (ui->zhr80->isChecked()) if (ui->zhr80->isChecked())
zhr = 80; zhr = 80;
if (ui->zhr1000->isChecked())
zhr = 1000;
if (ui->zhr10000->isChecked()) if (ui->zhr10000->isChecked())
zhr = 10000; zhr = 10000;
if (ui->zhr144000->isChecked()) if (ui->zhr144000->isChecked())
zhr = 144000; zhr = 144000;
if (zhr!=mmgr->getZHR()) if (zhr!=mmgr->getZHR())
{ {
mmgr->setZHR(zhr); mmgr->setZHR(zhr);
} }
updateZhrDescription(zhr); updateZhrDescription(zhr);
} }
void ViewDialog::updateZhrControls(int zhr) void ViewDialog::updateZhrControls(int zhr)
{ {
// As the radio buttons are tied to the clicked() signal, // As the radio buttons are tied to the clicked() signal,
// it won't be triggered by setting the value programmatically. // it won't be triggered by setting the value programmatically.
switch(zhr) switch(zhr)
{ {
case 0: ui->zhrNone->setChecked(true); break; case 0: ui->zhrNone->setChecked(true); break;
case 80: ui->zhr80->setChecked(true); break; case 80: ui->zhr80->setChecked(true); break;
case 1000: ui->zhr1000->setChecked(true); break;
case 10000: ui->zhr10000->setChecked(true); break; case 10000: ui->zhr10000->setChecked(true); break;
case 144000: ui->zhr144000->setChecked(true); break; case 144000: ui->zhr144000->setChecked(true); break;
default: ui->zhr10->setChecked(true); break; default: ui->zhr10->setChecked(true); break;
} }
updateZhrDescription(zhr); updateZhrDescription(zhr);
} }
void ViewDialog::updateZhrDescription(int zhr) void ViewDialog::updateZhrDescription(int zhr)
{ {
skipping to change at line 625 skipping to change at line 632
{ {
case 0: case 0:
ui->zhrLabel->setText("<small><i>"+q_("No shooting s tars")+"</i></small>"); ui->zhrLabel->setText("<small><i>"+q_("No shooting s tars")+"</i></small>");
break; break;
case 10: case 10:
ui->zhrLabel->setText("<small><i>"+q_("Normal rate") +"</i></small>"); ui->zhrLabel->setText("<small><i>"+q_("Normal rate") +"</i></small>");
break; break;
case 80: case 80:
ui->zhrLabel->setText("<small><i>"+q_("Standard Pers eids rate")+"</i></small>"); ui->zhrLabel->setText("<small><i>"+q_("Standard Pers eids rate")+"</i></small>");
break; break;
case 1000:
ui->zhrLabel->setText("<small><i>"+q_("Meteor storm
rate")+"</i></small>");
break;
case 10000: case 10000:
ui->zhrLabel->setText("<small><i>"+q_("Exceptional L eonid rate")+"</i></small>"); ui->zhrLabel->setText("<small><i>"+q_("Exceptional L eonid rate")+"</i></small>");
break; break;
case 144000: case 144000:
ui->zhrLabel->setText("<small><i>"+q_("Highest rate ever (1966 Leonids)")+"</i></small>"); ui->zhrLabel->setText("<small><i>"+q_("Highest rate ever (1966 Leonids)")+"</i></small>");
break; break;
default: default:
ui->zhrLabel->setText(QString("<small><i>")+"Error"+ "</i></small>"); ui->zhrLabel->setText(QString("<small><i>")+"Error"+ "</i></small>");
} }
} }
 End of changes. 5 change blocks. 
0 lines changed or deleted 13 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/