summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-08 22:09:36 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-08 22:09:36 (GMT)
commit25c6335a04785ac6a92a5ac2320065d1b9a94512 (patch)
tree9710a75bf698392215e64ad689b5689602bd0478
parente9a3db10dfdcddb90825a7b3f081b5826bc8c908 (diff)
Moving post capture script to sequence queue where it belongs
-rw-r--r--kstars/ekos/capture/capture.cpp17
-rw-r--r--kstars/ekos/capture/capture.ui594
-rw-r--r--kstars/ekos/capture/sequencejob.cpp10
-rw-r--r--kstars/ekos/capture/sequencejob.h4
-rw-r--r--kstars/ekos/guide/opsguide.cpp8
-rw-r--r--kstars/ekos/opsekos.ui19
-rw-r--r--kstars/kstars.kcfg7
7 files changed, 333 insertions, 326 deletions
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index c04f018..ad8a90a 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -1005,11 +1005,10 @@ bool Capture::setCaptureComplete()
if (checkMeridianFlip())
return true;
- // FIXME remove post capture script later
- if (Options::postCaptureScript().isEmpty() == false)
+ if (activeJob->getPostCaptureScript().isEmpty() == false)
{
- postCaptureScript.start(Options::postCaptureScript());
- appendLogText(i18n("Executing post capture script %1", Options::postCaptureScript()));
+ postCaptureScript.start(activeJob->getPostCaptureScript());
+ appendLogText(i18n("Executing post capture script %1", activeJob->getPostCaptureScript()));
}
else
resumeSequence();
@@ -1472,6 +1471,7 @@ void Capture::addJob(bool preview)
job->setCaptureFilter((FITSScale) filterCombo->currentIndex());
+ job->setPostCaptureScript(postCaptureScriptIN->text());
job->setFlatFieldDuration(flatFieldDuration);
job->setFlatFieldSource(flatFieldSource);
job->setPreMountPark(preMountPark);
@@ -2261,6 +2261,10 @@ bool Capture::processJobInfo(XMLEle *root)
{
delayIN->setValue(atoi(pcdataXMLEle(ep)));
}
+ else if (!strcmp(tagXMLEle(ep), "PostCaptureScript"))
+ {
+ postCaptureScriptIN->setText(pcdataXMLEle(ep));
+ }
else if (!strcmp(tagXMLEle(ep), "FITSDirectory"))
{
fitsDir->setText(pcdataXMLEle(ep));
@@ -2424,7 +2428,7 @@ bool Capture::saveSequenceQueue(const QString &path)
QTextStream outstream(&file);
outstream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
- outstream << "<SequenceQueue version='1.3'>" << endl;
+ outstream << "<SequenceQueue version='1.4'>" << endl;
outstream << "<GuideDeviation enabled='" << (guideDeviationCheck->isChecked() ? "true" : "false") << "'>" << guideDeviation->value() << "</GuideDeviation>" << endl;
outstream << "<Autofocus enabled='" << (autofocusCheck->isChecked() ? "true" : "false") << "'>" << HFRPixels->value() << "</Autofocus>" << endl;
outstream << "<MeridianFlip enabled='" << (meridianCheck->isChecked() ? "true" : "false") << "'>" << meridianHours->value() << "</MeridianFlip>" << endl;
@@ -2461,6 +2465,8 @@ bool Capture::saveSequenceQueue(const QString &path)
outstream << "<Count>" << job->getCount() << "</Count>" << endl;
// ms to seconds
outstream << "<Delay>" << job->getDelay()/1000 << "</Delay>" << endl;
+ if (job->getPostCaptureScript().isEmpty() == false)
+ outstream << "<PostCaptureScript>" << job->getPostCaptureScript() << "</PostCaptureScript>" << endl;
QString rootDir = job->getRootFITSDir();
outstream << "<FITSDirectory>" << rootDir << "</FITSDirectory>" << endl;
if (job->getISOIndex() != -1)
@@ -2553,6 +2559,7 @@ void Capture::syncGUIToJob(SequenceJob *job)
ISOCheck->setChecked(tsEnabled);
countIN->setValue(job->getCount());
delayIN->setValue(job->getDelay()/1000);
+ postCaptureScriptIN->setText(job->getPostCaptureScript());
// Temperature Options
temperatureCheck->setChecked(job->getEnforceTemperature());
diff --git a/kstars/ekos/capture/capture.ui b/kstars/ekos/capture/capture.ui
index dde9e74..b55aac5 100644
--- a/kstars/ekos/capture/capture.ui
+++ b/kstars/ekos/capture/capture.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>728</width>
- <height>412</height>
+ <height>410</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -27,7 +27,7 @@
<number>3</number>
</property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_17">
+ <layout class="QHBoxLayout" name="horizontalLayout_17" stretch="0,0">
<item>
<widget class="QGroupBox" name="CCDFWGroup">
<property name="enabled">
@@ -62,10 +62,10 @@
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
+ <item row="0" column="1">
<widget class="QComboBox" name="CCDCaptureCombo"/>
</item>
- <item row="0" column="3" colspan="3">
+ <item row="0" column="2" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>1</number>
@@ -131,7 +131,7 @@
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
+ <item row="1" column="1">
<widget class="QDoubleSpinBox" name="exposureIN">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -153,96 +153,6 @@
</property>
</widget>
</item>
- <item row="1" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel1_9">
- <property name="toolTip">
- <string>Horizontal and Vertical binning</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Binning:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel1_10">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>X:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="binXIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Horizontal binning</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>10</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel1_11">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Y:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="binYIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Vertical binning</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>10</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_12">
<property name="toolTip">
@@ -256,7 +166,7 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2">
+ <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="spacing">
<number>1</number>
@@ -309,62 +219,76 @@
</item>
</layout>
</item>
- <item row="2" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <property name="spacing">
- <number>1</number>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel1_17">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Type:</string>
</property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="frameTypeCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
- <widget class="QLabel" name="textLabel1_15">
- <property name="toolTip">
- <string/>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="whatsThis">
- <string/>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="darkSubCheck">
+ <property name="toolTip">
+ <string>Perform automatic dark subtraction in preview mode</string>
</property>
<property name="text">
- <string>W:</string>
+ <string>Auto dark subtract</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="frameWIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>99</number>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="textLabel1_16">
+ <widget class="QLabel" name="label_2">
<property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
+ <string>Dark &amp; Flat frames calibration</string>
</property>
<property name="text">
- <string>H:</string>
+ <string>Calibration:</string>
</property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="frameHIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="resetFrameB">
+ <widget class="QPushButton" name="calibrationB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -384,7 +308,7 @@
</size>
</property>
<property name="toolTip">
- <string>Reset CCD frame values to default values</string>
+ <string>Dark &amp; Flat frames calibration options</string>
</property>
<property name="text">
<string/>
@@ -393,29 +317,6 @@
</item>
</layout>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel1_17">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Type:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QComboBox" name="frameTypeCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -423,7 +324,7 @@
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2">
+ <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QCheckBox" name="temperatureCheck">
@@ -466,23 +367,6 @@
</item>
</layout>
</item>
- <item row="4" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_15">
- <item>
- <widget class="QPushButton" name="setTemperatureB">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Set CCD temperature</string>
- </property>
- <property name="text">
- <string>Set</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="5" column="0">
<widget class="QLabel" name="textLabel1_7">
<property name="toolTip">
@@ -496,49 +380,9 @@
</property>
</widget>
</item>
- <item row="5" column="1" colspan="2">
+ <item row="5" column="1">
<widget class="QLineEdit" name="prefixIN"/>
</item>
- <item row="5" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_16">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QCheckBox" name="filterCheck">
- <property name="toolTip">
- <string>Append the active filter slot to the prefix</string>
- </property>
- <property name="text">
- <string>Filter</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="expDurationCheck">
- <property name="toolTip">
- <string>Append the expose duration to the prefix</string>
- </property>
- <property name="text">
- <string>Duration</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="ISOCheck">
- <property name="toolTip">
- <string>Append time stamp to the prefix</string>
- </property>
- <property name="text">
- <string>TS</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="6" column="0">
<widget class="QLabel" name="textLabel1_4">
<property name="toolTip">
@@ -571,39 +415,6 @@
</property>
</widget>
</item>
- <item row="6" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel1_8">
- <property name="toolTip">
- <string>Delay in seconds between consecutive images</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Delay:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="delayIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>3600</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="7" column="0">
<widget class="QLabel" name="label_8">
<property name="toolTip">
@@ -629,53 +440,206 @@
</item>
</widget>
</item>
- <item row="3" column="3" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <item row="8" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="toolTip">
+ <string>Post-capture script to be executed after an image is captured. The capture sequence is resumed when the script is executed successfully.</string>
+ </property>
+ <property name="text">
+ <string>Script:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLineEdit" name="postCaptureScriptIN"/>
+ </item>
+ <item row="8" column="2">
+ <widget class="QLabel" name="textLabel1_18">
+ <property name="toolTip">
+ <string>Directory to save sequence images</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="3">
+ <widget class="QLineEdit" name="fitsDir"/>
+ </item>
+ <item row="8" column="4">
+ <widget class="QPushButton" name="selectFITSDirB">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>28</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>28</width>
+ <height>28</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <widget class="QLabel" name="textLabel1_9">
+ <property name="toolTip">
+ <string>Horizontal and Vertical binning</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Binning:</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="darkSubCheck">
+ <widget class="QLabel" name="textLabel1_10">
<property name="toolTip">
- <string>Perform automatic dark subtraction in preview mode</string>
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
</property>
<property name="text">
- <string>Auto dark subtract</string>
+ <string>X:</string>
</property>
- <property name="checked">
- <bool>false</bool>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="binXIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Horizontal binning</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>1</number>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="line_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <widget class="QLabel" name="textLabel1_11">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Y:</string>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="label_2">
+ <widget class="QSpinBox" name="binYIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="toolTip">
- <string>Dark &amp; Flat frames calibration</string>
+ <string>Vertical binning</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel1_15">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
</property>
<property name="text">
- <string>Calibration:</string>
+ <string>W:</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="frameWIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>99</number>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="calibrationB">
- <property name="enabled">
- <bool>false</bool>
+ <widget class="QLabel" name="textLabel1_16">
+ <property name="toolTip">
+ <string/>
</property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>H:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="frameHIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="resetFrameB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -695,7 +659,7 @@
</size>
</property>
<property name="toolTip">
- <string>Dark &amp; Flat frames calibration options</string>
+ <string>Reset CCD frame values to default values</string>
</property>
<property name="text">
<string/>
@@ -704,55 +668,97 @@
</item>
</layout>
</item>
- <item row="8" column="0" colspan="6">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item row="4" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_15">
+ <item>
+ <widget class="QPushButton" name="setTemperatureB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Set CCD temperature</string>
+ </property>
+ <property name="text">
+ <string>Set</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="5" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_16">
<property name="spacing">
<number>1</number>
</property>
<item>
- <widget class="QLabel" name="textLabel1_18">
+ <widget class="QCheckBox" name="filterCheck">
<property name="toolTip">
- <string>Directory to save sequence images</string>
+ <string>Append the active filter slot to the prefix</string>
</property>
- <property name="whatsThis">
- <string/>
+ <property name="text">
+ <string>Filter</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="expDurationCheck">
+ <property name="toolTip">
+ <string>Append the expose duration to the prefix</string>
+ </property>
+ <property name="text">
+ <string>Duration</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="ISOCheck">
+ <property name="toolTip">
+ <string>Append time stamp to the prefix</string>
</property>
<property name="text">
- <string>Directory:</string>
+ <string>TS</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item row="6" column="2" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
- <widget class="QLineEdit" name="fitsDir"/>
+ <widget class="QLabel" name="textLabel1_8">
+ <property name="toolTip">
+ <string>Delay in seconds between consecutive images</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Delay:</string>
+ </property>
+ </widget>
</item>
<item>
- <widget class="QPushButton" name="selectFITSDirB">
+ <widget class="QSpinBox" name="delayIN">
<property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
- <size>
- <width>28</width>
- <height>28</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>28</width>
- <height>28</height>
- </size>
- </property>
- <property name="text">
- <string/>
+ <property name="maximum">
+ <number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
- <item row="7" column="4">
+ <item row="7" column="2" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>1</number>
diff --git a/kstars/ekos/capture/sequencejob.cpp b/kstars/ekos/capture/sequencejob.cpp
index b5b3215..0891ca2 100644
--- a/kstars/ekos/capture/sequencejob.cpp
+++ b/kstars/ekos/capture/sequencejob.cpp
@@ -388,6 +388,16 @@ void SequenceJob::setFilterPostFocusReady(bool value)
}
}
+QString SequenceJob::getPostCaptureScript() const
+{
+ return postCaptureScript;
+}
+
+void SequenceJob::setPostCaptureScript(const QString &value)
+{
+ postCaptureScript = value;
+}
+
int SequenceJob::getISOIndex() const
{
return isoIndex;
diff --git a/kstars/ekos/capture/sequencejob.h b/kstars/ekos/capture/sequencejob.h
index d30d5fd..09fb07d 100644
--- a/kstars/ekos/capture/sequencejob.h
+++ b/kstars/ekos/capture/sequencejob.h
@@ -144,6 +144,9 @@ class SequenceJob : public QObject
bool getFilterPostFocusReady() const;
void setFilterPostFocusReady(bool value);
+ QString getPostCaptureScript() const;
+ void setPostCaptureScript(const QString &value);
+
signals:
void prepareComplete();
void checkFocus();
@@ -179,6 +182,7 @@ private:
QTableWidgetItem *statusCell;
QString fitsDir;
QString rootFITSDir;
+ QString postCaptureScript;
bool typePrefixEnabled, filterPrefixEnabled, expPrefixEnabled, timeStampPrefixEnabled;
QString rawPrefix;
diff --git a/kstars/ekos/guide/opsguide.cpp b/kstars/ekos/guide/opsguide.cpp
index a037885..56fcbb6 100644
--- a/kstars/ekos/guide/opsguide.cpp
+++ b/kstars/ekos/guide/opsguide.cpp
@@ -73,8 +73,8 @@ void OpsGuide::slotLoadSettings(Guide::GuiderType guiderType)
LinGuiderR->setChecked(true);
externalHost->setEnabled(true);
externalPort->setEnabled(true);
- externalHost->setText(Options::lINGuiderHost());
- externalPort->setText(QString::number(Options::lINGuiderPort()));
+ externalHost->setText(Options::linGuiderHost());
+ externalPort->setText(QString::number(Options::linGuiderPort()));
break;
}
}
@@ -100,8 +100,8 @@ void OpsGuide::slotApply()
case Guide::GUIDE_LINGUIDER:
type = Guide::GUIDE_LINGUIDER;
Options::setGuiderType(Guide::GUIDE_LINGUIDER);
- Options::setLINGuiderHost(externalHost->text());
- Options::setLINGuiderPort(externalPort->text().toInt());
+ Options::setLinGuiderHost(externalHost->text());
+ Options::setLinGuiderPort(externalPort->text().toInt());
break;
}
diff --git a/kstars/ekos/opsekos.ui b/kstars/ekos/opsekos.ui
index a2b0e3e..d472203 100644
--- a/kstars/ekos/opsekos.ui
+++ b/kstars/ekos/opsekos.ui
@@ -14,7 +14,7 @@
<string>TabWidget</string>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="generalTab">
<attribute name="title">
@@ -334,20 +334,6 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_11">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Post Capture Script</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="kcfg_PostCaptureScript"/>
- </item>
- </layout>
- </item>
- <item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -557,7 +543,4 @@
</widget>
<resources/>
<connections/>
- <buttongroups>
- <buttongroup name="guideButtonGroup"/>
- </buttongroups>
</ui>
diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
index 531cb60..ebc1570 100644
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -1434,9 +1434,6 @@
<label>Perform auto stretch on captured images in FITS Viewer.</label>
<default>true</default>
</entry>
- <entry name="PostCaptureScript" type="String">
- <label>Script to execute after an image is captured. The capture process halts until the script is complete.</label>
- </entry>
</group>
<group name="Focus">
<entry name="DefaultFocusCCD" type="String">
@@ -1605,11 +1602,11 @@
<label>PHD2 Event Monitoring Port</label>
<default>4400</default>
</entry>
- <entry name="LINGuiderHost" type="String">
+ <entry name="LinGuiderHost" type="String">
<label>Host name of external lin_guider service</label>
<default>localhost</default>
</entry>
- <entry name="LINGuiderPort" type="UInt">
+ <entry name="LinGuiderPort" type="UInt">
<label>Lin_guider Event Monitoring Port</label>
<default>5656</default>
</entry>