summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-20 20:07:44 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-10-20 20:07:44 (GMT)
commit918e01dcb3d3232e785a6ca56be38d8f077a2e61 (patch)
tree7186e003ff1e7becd05705cdd6fa53a2416a03e5
parent944a3c7cadb6f1d6a316953887f821d2a81f5f26 (diff)
Add upload mode and remote dir options to capture jobs
-rw-r--r--kstars/ekos/capture/capture.cpp26
-rw-r--r--kstars/ekos/capture/capture.ui1748
-rw-r--r--kstars/ekos/capture/sequencejob.cpp24
-rw-r--r--kstars/ekos/capture/sequencejob.h14
-rw-r--r--kstars/indi/indiccd.cpp8
-rw-r--r--kstars/indi/indiccd.h2
6 files changed, 947 insertions, 875 deletions
diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.cpp
index 4ada6a5..1cd134f 100644
--- a/kstars/ekos/capture/capture.cpp
+++ b/kstars/ekos/capture/capture.cpp
@@ -193,9 +193,14 @@ Capture::Capture()
connect(guideDeviation, SIGNAL(valueChanged(double)), this, SLOT(setDirty()));
connect(meridianCheck, SIGNAL(toggled(bool)), this, SLOT(setDirty()));
connect(meridianHours, SIGNAL(valueChanged(double)), this, SLOT(setDirty()));
+ connect(uploadModeCombo, SIGNAL(activated(int)), this, SLOT(setDirty()));
+ connect(remoteDirIN, SIGNAL(editingFinished()), this, SLOT(setDirty()));
- // FIXME remove this later
+ // Post capture script
connect(&postCaptureScript, SIGNAL(finished(int)), this, SLOT(postScriptFinished(int)));
+
+ // Remote directory
+ connect(uploadModeCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [&](int index){remoteDirIN->setEnabled(index != 0);});
}
Capture::~Capture()
@@ -221,9 +226,6 @@ void Capture::addCCD(ISD::GDInterface *newCCD)
if (Filters.count() > 0)
syncFilterInfo();
- //checkCCD(CCDs.count()-1);
- //CCDCaptureCombo->setCurrentIndex(CCDs.count()-1);
-
}
void Capture::addGuideHead(ISD::GDInterface *newCCD)
@@ -1125,7 +1127,8 @@ bool Capture::resumeSequence()
void Capture::captureOne()
{
- if (currentCCD->getUploadMode() == ISD::CCD::UPLOAD_LOCAL)
+ //if (currentCCD->getUploadMode() == ISD::CCD::UPLOAD_LOCAL)
+ if (uploadModeCombo->currentIndex() != 0)
{
appendLogText(i18n("Cannot take preview image while CCD upload mode is set to local. Please change upload mode to client and try again."));
return;
@@ -1459,6 +1462,8 @@ void Capture::addJob(bool preview)
job->setCaptureFilter((FITSScale) filterCombo->currentIndex());
+ job->setUploadMode(static_cast<ISD::CCD::UploadMode>(uploadModeCombo->currentIndex()));
+ job->setRemoteDir(remoteDirIN->text());
job->setPostCaptureScript(postCaptureScriptIN->text());
job->setFlatFieldDuration(flatFieldDuration);
job->setFlatFieldSource(flatFieldSource);
@@ -2247,6 +2252,14 @@ bool Capture::processJobInfo(XMLEle *root)
{
fitsDir->setText(pcdataXMLEle(ep));
}
+ else if (!strcmp(tagXMLEle(ep), "RemoteDirectory"))
+ {
+ remoteDirIN->setText(pcdataXMLEle(ep));
+ }
+ else if (!strcmp(tagXMLEle(ep), "UploadMode"))
+ {
+ uploadModeCombo->setCurrentIndex(atoi(pcdataXMLEle(ep)));
+ }
else if (!strcmp(tagXMLEle(ep), "ISOIndex"))
{
if (ISOCombo->isEnabled())
@@ -2446,6 +2459,9 @@ bool Capture::saveSequenceQueue(const QString &path)
outstream << "<PostCaptureScript>" << job->getPostCaptureScript() << "</PostCaptureScript>" << endl;
QString rootDir = job->getRootFITSDir();
outstream << "<FITSDirectory>" << rootDir << "</FITSDirectory>" << endl;
+ outstream << "<UploadMode>" << job->getUploadMode() << "</UploadMode>" << endl;
+ if (job->getRemoteDir().isEmpty() == false)
+ outstream << "<RemoteDirectory>" << job->getRemoteDir() << "</RemoteDirectory>" << endl;
if (job->getISOIndex() != -1)
outstream << "<ISOIndex>" << (job->getISOIndex()) << "</ISOIndex>" << endl;
diff --git a/kstars/ekos/capture/capture.ui b/kstars/ekos/capture/capture.ui
index 5df61eb..737b2fa 100644
--- a/kstars/ekos/capture/capture.ui
+++ b/kstars/ekos/capture/capture.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>678</width>
- <height>460</height>
+ <width>683</width>
+ <height>483</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3" columnstretch="1,2">
@@ -26,774 +26,6 @@
<property name="spacing">
<number>3</number>
</property>
- <item row="0" column="0">
- <widget class="QGroupBox" name="CCDFWGroup">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="title">
- <string>CCD &amp;&amp; Filter Wheel</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="4" 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="0">
- <widget class="QLabel" name="textLabel1_4">
- <property name="toolTip">
- <string>Number of images to capture</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Count:</string>
- </property>
- </widget>
- </item>
- <item row="9" 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="1" column="1">
- <widget class="QDoubleSpinBox" name="exposureIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- <property name="minimum">
- <double>0.001000000000000</double>
- </property>
- <property name="maximum">
- <double>3600.000000000000000</double>
- </property>
- <property name="value">
- <double>1.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="15" column="1">
- <widget class="QLineEdit" name="postCaptureScriptIN"/>
- </item>
- <item row="15" 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="11" column="0">
- <widget class="QLabel" name="textLabel1_7">
- <property name="toolTip">
- <string>Prefix to append to the beginning of file names</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Prefix:</string>
- </property>
- </widget>
- </item>
- <item row="15" 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="9" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Cooler:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="CCDCaptureCombo"/>
- </item>
- <item row="11" column="2" 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="1">
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel1_13">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>X:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="frameXIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel1_14">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Y:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="frameYIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="6" 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>W:</string>
- </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>
- </property>
- </widget>
- </item>
- <item>
- <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>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Reset CCD frame values to default values</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_6">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>CCD:</string>
- </property>
- </widget>
- </item>
- <item row="15" column="3">
- <widget class="QLineEdit" name="fitsDir"/>
- </item>
- <item row="4" column="2" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QLabel" name="ISOLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>ISO:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="ISOCombo">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="countIN">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="3" column="2" 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="10" column="0" colspan="5">
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="2" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <property name="spacing">
- <number>1</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel1_5_3">
- <property name="toolTip">
- <string>Filter Wheel</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>FW:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="FilterCaptureCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="textLabel1_2_3">
- <property name="toolTip">
- <string>Number of images to capture</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Filter:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="FilterPosCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="15" 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="9" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_11">
- <item>
- <widget class="QCheckBox" name="temperatureCheck">
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enforce temperature value before capturing an image&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- <property name="text">
- <string>Tº</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="temperatureOUT">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="temperatureIN">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="11" column="1">
- <widget class="QLineEdit" name="prefixIN">
- <property name="placeholderText">
- <string>Target</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="exposureLabel_2">
- <property name="toolTip">
- <string>Set the exposure time in seconds for individual images, if applicable</string>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Exposure:</string>
- </property>
- </widget>
- </item>
- <item row="14" column="0" colspan="5">
- <widget class="Line" name="line_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </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="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="6" column="0">
- <widget class="QLabel" name="textLabel1_12">
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Frame:</string>
- </property>
- </widget>
- </item>
- <item row="4" 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="12" column="0">
- <widget class="QLabel" name="label_8">
- <property name="toolTip">
- <string>Apply filter to image after capture to enhance it</string>
- </property>
- <property name="text">
- <string>Filters:</string>
- </property>
- </widget>
- </item>
- <item row="12" column="1">
- <widget class="QComboBox" name="filterCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text">
- <string>--</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="12" column="2" colspan="3">
- <layout class="QHBoxLayout" name="horizontalLayout_12">
- <item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="toolTip">
- <string>Dark &amp; Flat frames calibration</string>
- </property>
- <property name="text">
- <string>Auto Calibration Settings:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="calibrationB">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Dark &amp; Flat frames calibration options</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="5" column="0" colspan="5">
- <widget class="Line" name="line_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="SequenceQueue">
<property name="spacing">
@@ -1254,53 +486,74 @@
<string>Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <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>
- <property name="spacing">
- <number>3</number>
- </property>
- <item row="2" column="2">
- <widget class="QLabel" name="textLabel1_2_5">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="darkSubCheck">
<property name="toolTip">
- <string>Number of images to capture</string>
- </property>
- <property name="whatsThis">
- <string/>
+ <string>Perform automatic dark subtraction in preview mode</string>
</property>
<property name="text">
- <string>pixels</string>
+ <string>Auto dark subtract</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QDoubleSpinBox" name="HFRPixels">
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="toolTip">
+ <string>Apply effect to image after capture to enhance it</string>
+ </property>
+ <property name="text">
+ <string>Effects:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="filterCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>--</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="guideDeviationCheck">
<property name="enabled">
<bool>false</bool>
</property>
- <property name="decimals">
- <number>3</number>
+ <property name="toolTip">
+ <string>Abort sequence if guiding deviation exceed this value</string>
</property>
- <property name="minimum">
- <double>0.000000000000000</double>
+ <property name="text">
+ <string>Guiding Deviation &lt;</string>
</property>
- <property name="maximum">
- <double>10.000000000000000</double>
+ <property name="checked">
+ <bool>false</bool>
</property>
- <property name="singleStep">
- <double>0.100000000000000</double>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QLabel" name="textLabel1_2_4">
+ <property name="toolTip">
+ <string>Number of images to capture</string>
</property>
- <property name="value">
- <double>0.000000000000000</double>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>&quot;</string>
</property>
</widget>
</item>
@@ -1317,40 +570,34 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="guideDeviationCheck">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <item row="2" column="3">
+ <widget class="QLabel" name="textLabel1_2_5">
<property name="toolTip">
- <string>Abort sequence if guiding deviation exceed this value</string>
+ <string>Number of images to capture</string>
</property>
- <property name="text">
- <string>Guiding Deviation &lt;</string>
+ <property name="whatsThis">
+ <string/>
</property>
- <property name="checked">
- <bool>false</bool>
+ <property name="text">
+ <string>pixels</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="guideDeviation">
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="meridianCheck">
<property name="enabled">
<bool>false</bool>
</property>
- <property name="decimals">
- <number>2</number>
- </property>
- <property name="maximum">
- <double>30.000000000000000</double>
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command a meridian flip if the hour angle exceeds the specified value. Capture and Guiding will be suspended and resumed after the flip is complete.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
- <property name="singleStep">
- <double>0.500000000000000</double>
+ <property name="text">
+ <string>Meridian Flip if HA &gt;</string>
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QLabel" name="textLabel1_2_4">
+ <item row="3" column="3">
+ <widget class="QLabel" name="textLabel1_2_6">
<property name="toolTip">
<string>Number of images to capture</string>
</property>
@@ -1358,36 +605,39 @@
<string/>
</property>
<property name="text">
- <string>&quot;</string>
+ <string>hours</string>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="meridianCheck">
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="guideDeviation">
<property name="enabled">
<bool>false</bool>
</property>
- <property name="toolTip">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Command a meridian flip if the hour angle exceeds the specified value. Capture and Guiding will be suspended and resumed after the flip is complete.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <property name="decimals">
+ <number>2</number>
</property>
- <property name="text">
- <string>Meridian Flip if HA &gt;</string>
+ <property name="maximum">
+ <double>30.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.500000000000000</double>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QDoubleSpinBox" name="meridianHours">
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="HFRPixels">
<property name="enabled">
<bool>false</bool>
</property>
<property name="decimals">
- <number>2</number>
+ <number>3</number>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
- <double>3.000000000000000</double>
+ <double>10.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
@@ -1397,29 +647,25 @@
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QLabel" name="textLabel1_2_6">
- <property name="toolTip">
- <string>Number of images to capture</string>
+ <item row="3" column="1">
+ <widget class="QDoubleSpinBox" name="meridianHours">
+ <property name="enabled">
+ <bool>false</bool>
</property>
- <property name="whatsThis">
- <string/>
+ <property name="decimals">
+ <number>2</number>
</property>
- <property name="text">
- <string>hours</string>
+ <property name="minimum">
+ <double>0.000000000000000</double>
</property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QCheckBox" name="darkSubCheck">
- <property name="toolTip">
- <string>Perform automatic dark subtraction in preview mode</string>
+ <property name="maximum">
+ <double>3.000000000000000</double>
</property>
- <property name="text">
- <string>Auto dark subtract</string>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
</property>
- <property name="checked">
- <bool>false</bool>
+ <property name="value">
+ <double>0.000000000000000</double>
</property>
</widget>
</item>
@@ -1620,6 +866,792 @@
</property>
</spacer>
</item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="CCDFWGroup">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>CCD &amp;&amp; Filter Wheel</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="14" column="1">
+ <widget class="QComboBox" name="uploadModeCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text">
+ <string>Client</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Local</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Both</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="15" column="0">
+ <widget class="QLabel" name="textLabel1_18">
+ <property name="toolTip">
+ <string>Local directory to save sequence images</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="1">
+ <widget class="QLineEdit" name="fitsDir"/>
+ </item>
+ <item row="14" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="toolTip">
+ <string>&lt;p&gt;Select how captured images are uploaded:&lt;/p&gt;
+&lt;ol&gt;
+&lt;li&gt;&lt;strong&gt;Client&lt;/strong&gt;: Captured images are only uploaded to Ekos.&lt;/li&gt;
+&lt;li&gt;&lt;strong&gt;Local&lt;/strong&gt;: Captured images are only saved locally on the remote device.&lt;/li&gt;
+&lt;li&gt;&lt;strong&gt;Both&lt;/strong&gt;: Captured images are saved on remote device &lt;b&gt;and&lt;/b&gt; uploaded to Ekos.&lt;/li&gt;
+&lt;/ol&gt;
+&lt;p&gt;When selecting &lt;i&gt;Local&lt;/i&gt; or &lt;i&gt;Both&lt;/i&gt;, you must specify the remote directory where the remote images are saved to. By default, all captured images are uploaded to Ekos.</string>
+ </property>
+ <property name="text">
+ <string>Upload:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" 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="0">
+ <widget class="QLabel" name="textLabel1_4">
+ <property name="toolTip">
+ <string>Number of images to capture</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Count:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="3" colspan="5">
+ <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="1" column="1">
+ <widget class="QDoubleSpinBox" name="exposureIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="decimals">
+ <number>3</number>
+ </property>
+ <property name="minimum">
+ <double>0.001000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>3600.000000000000000</double>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLabel" name="textLabel1_7">
+ <property name="toolTip">
+ <string>&lt;p&gt;Prefix is used to generate file names ( e.g. M42_HA_240_secs_001.fits)&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;&lt;strong&gt;Target&lt;/strong&gt;: Target Name (e.g. M42)&lt;/li&gt;
+&lt;li&gt;&lt;strong&gt;Filter&lt;/strong&gt;: When using a filter wheel, the filter name is appended to the file name (e.g. HA)&lt;/li&gt;
+&lt;li&gt;&lt;strong&gt;Duration&lt;/strong&gt;: Capture duration is appended to the file name (e.g. 240_secs)&lt;/li&gt;
+&lt;li&gt;&lt;strong&gt;TS&lt;/strong&gt;: ISO 8601 timestamp is appended to the file name (e.g. 2016-10-20T22:42:10)&lt;/li&gt;
+&lt;/ul&gt;</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Prefix:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Cooler:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="CCDCaptureCombo"/>
+ </item>
+ <item row="11" column="3" colspan="5">
+ <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="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel1_13">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>X:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="frameXIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="textLabel1_14">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Y:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="frameYIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="6" column="3" colspan="5">
+ <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>W:</string>
+ </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>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <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>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Reset CCD frame values to default values</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_6">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>CCD:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0" colspan="8">
+ <widget class="Line" name="line_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="3" colspan="5">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="calibrationB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Dark &amp; Flat frames automatic calibration options</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="ISOLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>ISO:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="ISOCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="countIN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ <property name="value">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" colspan="5">
+ <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="0" column="3" colspan="5">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel1_5_3">
+ <property name="toolTip">
+ <string>Filter Wheel</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>FW:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="FilterCaptureCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="textLabel1_2_3">
+ <property name="toolTip">
+ <string>Number of images to capture</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Filter:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="FilterPosCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="9" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
+ <item>
+ <widget class="QCheckBox" name="temperatureCheck">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enforce temperature value before capturing an image&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>Tº</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="temperatureOUT">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="temperatureIN">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="13" column="0" colspan="8">
+ <widget class="Line" name="line_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="1">
+ <widget class="QLineEdit" name="prefixIN">
+ <property name="placeholderText">
+ <string>Target</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="exposureLabel_2">
+ <property name="toolTip">
+ <string>Set the exposure time in seconds for individual images, if applicable</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Exposure:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" colspan="5">
+ <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="6" column="0">
+ <widget class="QLabel" name="textLabel1_12">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Frame:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" 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="5" column="0" colspan="8">
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="3">
+ <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>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="4">
+ <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="15" column="5">
+ <widget class="QLineEdit" name="postCaptureScriptIN"/>
+ </item>
+ <item row="14" column="3">
+ <widget class="QLabel" name="label_2">
+ <property name="toolTip">
+ <string>When storing images on remote devices, specify the directory where captured images are saved to.</string>
+ </property>
+ <property name="text">
+ <string>Remote:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="4" colspan="2">
+ <widget class="QLineEdit" name="remoteDirIN">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="placeholderText">
+ <string>/home/pi</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>
@@ -1645,11 +1677,6 @@
<tabstop>filterCheck</tabstop>
<tabstop>expDurationCheck</tabstop>
<tabstop>ISOCheck</tabstop>
- <tabstop>filterCombo</tabstop>
- <tabstop>calibrationB</tabstop>
- <tabstop>postCaptureScriptIN</tabstop>
- <tabstop>fitsDir</tabstop>
- <tabstop>selectFITSDirB</tabstop>
<tabstop>addToQueueB</tabstop>
<tabstop>removeFromQueueB</tabstop>
<tabstop>queueUpB</tabstop>
@@ -1664,11 +1691,8 @@
<tabstop>pauseB</tabstop>
<tabstop>darkSubCheck</tabstop>
<tabstop>guideDeviationCheck</tabstop>
- <tabstop>guideDeviation</tabstop>
<tabstop>autofocusCheck</tabstop>
- <tabstop>HFRPixels</tabstop>
<tabstop>meridianCheck</tabstop>
- <tabstop>meridianHours</tabstop>
</tabstops>
<resources/>
<connections/>
diff --git a/kstars/ekos/capture/sequencejob.cpp b/kstars/ekos/capture/sequencejob.cpp
index 0891ca2..88286db 100644
--- a/kstars/ekos/capture/sequencejob.cpp
+++ b/kstars/ekos/capture/sequencejob.cpp
@@ -106,8 +106,10 @@ void SequenceJob::prepareCapture()
activeCCD->setSeqPrefix(fullPrefix);
+ activeCCD->setUploadMode(uploadMode);
+
if (activeChip->isBatchMode())
- activeCCD->updateUploadSettings();
+ activeCCD->updateUploadSettings(remoteDir);
if (isoIndex != -1)
{
@@ -398,6 +400,26 @@ void SequenceJob::setPostCaptureScript(const QString &value)
postCaptureScript = value;
}
+ISD::CCD::UploadMode SequenceJob::getUploadMode() const
+{
+ return uploadMode;
+}
+
+void SequenceJob::setUploadMode(const ISD::CCD::UploadMode &value)
+{
+ uploadMode = value;
+}
+
+QString SequenceJob::getRemoteDir() const
+{
+ return remoteDir;
+}
+
+void SequenceJob::setRemoteDir(const QString &value)
+{
+ remoteDir = value;
+}
+
int SequenceJob::getISOIndex() const
{
return isoIndex;
diff --git a/kstars/ekos/capture/sequencejob.h b/kstars/ekos/capture/sequencejob.h
index 09fb07d..941a9af 100644
--- a/kstars/ekos/capture/sequencejob.h
+++ b/kstars/ekos/capture/sequencejob.h
@@ -145,7 +145,13 @@ class SequenceJob : public QObject
void setFilterPostFocusReady(bool value);
QString getPostCaptureScript() const;
- void setPostCaptureScript(const QString &value);
+ void setPostCaptureScript(const QString &value);
+
+ ISD::CCD::UploadMode getUploadMode() const;
+ void setUploadMode(const ISD::CCD::UploadMode &value);
+
+ QString getRemoteDir() const;
+ void setRemoteDir(const QString &value);
signals:
void prepareComplete();
@@ -184,6 +190,12 @@ private:
QString rootFITSDir;
QString postCaptureScript;
+ //TODO getters and setters
+ ISD::CCD::UploadMode uploadMode = ISD::CCD::UPLOAD_CLIENT;
+
+ // TODO getters and settings
+ QString remoteDir;
+
bool typePrefixEnabled, filterPrefixEnabled, expPrefixEnabled, timeStampPrefixEnabled;
QString rawPrefix;
diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp
index 92b7bef..dd1bbd0 100644
--- a/kstars/indi/indiccd.cpp
+++ b/kstars/indi/indiccd.cpp
@@ -1621,7 +1621,7 @@ bool CCD::configureRapidGuide(CCDChip *targetChip, bool autoLoop, bool sendImage
return true;
}
-void CCD::updateUploadSettings()
+void CCD::updateUploadSettings(const QString &remoteDir)
{
QString filename = seqPrefix + (seqPrefix.isEmpty() ? "" : "_") + QString("XXX");
@@ -1632,15 +1632,13 @@ void CCD::updateUploadSettings()
if (uploadSettingsTP)
{
uploadT = IUFindText(uploadSettingsTP, "UPLOAD_DIR");
- if (uploadT)
- IUSaveText(uploadT, fitsDir.toLatin1().constData());
+ if (uploadT && remoteDir.isEmpty() == false)
+ IUSaveText(uploadT, remoteDir.toLatin1().constData());
uploadT = IUFindText(uploadSettingsTP, "UPLOAD_PREFIX");
if (uploadT)
IUSaveText(uploadT, filename.toLatin1().constData());
-
-
clientManager->sendNewText(uploadSettingsTP);
}
}
diff --git a/kstars/indi/indiccd.h b/kstars/indi/indiccd.h
index f0c1923..1869fb3 100644
--- a/kstars/indi/indiccd.h
+++ b/kstars/indi/indiccd.h
@@ -158,7 +158,7 @@ public:
void setFilter(const QString & newFilter) { filter = newFilter;}
bool configureRapidGuide(CCDChip *targetChip, bool autoLoop, bool sendImage=false, bool showMarker=false);
bool setRapidGuide(CCDChip *targetChip, bool enable);
- void updateUploadSettings();
+ void updateUploadSettings(const QString &remoteDir);
UploadMode getUploadMode();
bool setUploadMode(UploadMode mode);