summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-24 00:02:59 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-24 00:02:59 (GMT)
commit82083ae2781efd7fbfc19688c8ff2d21178e2418 (patch)
tree5488536a023b6371e8e3549510e294b761e1fc94
parentfcdf2f94822e771b972a812516cb71e574f5d635 (diff)
Several changes to the guiding GUI to make it more compact, still needs further improvements maybe with embedded FITS View
-rw-r--r--kstars/ekos/guide.cpp2
-rw-r--r--kstars/ekos/guide.ui317
-rw-r--r--kstars/ekos/guide/guider.ui822
-rw-r--r--kstars/ekos/guide/rcalibration.ui589
4 files changed, 895 insertions, 835 deletions
diff --git a/kstars/ekos/guide.cpp b/kstars/ekos/guide.cpp
index 3e1d465..bb6e106 100644
--- a/kstars/ekos/guide.cpp
+++ b/kstars/ekos/guide.cpp
@@ -64,6 +64,8 @@ Guide::Guide() : QWidget()
tabWidget = new QTabWidget(this);
tabLayout->addWidget(tabWidget);
+ tabLayout->setContentsMargins(3,3,3,3);
+ tabLayout->setSpacing(1);
exposureIN->setValue(Options::guideExposure());
connect(exposureIN, SIGNAL(editingFinished()), this, SLOT(saveDefaultGuideExposure()));
diff --git a/kstars/ekos/guide.ui b/kstars/ekos/guide.ui
index 6bcbb11..aeab9a5 100644
--- a/kstars/ekos/guide.ui
+++ b/kstars/ekos/guide.ui
@@ -6,183 +6,174 @@
<rect>
<x>0</x>
<y>0</y>
- <width>669</width>
- <height>55</height>
+ <width>133</width>
+ <height>178</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Guider:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="guiderCombo"/>
- </item>
- <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>Select which device receives the guiding correction commands.</string>
- </property>
- <property name="text">
- <string>Via:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="ST4Combo"/>
- </item>
- <item>
- <widget class="Line" name="line_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="toolTip">
- <string>Exposure time in seconds</string>
- </property>
- <property name="text">
- <string>Exp:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="exposureIN">
- <property name="maximum">
- <double>60.000000000000000</double>
- </property>
- <property name="value">
- <double>1.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="toolTip">
- <string>Guide camera binning. It is recommended to set binning to 2x2 or higher.</string>
- </property>
- <property name="text">
- <string>Bin:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="binningCombo"/>
- </item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_5">
- <property name="toolTip">
- <string>Guide star tracking box size. Box size must be set in accordance to the selected star size.</string>
- </property>
- <property name="text">
- <string>Box:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="boxSizeCombo">
- <item>
- <property name="text">
- <string>8</string>
- </property>
+ <layout class="QHBoxLayout" name="tabLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item row="7" column="0">
+ <widget class="QCheckBox" name="darkFrameCheck">
+ <property name="toolTip">
+ <string>Subtract dark frame. If no dark frame is available, a new dark frame shall be captured and saved for future use.</string>
+ </property>
+ <property name="text">
+ <string>Dark</string>
+ </property>
+ </widget>
</item>
- <item>
- <property name="text">
- <string>16</string>
- </property>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="guiderCombo"/>
</item>
- <item>
- <property name="text">
- <string>32</string>
- </property>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="binningCombo"/>
</item>
- <item>
- <property name="text">
- <string>64</string>
- </property>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="toolTip">
+ <string>Select which device receives the guiding correction commands.</string>
+ </property>
+ <property name="text">
+ <string>Via:</string>
+ </property>
+ </widget>
</item>
- <item>
- <property name="text">
- <string>128</string>
- </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Guider:</string>
+ </property>
+ </widget>
</item>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_6">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <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>
- <widget class="QComboBox" name="filterCombo">
- <item>
- <property name="text">
- <string>--</string>
- </property>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="toolTip">
+ <string>Guide camera binning. It is recommended to set binning to 2x2 or higher.</string>
+ </property>
+ <property name="text">
+ <string>Bin:</string>
+ </property>
+ </widget>
</item>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="darkFrameCheck">
- <property name="toolTip">
- <string>Subtract dark frame. If no dark frame is available, a new dark frame shall be captured and saved for future use.</string>
- </property>
- <property name="text">
- <string>Dark</string>
- </property>
- </widget>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="toolTip">
+ <string>Exposure time in seconds</string>
+ </property>
+ <property name="text">
+ <string>Exp:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="boxSizeCombo">
+ <item>
+ <property name="text">
+ <string>8</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>16</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>32</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>64</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>128</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="6" 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="5" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="toolTip">
+ <string>Guide star tracking box size. Box size must be set in accordance to the selected star size.</string>
+ </property>
+ <property name="text">
+ <string>Box:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QComboBox" name="filterCombo">
+ <item>
+ <property name="text">
+ <string>--</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QDoubleSpinBox" name="exposureIN">
+ <property name="maximum">
+ <double>60.000000000000000</double>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="ST4Combo"/>
+ </item>
+ <item row="8" column="0">
+ <spacer name="verticalSpacer_2">
+ <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>
</item>
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="tabLayout"/>
+ <spacer name="verticalSpacer">
+ <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>
diff --git a/kstars/ekos/guide/guider.ui b/kstars/ekos/guide/guider.ui
index 5eb42ab..970971b 100644
--- a/kstars/ekos/guide/guider.ui
+++ b/kstars/ekos/guide/guider.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>833</width>
- <height>415</height>
+ <width>554</width>
+ <height>457</height>
</rect>
</property>
<property name="sizePolicy">
@@ -31,17 +31,53 @@
<property name="windowTitle">
<string>Guiding</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <property name="spacing">
+ <number>5</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>0</number>
+ </property>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_6">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QGroupBox" name="driftGraphicsGroup">
<property name="title">
<string>Drift graphics</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <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>
<widget class="QFrame" name="frame_Graph">
<property name="sizePolicy">
@@ -78,6 +114,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_1">
<property name="text">
@@ -133,21 +172,133 @@
</item>
</layout>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="setupGroup">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="title">
+ <string>Setup</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <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>
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <property name="spacing">
+ <number>1</number>
</property>
- </spacer>
+ <item row="0" column="0">
+ <widget class="QPushButton" name="captureB">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Capture</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="pushButton_StartStop">
+ <property name="text">
+ <string>Start Autoguide</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="connectPHD2B">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Connect External</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="l_19">
+ <property name="text">
+ <string>Algorithm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboBox_ThresholdAlg"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="subFrameCheck">
+ <property name="toolTip">
+ <string>Subframe the image around the guide star</string>
+ </property>
+ <property name="text">
+ <string>Subframe</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="ditherCheck">
+ <property name="toolTip">
+ <string>Subframe the image around the guide star</string>
+ </property>
+ <property name="text">
+ <string>Dither</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <widget class="QDoubleSpinBox" name="ditherPixels">
+ <property name="minimum">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>2.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="l_22">
+ <property name="text">
+ <string>pixels</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="rapidGuideCheck">
+ <property name="text">
+ <string>Rapid Guide</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -155,15 +306,36 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QGroupBox" name="infoGroup">
<property name="title">
<string>Info</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
+ <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_5">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_3">
<property name="toolTip">
@@ -204,6 +376,9 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout_4">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="l_5">
<property name="text">
@@ -310,6 +485,9 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="l_16">
<property name="text">
@@ -319,6 +497,9 @@
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_DeltaRA">
<property name="frameShape">
@@ -362,6 +543,9 @@
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_PulseRA">
<property name="frameShape">
@@ -398,6 +582,9 @@
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_20">
<property name="text">
@@ -428,6 +615,9 @@
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
<widget class="QLabel" name="l_21">
<property name="text">
@@ -462,403 +652,257 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="setupGroup">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <widget class="QGroupBox" name="controlGroup">
<property name="title">
- <string>Setup</string>
+ <string>Control</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_7">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <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_9">
- <item>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="QPushButton" name="captureB">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Capture</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="pushButton_StartStop">
- <property name="text">
- <string>Start Autoguide</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="l_19">
- <property name="text">
- <string>Algorithm</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="comboBox_ThresholdAlg"/>
- </item>
- <item row="2" column="0">
- <widget class="QCheckBox" name="subFrameCheck">
- <property name="toolTip">
- <string>Subframe the image around the guide star</string>
- </property>
- <property name="text">
- <string>Subframe</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QCheckBox" name="rapidGuideCheck">
- <property name="text">
- <string>Rapid Guide</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="ditherCheck">
- <property name="toolTip">
- <string>Subframe the image around the guide star</string>
- </property>
- <property name="text">
- <string>Dither</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <widget class="QDoubleSpinBox" name="ditherPixels">
- <property name="minimum">
- <double>0.100000000000000</double>
- </property>
- <property name="maximum">
- <double>10.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- <property name="value">
- <double>2.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="l_22">
- <property name="text">
- <string>pixels</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="swapCheck">
+ <property name="toolTip">
+ <string>Swap DEC direction pulses. This value is determined automatically from the calibration procedure, only override if necessary.</string>
+ </property>
+ <property name="text">
+ <string>Swap</string>
+ </property>
+ </widget>
</item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="2">
+ <widget class="QCheckBox" name="checkBox_DirDEC">
+ <property name="text">
+ <string>DEC</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="l_9">
+ <property name="text">
+ <string>Enable directions</string>
</property>
- </spacer>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="checkBox_DirRA">
+ <property name="text">
+ <string>RA</string>
+ </property>
+ </widget>
</item>
</layout>
</item>
<item>
- <spacer name="verticalSpacer_3">
+ <widget class="Line" name="line">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ </widget>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="l_11">
+ <property name="text">
+ <string>Proportional gain</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox_PropGainRA">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QDoubleSpinBox" name="spinBox_PropGainDEC">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="l_12">
+ <property name="text">
+ <string>Integral gain</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox_IntGainRA">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QDoubleSpinBox" name="spinBox_IntGainDEC">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="l_13">
+ <property name="text">
+ <string>Derivative gain</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox_DerGainRA">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QDoubleSpinBox" name="spinBox_DerGainDEC">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="l_14">
+ <property name="text">
+ <string>Maximum pulse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="spinBox_MaxPulseRA">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QSpinBox" name="spinBox_MaxPulseDEC">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="l_15">
+ <property name="text">
+ <string>Minimum pulse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QSpinBox" name="spinBox_MinPulseRA">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QSpinBox" name="spinBox_MinPulseDEC">
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="l_23">
+ <property name="text">
+ <string>AO Limits</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox_AOLimit">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Maximum deviation to correct for using Adaptive Optics unit. If the guiding deviation exceeds this value, Ekos will guide the mount mechanically</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <double>30.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.500000000000000</double>
+ </property>
+ <property name="value">
+ <double>2.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2">
+ <widget class="QLabel" name="l_24">
+ <property name="text">
+ <string>arcsecs</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>20</height>
+ <height>111</height>
</size>
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="connectPHD2B">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Connect PHD2</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
</layout>
</item>
- <item>
- <widget class="QGroupBox" name="controlGroup">
- <property name="title">
- <string>Control</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="2">
- <widget class="QCheckBox" name="swapCheck">
- <property name="toolTip">
- <string>Swap DEC direction pulses. This value is determined automatically from the calibration procedure, only override if necessary.</string>
- </property>
- <property name="text">
- <string>Swap</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QCheckBox" name="checkBox_DirDEC">
- <property name="text">
- <string>DEC</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="l_9">
- <property name="text">
- <string>Enable directions</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="checkBox_DirRA">
- <property name="text">
- <string>RA</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="l_11">
- <property name="text">
- <string>Proportional gain</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QDoubleSpinBox" name="spinBox_PropGainRA">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QDoubleSpinBox" name="spinBox_PropGainDEC">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="l_12">
- <property name="text">
- <string>Integral gain</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="spinBox_IntGainRA">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QDoubleSpinBox" name="spinBox_IntGainDEC">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="l_13">
- <property name="text">
- <string>Derivative gain</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QDoubleSpinBox" name="spinBox_DerGainRA">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QDoubleSpinBox" name="spinBox_DerGainDEC">
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="l_14">
- <property name="text">
- <string>Maximum pulse</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="spinBox_MaxPulseRA">
- <property name="maximum">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QSpinBox" name="spinBox_MaxPulseDEC">
- <property name="maximum">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="l_15">
- <property name="text">
- <string>Minimum pulse</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QSpinBox" name="spinBox_MinPulseRA">
- <property name="maximum">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="QSpinBox" name="spinBox_MinPulseDEC">
- <property name="maximum">
- <number>9999</number>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="l_23">
- <property name="text">
- <string>AO Limits</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QDoubleSpinBox" name="spinBox_AOLimit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Maximum deviation to correct for using Adaptive Optics unit. If the guiding deviation exceeds this value, Ekos will guide the mount mechanically</string>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="maximum">
- <double>30.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.500000000000000</double>
- </property>
- <property name="value">
- <double>2.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="QLabel" name="l_24">
- <property name="text">
- <string>arcsecs</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>111</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>17</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
- <item>
- <widget class="Line" name="line_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
</layout>
</widget>
<tabstops>
diff --git a/kstars/ekos/guide/rcalibration.ui b/kstars/ekos/guide/rcalibration.ui
index e955a34..3a9da84 100644
--- a/kstars/ekos/guide/rcalibration.ui
+++ b/kstars/ekos/guide/rcalibration.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>672</width>
- <height>217</height>
+ <width>404</width>
+ <height>231</height>
</rect>
</property>
<property name="minimumSize">
@@ -16,166 +16,317 @@
<height>0</height>
</size>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QGroupBox" name="calibrationChecklistGroup">
- <property name="title">
- <string>Calibration Checklist</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <widget class="QGroupBox" name="calibrationChecklistGroup">
+ <property name="title">
+ <string>Calibration Checklist</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="KLed" name="startCalibrationLED" native="true">
+ <property name="maximumSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="color" stdset="0">
+ <color>
+ <red>200</red>
+ <green>200</green>
+ <blue>200</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLed" name="selectStarLED" native="true">
+ <property name="maximumSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="color" stdset="0">
+ <color>
+ <red>200</red>
+ <green>200</green>
+ <blue>200</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLed" name="captureLED" native="true">
+ <property name="maximumSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="color" stdset="0">
+ <color>
+ <red>200</red>
+ <green>200</green>
+ <blue>200</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>1. Capture Image</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="captureB">
+ <property name="text">
+ <string>Capture</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>2. Select guide star</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>3. Start calibration</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="pushButton_StartCalibration">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Start</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="calibrationOptionsGroup">
+ <property name="title">
+ <string>Calibration Options</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>7</number>
+ </property>
+ <property name="rightMargin">
+ <number>7</number>
+ </property>
+ <property name="bottomMargin">
+ <number>7</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="1">
- <widget class="QLabel" name="label_9">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="l_29">
<property name="text">
- <string>2. Select guide star</string>
+ <string>Pulse:</string>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="KLed" name="selectStarLED" native="true">
- <property name="maximumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinBox_Pulse">
+ <property name="minimum">
+ <number>100</number>
</property>
- <property name="color" stdset="0">
- <color>
- <red>200</red>
- <green>200</green>
- <blue>200</blue>
- </color>
+ <property name="maximum">
+ <number>5000</number>
</property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="KLed" name="startCalibrationLED" native="true">
- <property name="maximumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
+ <property name="singleStep">
+ <number>100</number>
</property>
- <property name="color" stdset="0">
- <color>
- <red>200</red>
- <green>200</green>
- <blue>200</blue>
- </color>
+ <property name="value">
+ <number>1000</number>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_8">
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="twoAxisCheck">
+ <property name="text">
+ <string>Two axis</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="autoStarCheck">
+ <property name="toolTip">
+ <string>Automatically select the calibration star.</string>
+ </property>
+ <property name="text">
+ <string>Auto Star</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="autoSquareSizeCheck">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Automatically select the square size based on the selected star width.</string>
+ </property>
+ <property name="text">
+ <string>Auto Square Size</string>
+ </property>
+ </widget>
+ </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>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <item row="1" column="0">
+ <widget class="QDoubleSpinBox" name="spinBox_ReticleX"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="l_26">
<property name="text">
- <string>1. Capture Image</string>
+ <string>reticle-X</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLabel" name="label_10">
+ <item row="0" column="1">
+ <widget class="QLabel" name="l_27">
<property name="text">
- <string>3. Start calibration</string>
+ <string>reticle-Y</string>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox_ReticleY"/>
+ </item>
<item row="0" column="2">
- <widget class="QPushButton" name="captureB">
+ <widget class="QLabel" name="l_28">
<property name="text">
- <string>Capture</string>
+ <string>reticle-Angle</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="KLed" name="captureLED" native="true">
- <property name="maximumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- <property name="color" stdset="0">
- <color>
- <red>200</red>
- <green>200</green>
- <blue>200</blue>
- </color>
+ <item row="1" column="2">
+ <widget class="QDoubleSpinBox" name="spinBox_ReticleAngle">
+ <property name="maximum">
+ <double>100.000000000000000</double>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="QPushButton" name="pushButton_StartCalibration">
- <property name="enabled">
- <bool>false</bool>
+ <item row="1" column="3">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text">
- <string>Start</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="3" column="1">
- <spacer name="verticalSpacer">
+ <item row="0" column="3">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>1</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="calibrationOptionsGroup">
- <property name="title">
- <string>Calibration Options</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="l_29">
- <property name="text">
- <string>Pulse:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_Pulse">
- <property name="minimum">
- <number>100</number>
- </property>
- <property name="maximum">
- <number>5000</number>
- </property>
- <property name="singleStep">
- <number>100</number>
- </property>
- <property name="value">
- <number>1000</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
<item>
- <widget class="QCheckBox" name="twoAxisCheck">
+ <widget class="QCheckBox" name="autoModeCheck">
<property name="text">
- <string>Two axis</string>
+ <string>Auto mode</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -183,40 +334,49 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="autoStarCheck">
- <property name="toolTip">
- <string>Automatically select the calibration star.</string>
+ <widget class="QSpinBox" name="spinBox_DriftTime">
+ <property name="minimum">
+ <number>3</number>
</property>
- <property name="text">
- <string>Auto Star</string>
+ <property name="maximum">
+ <number>10</number>
</property>
- <property name="checked">
- <bool>false</bool>
+ <property name="value">
+ <number>5</number>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="autoSquareSizeCheck">
+ <widget class="QProgressBar" name="progressBar">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
- <property name="toolTip">
- <string>Automatically select the square size based on the selected star width.</string>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="text">
- <string>Auto Square Size</string>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>0</number>
</property>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_3">
+ <spacer name="horizontalSpacer_3">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -224,159 +384,22 @@
</layout>
</item>
<item>
- <widget class="Line" name="line">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0">
- <widget class="QDoubleSpinBox" name="spinBox_ReticleX"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="l_26">
- <property name="text">
- <string>reticle-X</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="l_27">
- <property name="text">
- <string>reticle-Y</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="spinBox_ReticleY"/>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="l_28">
- <property name="text">
- <string>reticle-Angle</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QDoubleSpinBox" name="spinBox_ReticleAngle">
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="3">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QCheckBox" name="autoModeCheck">
- <property name="text">
- <string>Auto mode</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_DriftTime">
- <property name="minimum">
- <number>3</number>
- </property>
- <property name="maximum">
- <number>10</number>
- </property>
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QProgressBar" name="progressBar">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>20</number>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <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>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
- </widget>
- </item>
- </layout>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
<spacer name="verticalSpacer_4">