Commit cbb8de7a authored by Jasem Mutlaq's avatar Jasem Mutlaq
Browse files

Remove unused functions, compact GUI

parent 880bbb63
......@@ -178,7 +178,7 @@ Capture::Capture()
fileHFR=0;
useGuideHead = false;
guideDither = false;
firstAutoFocus = true;
firstAutoFocus = true;
foreach(QString filter, FITSViewer::filterTypes)
filterCombo->addItem(filter);
......@@ -2002,7 +2002,7 @@ void Capture::setFocusStatus(FocusState state)
abort();
}
activeJob->setFilterPostFocusReady(status);
activeJob->setFilterPostFocusReady(focusState == FOCUS_COMPLETE);
return;
}
......@@ -2836,7 +2836,7 @@ QString Capture::getSequenceQueueStatus()
if (aborted > 0)
{
if (isAutoGuiding && deviationDetected)
if (guideState == GUIDE_GUIDING && deviationDetected)
return "Suspended";
else
return "Aborted";
......@@ -3012,8 +3012,6 @@ bool Capture::checkMeridianFlip()
void Capture::checkMeridianFlipTimeout()
{
static bool guidingEngaged = false, alignmentEngaged=false;
if (meridianFlipStage == MF_NONE)
return;
......@@ -3021,7 +3019,7 @@ void Capture::checkMeridianFlipTimeout()
{
appendLogText(i18n("Telescope meridian flip timed out."));
abort();
}
}
}
void Capture::setAlignStatus(AlignState state)
......@@ -3062,7 +3060,7 @@ void Capture::setGuideStatus(GuideState state)
case GUIDE_IDLE:
// If Autoguiding was started before and now stopped, let's abort (unless we're doing a meridian flip)
if (enable == false && guideState == GUIDE_GUIDING && meridianFlipStage == MF_NONE && activeJob && activeJob->getStatus() == SequenceJob::JOB_BUSY)
if (guideState == GUIDE_GUIDING && meridianFlipStage == MF_NONE && activeJob && activeJob->getStatus() == SequenceJob::JOB_BUSY)
{
appendLogText(i18n("Autoguiding stopped. Aborting..."));
abort();
......@@ -3393,7 +3391,7 @@ void Capture::openCalibrationDialog()
IPState Capture::processPreCaptureCalibrationStage()
{
if (isAutoGuiding)
if (guideState == GUIDE_GUIDING)
{
appendLogText(i18n("Autoguiding suspended."));
emit suspendGuiding(true);
......
......@@ -352,11 +352,6 @@ public slots:
*/
void moveJobDown();
/**
* @brief enableGuideLimits Enable guide deviation check box and guide deviation limits spin box.
*/
void enableGuideLimits();
/**
* @brief setGuideDeviation Set the guiding deviaiton as measured by the guiding module. Abort capture if deviation exceeds user value. Resume capture if capture was aborted and guiding deviations are below user value.
* @param delta_ra Deviation in RA in arcsecs from the selected guide star.
......@@ -370,13 +365,6 @@ public slots:
*/
void setGuideDither(bool enable);
/**
* @brief setAutoguiding Set autoguiding status from guiding module.
* @param enable True if autoguiding is enabled and running, false otherwise.
* @param isDithering true if dithering is enabled.
*/
void setAutoguiding(bool enable);
/**
* @brief resumeCapture Resume capture after dither and/or focusing processes are complete.
*/
......@@ -440,7 +428,7 @@ private slots:
void checkMeridianFlipTimeout();
//void checkAlignmentSlewComplete();
// Auto Focus
// Auto Focus
//void updateAutofocusStatus(bool status, double HFR);
void setHFR(double newHFR) { focusHFR = newHFR; }
void startPostFilterAutoFocus();
......
......@@ -6,13 +6,31 @@
<rect>
<x>0</x>
<y>0</y>
<width>776</width>
<height>449</height>
<width>728</width>
<height>413</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>1</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QGroupBox" name="CCDFWGroup">
<property name="enabled">
......@@ -34,8 +52,14 @@
<string>CCD &amp;&amp; Filter Wheel</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>1</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="spacing">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="textLabel1_6">
<property name="toolTip">
......@@ -54,6 +78,9 @@
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_5_3">
<property name="toolTip">
......@@ -139,6 +166,9 @@
</item>
<item row="1" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_9">
<property name="toolTip">
......@@ -239,6 +269,9 @@
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_13">
<property name="toolTip">
......@@ -289,6 +322,9 @@
</item>
<item row="2" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_10">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_15">
<property name="toolTip">
......@@ -387,6 +423,9 @@
</item>
<item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QCheckBox" name="temperatureCheck">
<property name="toolTip">
......@@ -490,6 +529,9 @@
</item>
<item row="4" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_16">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QCheckBox" name="filterCheck">
<property name="toolTip">
......@@ -572,6 +614,9 @@
</item>
<item row="5" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_8">
<property name="toolTip">
......@@ -627,6 +672,9 @@
</item>
<item row="6" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="ISOLabel">
<property name="enabled">
......@@ -656,6 +704,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_18">
<property name="toolTip">
......@@ -699,11 +750,27 @@
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="SequenceQueue">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
......@@ -716,8 +783,14 @@
<string>Sequence Queue</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QPushButton" name="addToQueueB">
<property name="minimumSize">
......@@ -989,6 +1062,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QPushButton" name="previewB">
<property name="toolTip">
......@@ -1082,14 +1158,23 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QGroupBox" name="optionsGroup">
<property name="title">
<string>Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QCheckBox" name="darkSubCheck">
<property name="toolTip">
......@@ -1120,6 +1205,9 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<property name="spacing">
<number>1</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="guideDeviationCheck">
<property name="enabled">
......@@ -1312,10 +1400,31 @@
<string>Progress</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="spacing">
<number>1</number>
</property>
<item>
<layout class="QGridLayout" name="progressLayout">
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="progressLabel_3">
<property name="text">
......
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