summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-22 10:50:12 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-22 10:50:12 (GMT)
commit8840a60a33df05e39d82ef660478d64f65d54651 (patch)
tree78bb8b89048880f2616c8f62581aa75d615363d2
parentbd278462b79727ab1666354bc060181cc5cf77c1 (diff)
Remove unused signals since we rely mostly on module states now
-rw-r--r--kstars/ekos/ekosmanager.cpp56
1 files changed, 41 insertions, 15 deletions
diff --git a/kstars/ekos/ekosmanager.cpp b/kstars/ekos/ekosmanager.cpp
index 5b47285..ec02616 100644
--- a/kstars/ekos/ekosmanager.cpp
+++ b/kstars/ekos/ekosmanager.cpp
@@ -1353,7 +1353,7 @@ void EkosManager::initCapture()
{
// Autofocus
connect(captureProcess, SIGNAL(checkFocus(double)), focusProcess, SLOT(checkFocus(double)), Qt::UniqueConnection);
- connect(focusProcess, SIGNAL(autoFocusFinished(bool, double)), captureProcess, SLOT(updateAutofocusStatus(bool, double)), Qt::UniqueConnection);
+ //connect(focusProcess, SIGNAL(autoFocusFinished(bool, double)), captureProcess, SLOT(updateAutofocusStatus(bool, double)), Qt::UniqueConnection);
connect(focusProcess, SIGNAL(newStatus(Ekos::FocusState)), captureProcess, SLOT(setFocusStatus(Ekos::FocusState)), Qt::UniqueConnection);
// Meridian Flip
@@ -1363,11 +1363,16 @@ void EkosManager::initCapture()
if (alignProcess)
{
// Alignment flag
- connect(alignProcess, SIGNAL(solverComplete(bool)), captureProcess, SLOT(enableAlignmentFlag()), Qt::UniqueConnection);
- connect(alignProcess, SIGNAL(solverSlewComplete()), captureProcess, SLOT(checkAlignmentSlewComplete()), Qt::UniqueConnection);
+ //connect(alignProcess, SIGNAL(solverComplete(bool)), captureProcess, SLOT(enableAlignmentFlag()), Qt::UniqueConnection);
+ //connect(alignProcess, SIGNAL(solverSlewComplete()), captureProcess, SLOT(checkAlignmentSlewComplete()), Qt::UniqueConnection);
+
+ connect(alignProcess, SIGNAL(newStatus(Ekos::AlignState)), captureProcess, SLOT(setAlignStatus(Ekos::AlignState)), Qt::UniqueConnection);
// Meridian Flip
- connect(captureProcess, SIGNAL(meridialFlipTracked()), alignProcess, SLOT(captureAndSolve()), Qt::UniqueConnection);
+ //connect(captureProcess, SIGNAL(meridialFlipTracked()), alignProcess, SLOT(captureAndSolve()), Qt::UniqueConnection);
+ connect(captureProcess, &Ekos::Capture::newStatus, this, [&](Ekos::CaptureState state){if (state == Ekos::CAPTURE_ALIGNING)
+ {QTimer::singleShot(Options::settlingTime(), alignProcess, SLOT(captureAndSolve()));}}, Qt::UniqueConnection);
+
}
if (mountProcess)
@@ -1397,11 +1402,16 @@ void EkosManager::initAlign()
if (captureProcess)
{
// Alignment flag
- connect(alignProcess, SIGNAL(solverComplete(bool)), captureProcess, SLOT(enableAlignmentFlag()), Qt::UniqueConnection);
- connect(alignProcess, SIGNAL(solverSlewComplete()), captureProcess, SLOT(checkAlignmentSlewComplete()), Qt::UniqueConnection);
+ //connect(alignProcess, SIGNAL(solverComplete(bool)), captureProcess, SLOT(enableAlignmentFlag()), Qt::UniqueConnection);
+ //connect(alignProcess, SIGNAL(solverSlewComplete()), captureProcess, SLOT(checkAlignmentSlewComplete()), Qt::UniqueConnection);
// Meridian Flip
- connect(captureProcess, SIGNAL(meridialFlipTracked()), alignProcess, SLOT(captureAndSolve()), Qt::UniqueConnection);
+ //connect(captureProcess, SIGNAL(meridialFlipTracked()), alignProcess, SLOT(captureAndSolve()), Qt::UniqueConnection);
+
+ connect(alignProcess, SIGNAL(newStatus(Ekos::AlignState)), captureProcess, SLOT(setAlignStatus(Ekos::AlignState)), Qt::UniqueConnection);
+
+ connect(captureProcess, &Ekos::Capture::newStatus, this, [&](Ekos::CaptureState state){if (state == Ekos::CAPTURE_ALIGNING)
+ {QTimer::singleShot(Options::settlingTime(), alignProcess, SLOT(captureAndSolve()));}}, Qt::UniqueConnection);
}
if (focusProcess)
@@ -1435,7 +1445,7 @@ void EkosManager::initFocus()
{
// Autofocus
connect(captureProcess, SIGNAL(checkFocus(double)), focusProcess, SLOT(checkFocus(double)), Qt::UniqueConnection);
- connect(focusProcess, SIGNAL(autoFocusFinished(bool, double)), captureProcess, SLOT(updateAutofocusStatus(bool, double)), Qt::UniqueConnection);
+ //connect(focusProcess, SIGNAL(autoFocusFinished(bool, double)), captureProcess, SLOT(updateAutofocusStatus(bool, double)), Qt::UniqueConnection);
connect(focusProcess, SIGNAL(newStatus(Ekos::FocusState)), captureProcess, SLOT(setFocusStatus(Ekos::FocusState)), Qt::UniqueConnection);
// Meridian Flip
@@ -1452,7 +1462,7 @@ void EkosManager::initFocus()
{
// Filter lock
connect(focusProcess, SIGNAL(filterLockUpdated(ISD::GDInterface*,int)), alignProcess, SLOT(setLockedFilter(ISD::GDInterface*,int)), Qt::UniqueConnection);
- connect(focusProcess, SIGNAL(newStatus(Ekos::FocusState)), alignProcess, SLOT(setFocusStatus(FocusState)), Qt::UniqueConnection);
+ connect(focusProcess, SIGNAL(newStatus(Ekos::FocusState)), alignProcess, SLOT(setFocusStatus(Ekos::FocusState)), Qt::UniqueConnection);
}
}
@@ -1482,6 +1492,12 @@ void EkosManager::initMount()
connect(captureProcess, SIGNAL(meridianFlipCompleted()), mountProcess, SLOT(enableAltLimits()), Qt::UniqueConnection);
}
+ if (guideProcess)
+ {
+ connect(mountProcess, SIGNAL(newStatus(ISD::Telescope::TelescopeStatus)), [&](ISD::Telescope::TelescopeStatus state){if (state == ISD::Telescope::MOUNT_PARKING)
+ guideProcess->stopGuiding();}, Qt::UniqueConnection);
+ }
+
}
void EkosManager::initGuide()
@@ -1516,18 +1532,19 @@ void EkosManager::initGuide()
captureProcess->disconnect(guideProcess);
// Guide Limits
- connect(guideProcess, SIGNAL(guideReady()), captureProcess, SLOT(enableGuideLimits()));
+ //connect(guideProcess, SIGNAL(guideReady()), captureProcess, SLOT(enableGuideLimits()));
+ connect(guideProcess, SIGNAL(newStatus(Ekos::GuideState)), captureProcess, SLOT(setGuideStatus(Ekos::GuideState)));
connect(guideProcess, SIGNAL(newAxisDelta(double,double)), captureProcess, SLOT(setGuideDeviation(double,double)));
// Dithering
- connect(guideProcess, SIGNAL(autoGuidingToggled(bool)), captureProcess, SLOT(setAutoguiding(bool)));
- connect(guideProcess, SIGNAL(ditherComplete()), captureProcess, SLOT(resumeCapture()));
- connect(guideProcess, SIGNAL(ditherFailed()), captureProcess, SLOT(abort()));
+ //connect(guideProcess, SIGNAL(autoGuidingToggled(bool)), captureProcess, SLOT(setAutoguiding(bool)));
+ //connect(guideProcess, SIGNAL(ditherComplete()), captureProcess, SLOT(resumeCapture()));
+ //connect(guideProcess, SIGNAL(ditherFailed()), captureProcess, SLOT(abort()));
connect(guideProcess, SIGNAL(ditherToggled(bool)), captureProcess, SLOT(setGuideDither(bool)));
+ //connect(captureProcess, SIGNAL(exposureComplete()), guideProcess, SLOT(dither()));
connect(captureProcess, SIGNAL(exposureComplete()), guideProcess, SLOT(dither()));
- // Parking
- connect(captureProcess, SIGNAL(mountParking()), guideProcess, SLOT(stopGuiding()));
+
// Guide Head
connect(captureProcess, SIGNAL(suspendGuiding(bool)), guideProcess, SLOT(setSuspended(bool)));
@@ -1538,6 +1555,15 @@ void EkosManager::initGuide()
connect(captureProcess, SIGNAL(meridianFlipCompleted()), guideProcess, SLOT(startAutoCalibrateGuiding()), Qt::UniqueConnection);
}
+ if (mountProcess)
+ {
+ // Parking
+ //connect(captureProcess, SIGNAL(mountParking()), guideProcess, SLOT(stopGuiding()));
+ connect(mountProcess, SIGNAL(newStatus(ISD::Telescope::TelescopeStatus)), [&](ISD::Telescope::TelescopeStatus state){if (state == ISD::Telescope::MOUNT_PARKING)
+ guideProcess->stopGuiding();}, Qt::UniqueConnection);
+
+ }
+
if (focusProcess)
{
// Suspend