summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-09 10:50:55 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-09 10:50:55 (GMT)
commit90c09b9dba0b1f007e81e63c1613cc49e660464a (patch)
tree8a1a754e7448be8ce8b8b2432ac98946b29d6acb
parentb7b5b9ac087c2cc5b2417ce69e57af9ee7cc4ac2 (diff)
Use new signals for guide
-rw-r--r--kstars/ekos/capture/capture.cpp10
-rw-r--r--kstars/ekos/capture/capture.h7
-rw-r--r--kstars/ekos/focus/focus.cpp10
-rw-r--r--kstars/ekos/focus/focus.h3
4 files changed, 15 insertions, 15 deletions
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index ad8a90a..e60eb37 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -1050,7 +1050,7 @@ void Capture::processJobCompletion()
//Resume guiding if it was suspended before
//if (isAutoGuiding && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
if (guideState == GUIDE_SUSPENDED && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
- emit suspendGuiding(false);
+ emit resumeGuiding();
}
}
@@ -1086,7 +1086,7 @@ bool Capture::resumeSequence()
//Resume guiding if it was suspended before
//if (isAutoGuiding && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
if (guideState == GUIDE_SUSPENDED && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
- emit suspendGuiding(false);
+ emit resumeGuiding();
return true;
}
@@ -1109,7 +1109,7 @@ bool Capture::resumeSequence()
// If we suspended guiding due to primary chip download, resume guide chip guiding now
if (guideState == GUIDE_SUSPENDED && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
- emit suspendGuiding(false);
+ emit resumeGuiding();
//if (isAutoGuiding && guideDither && activeJob->getFrameType() == FRAME_LIGHT)
if (guideState == GUIDE_GUIDING && Options::ditherEnabled() && activeJob->getFrameType() == FRAME_LIGHT)
@@ -1408,7 +1408,7 @@ void Capture::updateCaptureProgress(ISD::CCDChip * tChip, double value, IPState
{
if (Options::captureLogging())
qDebug() << "Capture: Autoguiding suspended until primary CCD chip completes downloading...";
- emit suspendGuiding(true);
+ emit suspendGuiding();
}
secondsLabel->setText(i18n("Downloading..."));
@@ -3393,7 +3393,7 @@ IPState Capture::processPreCaptureCalibrationStage()
if (guideState == GUIDE_GUIDING)
{
appendLogText(i18n("Autoguiding suspended."));
- emit suspendGuiding(true);
+ emit suspendGuiding();
}
// Let's check what actions to be taken, if any, for the flat field source
diff --git a/kstars/ekos/capture/capture.h b/kstars/ekos/capture/capture.h
index e4d8511..9aa3619 100644
--- a/kstars/ekos/capture/capture.h
+++ b/kstars/ekos/capture/capture.h
@@ -443,10 +443,9 @@ private slots:
signals:
void newLog();
- //void exposureComplete();
- void checkFocus(double);
- //void mountParking();
- void suspendGuiding(bool);
+ void checkFocus(double);
+ void suspendGuiding();
+ void resumeGuiding();
void meridianFlipStarted();
void meridianFlipCompleted();
void newStatus(Ekos::CaptureState status);
diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
index bf1bc25..94582df 100644
--- a/kstars/ekos/focus/focus.cpp
+++ b/kstars/ekos/focus/focus.cpp
@@ -703,7 +703,7 @@ void Focus::start()
appendLogText(i18n("Please wait until image capture is complete..."));
if (suspendGuideCheck->isChecked())
- emit suspendGuiding(true);
+ emit suspendGuiding();
//emit statusUpdated(true);
state = Ekos::FOCUS_PROGRESS;
@@ -1505,7 +1505,7 @@ void Focus::autoFocusAbs()
{
appendLogText(i18n("Autofocus complete."));
abort();
- emit suspendGuiding(false);
+ emit resumeGuiding();
setAutoFocusResult(true);
}
break;
@@ -1673,7 +1673,7 @@ void Focus::autoFocusAbs()
{
appendLogText(i18n("Autofocus complete."));
abort();
- emit suspendGuiding(false);
+ emit resumeGuiding();
setAutoFocusResult(true);
return;
}
@@ -1767,7 +1767,7 @@ void Focus::autoFocusRel()
{
appendLogText(i18n("Autofocus complete."));
abort();
- emit suspendGuiding(false);
+ emit resumeGuiding();
setAutoFocusResult(true);
break;
}
@@ -1809,7 +1809,7 @@ void Focus::autoFocusRel()
{
appendLogText(i18n("Autofocus complete."));
abort();
- emit suspendGuiding(false);
+ emit resumeGuiding();
setAutoFocusResult(true);
break;
}
diff --git a/kstars/ekos/focus/focus.h b/kstars/ekos/focus/focus.h
index 205b6ba..25e5424 100644
--- a/kstars/ekos/focus/focus.h
+++ b/kstars/ekos/focus/focus.h
@@ -330,7 +330,8 @@ private slots:
signals:
void newLog();
//void autoFocusFinished(bool status, double finalHFR);
- void suspendGuiding(bool suspend);
+ void suspendGuiding();
+ void resumeGuiding();
void filterLockUpdated(ISD::GDInterface *filter, int lockedIndex);
void newStatus(Ekos::FocusState state);
void newStarPixmap(QPixmap &);