summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-22 10:51:16 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-22 10:51:16 (GMT)
commit1a460219cdcd179dc8a90185de82cc8baf320da3 (patch)
treec5d452ff53203b0d06fd27dc3ee04343090cdcd4
parent6c580c2fe9432e8b775dfec393f8ef40aa20ef7b (diff)
Use state change to signal actual events instead of different signals for all various status changes
-rw-r--r--kstars/ekos/focus.cpp8
-rw-r--r--kstars/ekos/focus.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/kstars/ekos/focus.cpp b/kstars/ekos/focus.cpp
index eea5f29..88b4d22 100644
--- a/kstars/ekos/focus.cpp
+++ b/kstars/ekos/focus.cpp
@@ -582,8 +582,8 @@ void Focus::checkFocuser(int FocuserNum)
resetButtons();
- if (!inAutoFocus && !inFocusLoop && !captureInProgress && !inSequenceFocus)
- emit autoFocusFinished(true, -1);
+ //if (!inAutoFocus && !inFocusLoop && !captureInProgress && !inSequenceFocus)
+ // emit autoFocusFinished(true, -1);
}
void Focus::addCCD(ISD::GDInterface *newCCD)
@@ -1067,6 +1067,8 @@ void Focus::setCaptureComplete()
return;
}
+ emit newHFR(currentHFR);
+
QString HFRText = QString("%1").arg(currentHFR, 0,'g', 3);
if (focusType == FOCUS_MANUAL && lastHFR == -1)
@@ -2265,7 +2267,7 @@ void Focus::setAutoFocusResult(bool status)
resetFocusIteration = 0;
- emit autoFocusFinished(status, currentHFR);
+ //emit autoFocusFinished(status, currentHFR);
if (status)
{
diff --git a/kstars/ekos/focus.h b/kstars/ekos/focus.h
index 7864861..065f3b1 100644
--- a/kstars/ekos/focus.h
+++ b/kstars/ekos/focus.h
@@ -328,12 +328,13 @@ private slots:
signals:
void newLog();
- void autoFocusFinished(bool status, double finalHFR);
+ //void autoFocusFinished(bool status, double finalHFR);
void suspendGuiding(bool suspend);
void filterLockUpdated(ISD::GDInterface *filter, int lockedIndex);
void newStatus(Ekos::FocusState state);
void newStarPixmap(QPixmap &);
void newProfilePixmap(QPixmap &);
+ void newHFR(double hfr);
private:
void drawHFRPlot();