diff --git a/Common/Clients/CaltoolClient/src/_ctc.py b/Common/Clients/CaltoolClient/src/_ctc.py index a226d1b309860486665a7fa1f6c16486b433ba88..98f099345424e7e8894fb5cfaf67dad35f9dbc4c 100644 --- a/Common/Clients/CaltoolClient/src/_ctc.py +++ b/Common/Clients/CaltoolClient/src/_ctc.py @@ -70,6 +70,11 @@ class MyWorker(QThread): self.newrecordingstatus=False self.azimuthOffset=self.boss._get_azimuthOffset() self.elevationOffset=self.boss._get_elevationOffset() + self.rightAscensionOffset=self.boss._get_rightAscensionOffset() + self.declinationOffset=self.boss._get_declinationOffset() + + raOffset=self.boss._get_azimuthOffset() + self.elevationOffset=self.boss._get_elevationOffset() def run (self): @@ -120,8 +125,14 @@ class MyWorker(QThread): self.emit(Qt.SIGNAL("scanAxis"),scanaxis) (azOffset,_)=self.azimuthOffset.get_sync() (elOffset,_)=self.elevationOffset.get_sync() + (raOffset,_)=self.rightAscensionOffset.get_sync() + (decOffset,_)=self.declinationOffset.get_sync() + self.emit(Qt.SIGNAL("azoffset"),f'{azOffset/math.pi*180:.3f}') self.emit(Qt.SIGNAL("eloffset"),f'{elOffset/math.pi*180:.3f}') + self.emit(Qt.SIGNAL("raoffset"),f'{raOffset/math.pi*180:.3f}') + self.emit(Qt.SIGNAL("decoffset"),f'{decOffset/math.pi*180:.3f}') + declinationOffset rec= self.caltool.isRecording() if rec==True: @@ -259,6 +270,8 @@ class Application(Qt.QDialog,calibrationtool_ui.Ui_CalibrationToolDialog): self.connect(self.thread,Qt.SIGNAL("scanAxis"),self.scanAxis) self.connect(self.thread,Qt.SIGNAL("eloffset"),self.elOffsetlineEdit.setText) self.connect(self.thread,Qt.SIGNAL("azoffset"),self.azOffsetlineEdit.setText) + self.connect(self.thread,Qt.SIGNAL("raoffset"),self.raOffsetlineEdit.setText) + self.connect(self.thread,Qt.SIGNAL("decoffset"),self.decOffsetlineEdit.setText) @pyqtSlot(Qt.QObject,name="isRecording") def isRecording(self,rec): diff --git a/Common/Clients/CaltoolClient/src/calibrationToolClient.ui b/Common/Clients/CaltoolClient/src/calibrationToolClient.ui index 40edee8a0fdc853bdbb3295a36aa6b3fe8832a83..52b8f35b1a08623c664221691f1b13aef8d29458 100644 --- a/Common/Clients/CaltoolClient/src/calibrationToolClient.ui +++ b/Common/Clients/CaltoolClient/src/calibrationToolClient.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>998</width> - <height>726</height> + <height>731</height> </rect> </property> <property name="windowTitle"> @@ -99,7 +99,7 @@ <rect> <x>560</x> <y>100</y> - <width>381</width> + <width>421</width> <height>381</height> </rect> </property> @@ -111,8 +111,8 @@ <rect> <x>0</x> <y>10</y> - <width>408</width> - <height>361</height> + <width>421</width> + <height>352</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_3"> @@ -135,25 +135,6 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="nameLineEdit"> - <property name="minimumSize"> - <size> - <width>94</width> - <height>22</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>150</width> - <height>26</height> - </size> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="fluxLabel_4"> <property name="minimumSize"> @@ -456,6 +437,9 @@ </item> <item row="11" column="1"> <widget class="QLineEdit" name="recording"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -533,6 +517,28 @@ </property> </widget> </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="nameLineEdit"> + <property name="minimumSize"> + <size> + <width>94</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>26</height> + </size> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> </widget> @@ -542,7 +548,7 @@ <x>20</x> <y>100</y> <width>541</width> - <height>581</height> + <height>611</height> </rect> </property> <property name="frameShape"> @@ -631,9 +637,9 @@ <property name="geometry"> <rect> <x>560</x> - <y>610</y> - <width>381</width> - <height>71</height> + <y>660</y> + <width>421</width> + <height>51</height> </rect> </property> <property name="frameShape"> @@ -646,8 +652,8 @@ <property name="geometry"> <rect> <x>0</x> - <y>20</y> - <width>401</width> + <y>10</y> + <width>421</width> <height>34</height> </rect> </property> @@ -682,8 +688,8 @@ <rect> <x>560</x> <y>480</y> - <width>381</width> - <height>131</height> + <width>421</width> + <height>181</height> </rect> </property> <property name="frameShape"> @@ -694,7 +700,7 @@ <rect> <x>10</x> <y>10</y> - <width>121</width> + <width>391</width> <height>21</height> </rect> </property> @@ -705,20 +711,23 @@ </font> </property> <property name="text"> - <string>Sky Offsets</string> + <string>Sky Offsets (Deg.)</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> </property> </widget> <widget class="QWidget" name="gridLayoutWidget"> <property name="geometry"> <rect> - <x>0</x> + <x>17</x> <y>40</y> - <width>408</width> - <height>71</height> + <width>391</width> + <height>121</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="label_4"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> @@ -733,11 +742,11 @@ </size> </property> <property name="text"> - <string>Azimuth (Deg)</string> + <string>Horizontal</string> </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QLineEdit" name="azOffsetlineEdit"> <property name="minimumSize"> <size> @@ -756,7 +765,7 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QLabel" name="label_5"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> @@ -771,11 +780,66 @@ </size> </property> <property name="text"> - <string>Elevation (Deg)</string> + <string>Equatorial</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="2"> + <widget class="QLineEdit" name="decOffsetlineEdit"> + <property name="minimumSize"> + <size> + <width>94</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>26</height> + </size> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>Galactic</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="raOffsetlineEdit"> + <property name="minimumSize"> + <size> + <width>94</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>26</height> + </size> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Latitude</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="2"> <widget class="QLineEdit" name="elOffsetlineEdit"> <property name="minimumSize"> <size> @@ -794,6 +858,54 @@ </property> </widget> </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="glonOffsetlineEdit"> + <property name="minimumSize"> + <size> + <width>94</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>26</height> + </size> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QLineEdit" name="glatOffsetlineEdit"> + <property name="minimumSize"> + <size> + <width>94</width> + <height>22</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>150</width> + <height>26</height> + </size> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Longitude</string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> </layout> </widget> </widget>