summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-07 23:53:05 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-07 23:53:05 (GMT)
commita1c4eeefe26736fa7f8ca14f8fd2f664a996d28a (patch)
tree25fb14485909a20385903db8a876405c051da4ed
parentd208d824f48b8e6de62680eb35e535850e050b92 (diff)
Refactor name to be more standard
-rw-r--r--kstars/ekos/focus/focus.cpp14
-rw-r--r--kstars/ekos/focus/focus.ui2
2 files changed, 8 insertions, 8 deletions
diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
index 69b63a2..bf1bc25 100644
--- a/kstars/ekos/focus/focus.cpp
+++ b/kstars/ekos/focus/focus.cpp
@@ -206,7 +206,7 @@ Focus::Focus()
exposureIN->setValue(Options::focusExposure());
toleranceIN->setValue(Options::focusTolerance());
stepIN->setValue(Options::focusTicks());
- kcfg_autoSelectStar->setChecked(Options::autoSelectStar());
+ autoStarCheck->setChecked(Options::focusAutoStarEnabled());
focusBoxSize->setValue(Options::focusBoxSize());
maxTravelIN->setValue(Options::focusMaxTravel());
kcfg_subFrame->setChecked(Options::focusSubFrame());
@@ -316,7 +316,7 @@ void Focus::checkCCD(int ccdNum)
{
binningCombo->setEnabled(targetChip->canBin());
kcfg_subFrame->setEnabled(targetChip->canSubframe());
- kcfg_autoSelectStar->setEnabled(targetChip->canSubframe());
+ autoStarCheck->setEnabled(targetChip->canSubframe());
if (targetChip->canBin())
{
int subBinX=1,subBinY=1;
@@ -688,7 +688,7 @@ void Focus::start()
Options::setFocusMaxTravel(maxTravelIN->value());
Options::setFocusSubFrame(kcfg_subFrame->isChecked());
- Options::setAutoSelectStar(kcfg_autoSelectStar->isChecked());
+ Options::setFocusAutoStarEnabled(autoStarCheck->isChecked());
Options::setSuspendGuiding(suspendGuideCheck->isChecked());
Options::setLockFocusFilter(lockFilterCheck->isChecked());
Options::setUseFocusDarkFrame(darkFrameCheck->isChecked());
@@ -697,7 +697,7 @@ void Focus::start()
qDebug() << "Focus: Starting focus with box size: " << focusBoxSize->value() << " Step Size: " << stepIN->value() << " Threshold: " << thresholdSpin->value() << " Tolerance: " << toleranceIN->value()
<< " Frames: " << focusFramesSpin->value() << " Maximum Travel: " << maxTravelIN->value();
- if (kcfg_autoSelectStar->isChecked())
+ if (autoStarCheck->isChecked())
appendLogText(i18n("Autofocus in progress..."));
else
appendLogText(i18n("Please wait until image capture is complete..."));
@@ -1134,7 +1134,7 @@ void Focus::setCaptureComplete()
else
targetChip->getFrame(&x, &y, &w, &h);
- if (kcfg_autoSelectStar->isEnabled() && kcfg_autoSelectStar->isChecked() && focusType == FOCUS_AUTO)
+ if (autoStarCheck->isEnabled() && autoStarCheck->isChecked() && focusType == FOCUS_AUTO)
{
Edge *maxStar = image_data->getMaxHFRStar();
if (maxStar == NULL)
@@ -2173,7 +2173,7 @@ void Focus::toggleSubframe(bool enable)
if (enable == false)
{
resetFrame();
- kcfg_autoSelectStar->setChecked(false);
+ autoStarCheck->setChecked(false);
}
//starSelected = false;
@@ -2214,7 +2214,7 @@ void Focus::setImageFilter(const QString & value)
void Focus::setAutoFocusStar(bool enable)
{
- kcfg_autoSelectStar->setChecked(enable);
+ autoStarCheck->setChecked(enable);
}
void Focus::setAutoFocusSubFrame(bool enable)
diff --git a/kstars/ekos/focus/focus.ui b/kstars/ekos/focus/focus.ui
index 659cfbd..0876982 100644
--- a/kstars/ekos/focus/focus.ui
+++ b/kstars/ekos/focus/focus.ui
@@ -572,7 +572,7 @@ Otherwise, the autofocus process will utilize whatever filter currently set by t
<number>3</number>
</property>
<item row="0" column="0">
- <widget class="QCheckBox" name="kcfg_autoSelectStar">
+ <widget class="QCheckBox" name="autoStarCheck">
<property name="toolTip">
<string>Automatically select the best focus star from the image</string>
</property>