Commit 90c09b9d authored by Jasem Mutlaq's avatar Jasem Mutlaq
Browse files

Use new signals for guide

parent b7b5b9ac
......@@ -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
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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 &);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment