fix easy bugs

mworion · Sep 30, 2024 · 99dabba · 99dabba
1 parent 0528364
commit 99dabba
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 67 deletions.
diff --git a/mw4/gui/mainWaddon/tabImage_Manage.py b/mw4/gui/mainWaddon/tabImage_Manage.py
@@ -89,8 +89,6 @@ def initConfig(self) -> None:
         self.ui.focuserStepsize.setValue(config.get('focuserStepsize', 100))
         self.ui.focuserSteps.setValue(config.get('focuserSteps', 100))
         self.ui.fastDownload.setChecked(config.get('fastDownload', True))
-        self.ui.keepModelImages.setChecked(config.get('keepModelImages', True))
-        self.ui.keepAnalysisImages.setChecked(config.get('keepAnalysisImages', True))
 
     def storeConfig(self) -> None:
         """
@@ -106,8 +104,6 @@ def storeConfig(self) -> None:
         config['focuserStepsize'] = self.ui.focuserStepsize.value()
         config['focuserSteps'] = self.ui.focuserSteps.value()
         config['fastDownload'] = self.ui.fastDownload.isChecked()
-        config['keepModelImages'] = self.ui.keepModelImages.isChecked()
-        config['keepAnalysisImages'] = self.ui.keepAnalysisImages.isChecked()
 
     def setupIcons(self) -> None:
         """

diff --git a/mw4/gui/mainWaddon/tabModel.py b/mw4/gui/mainWaddon/tabModel.py
@@ -45,7 +45,7 @@ def __init__(self, mainW):
         self.model = []
         self.modelBatch = None
 
-        self.ui.runTest.clicked.connect(self.runBatch)
+        self.ui.runModel.clicked.connect(self.runBatch)
         self.ui.pauseModel.clicked.connect(self.pauseBatch)
         self.ui.cancelModel.clicked.connect(self.cancelBatch)
         self.ui.endModel.clicked.connect(self.endBatch)
@@ -83,7 +83,6 @@ def setupIcons(self) -> None:
         self.wIcon(self.ui.pauseModel, 'pause')
         self.wIcon(self.ui.endModel, 'stop_m')
         self.wIcon(self.ui.dataModel, 'choose')
-        self.wIcon(self.ui.plateSolveSync, 'start')
 
     def cancelBatch(self):
         """

diff --git a/mw4/gui/widgets/image_ui.py b/mw4/gui/widgets/image_ui.py
@@ -116,6 +116,13 @@ def setupUi(self, ImageDialog):
 
         self.gridLayout_4.addWidget(self.slewCenter, 0, 1, 1, 1)
 
+        self.slewCenter_2 = QPushButton(self.groupImageActions)
+        self.slewCenter_2.setObjectName(u"slewCenter_2")
+        self.slewCenter_2.setEnabled(True)
+        self.slewCenter_2.setMinimumSize(QSize(95, 21))
+
+        self.gridLayout_4.addWidget(self.slewCenter_2, 0, 2, 1, 2)
+
 
         self.horizontalLayout_5.addWidget(self.groupImageActions)
 
@@ -850,6 +857,7 @@ def retranslateUi(self, ImageDialog):
 #endif // QT_CONFIG(tooltip)
         self.timeTagImage.setText(QCoreApplication.translate("ImageDialog", u"Add time tags", None))
         self.slewCenter.setText(QCoreApplication.translate("ImageDialog", u"Slew Center", None))
+        self.slewCenter_2.setText(QCoreApplication.translate("ImageDialog", u"Sync model to image solution", None))
         self.groupBox.setTitle(QCoreApplication.translate("ImageDialog", u"Image View", None))
         self.aspectLocked.setText(QCoreApplication.translate("ImageDialog", u"Lock aspect", None))
 #if QT_CONFIG(tooltip)

diff --git a/mw4/gui/widgets/main_ui.py b/mw4/gui/widgets/main_ui.py
@@ -2456,22 +2456,22 @@ def setupUi(self, MainWindow):
         self.ModelBuildProgram.setObjectName(u"ModelBuildProgram")
         self.groupBox_28 = QGroupBox(self.ModelBuildProgram)
         self.groupBox_28.setObjectName(u"groupBox_28")
-        self.groupBox_28.setGeometry(QRect(5, 225, 366, 166))
+        self.groupBox_28.setGeometry(QRect(5, 165, 366, 226))
         self.groupBox_28.setProperty("large", True)
         self.label_157 = QLabel(self.groupBox_28)
         self.label_157.setObjectName(u"label_157")
-        self.label_157.setGeometry(QRect(15, 15, 91, 21))
+        self.label_157.setGeometry(QRect(15, 20, 91, 21))
         self.label_157.setFont(font1)
         self.picALT = QLabel(self.groupBox_28)
         self.picALT.setObjectName(u"picALT")
-        self.picALT.setGeometry(QRect(15, 55, 101, 101))
+        self.picALT.setGeometry(QRect(15, 65, 101, 101))
         self.picALT.setFrameShape(QFrame.Shape.NoFrame)
         self.picALT.setMidLineWidth(0)
         self.picALT.setProperty("iconpicture", True)
         self.altitudeTurns = QLineEdit(self.groupBox_28)
         self.altitudeTurns.setObjectName(u"altitudeTurns")
         self.altitudeTurns.setEnabled(True)
-        self.altitudeTurns.setGeometry(QRect(15, 35, 101, 21))
+        self.altitudeTurns.setGeometry(QRect(15, 40, 101, 21))
         self.altitudeTurns.setFont(font1)
         self.altitudeTurns.setMouseTracking(False)
         self.altitudeTurns.setFocusPolicy(Qt.FocusPolicy.NoFocus)
@@ -2480,12 +2480,12 @@ def setupUi(self, MainWindow):
         self.altitudeTurns.setReadOnly(True)
         self.label_156 = QLabel(self.groupBox_28)
         self.label_156.setObjectName(u"label_156")
-        self.label_156.setGeometry(QRect(135, 15, 91, 21))
+        self.label_156.setGeometry(QRect(185, 20, 91, 21))
         self.label_156.setFont(font1)
         self.azimuthTurns = QLineEdit(self.groupBox_28)
         self.azimuthTurns.setObjectName(u"azimuthTurns")
         self.azimuthTurns.setEnabled(True)
-        self.azimuthTurns.setGeometry(QRect(135, 35, 101, 21))
+        self.azimuthTurns.setGeometry(QRect(185, 40, 101, 21))
         self.azimuthTurns.setFont(font1)
         self.azimuthTurns.setMouseTracking(False)
         self.azimuthTurns.setFocusPolicy(Qt.FocusPolicy.NoFocus)
@@ -2494,30 +2494,18 @@ def setupUi(self, MainWindow):
         self.azimuthTurns.setReadOnly(True)
         self.picAZ = QLabel(self.groupBox_28)
         self.picAZ.setObjectName(u"picAZ")
-        self.picAZ.setGeometry(QRect(135, 55, 101, 101))
+        self.picAZ.setGeometry(QRect(185, 65, 101, 101))
         self.picAZ.setFrameShape(QFrame.Shape.NoFrame)
         self.picAZ.setMidLineWidth(0)
         self.picAZ.setProperty("iconpicture", True)
         self.textBrowser = QTextBrowser(self.groupBox_28)
         self.textBrowser.setObjectName(u"textBrowser")
-        self.textBrowser.setGeometry(QRect(250, 55, 106, 101))
+        self.textBrowser.setGeometry(QRect(5, 175, 356, 46))
         font4 = QFont()
         font4.setFamilies([u"Arial"])
         font4.setPointSize(12)
         font4.setBold(False)
         self.textBrowser.setFont(font4)
-        self.plateSolveSyncGroup = QGroupBox(self.ModelBuildProgram)
-        self.plateSolveSyncGroup.setObjectName(u"plateSolveSyncGroup")
-        self.plateSolveSyncGroup.setGeometry(QRect(400, 270, 366, 51))
-        self.plateSolveSyncGroup.setProperty("large", True)
-        self.plateSolveSync = QPushButton(self.plateSolveSyncGroup)
-        self.plateSolveSync.setObjectName(u"plateSolveSync")
-        self.plateSolveSync.setEnabled(True)
-        self.plateSolveSync.setGeometry(QRect(5, 20, 296, 26))
-        self.runTest = QPushButton(self.plateSolveSyncGroup)
-        self.runTest.setObjectName(u"runTest")
-        self.runTest.setEnabled(True)
-        self.runTest.setGeometry(QRect(310, 20, 46, 26))
         self.runModelGroup = QGroupBox(self.ModelBuildProgram)
         self.runModelGroup.setObjectName(u"runModelGroup")
         self.runModelGroup.setGeometry(QRect(400, 5, 366, 236))
@@ -2788,7 +2776,7 @@ def setupUi(self, MainWindow):
         self.label_168.setWordWrap(False)
         self.groupBoxCoordinateSystems_2 = QGroupBox(self.ModelBuildProgram)
         self.groupBoxCoordinateSystems_2.setObjectName(u"groupBoxCoordinateSystems_2")
-        self.groupBoxCoordinateSystems_2.setGeometry(QRect(5, 155, 361, 46))
+        self.groupBoxCoordinateSystems_2.setGeometry(QRect(400, 260, 366, 46))
         self.groupBoxCoordinateSystems_2.setProperty("large", True)
         self.normalTiming = QRadioButton(self.groupBoxCoordinateSystems_2)
         self.normalTiming.setObjectName(u"normalTiming")
@@ -3053,12 +3041,6 @@ def setupUi(self, MainWindow):
         self.binning1.setMaximum(9.000000000000000)
         self.binning1.setSingleStep(1.000000000000000)
         self.binning1.setValue(1.000000000000000)
-        self.keepModelImages = QCheckBox(self.GroupImagingSettings)
-        self.keepModelImages.setObjectName(u"keepModelImages")
-        self.keepModelImages.setGeometry(QRect(10, 330, 231, 21))
-        self.keepModelImages.setFont(font1)
-        self.keepModelImages.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.keepModelImages.setChecked(False)
         self.label_302 = QLabel(self.GroupImagingSettings)
         self.label_302.setObjectName(u"label_302")
         self.label_302.setGeometry(QRect(10, 45, 76, 21))
@@ -3218,15 +3200,9 @@ def setupUi(self, MainWindow):
         self.textSubFrameUnit.setFont(font1)
         self.fastDownload = QCheckBox(self.GroupImagingSettings)
         self.fastDownload.setObjectName(u"fastDownload")
-        self.fastDownload.setGeometry(QRect(10, 305, 341, 21))
+        self.fastDownload.setGeometry(QRect(10, 350, 341, 21))
         self.fastDownload.setFont(font1)
         self.fastDownload.setChecked(False)
-        self.keepAnalysisImages = QCheckBox(self.GroupImagingSettings)
-        self.keepAnalysisImages.setObjectName(u"keepAnalysisImages")
-        self.keepAnalysisImages.setGeometry(QRect(10, 355, 231, 21))
-        self.keepAnalysisImages.setFont(font1)
-        self.keepAnalysisImages.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.keepAnalysisImages.setChecked(False)
         self.label_21 = QLabel(self.GroupImagingSettings)
         self.label_21.setObjectName(u"label_21")
         self.label_21.setGeometry(QRect(10, 70, 256, 21))
@@ -8040,19 +8016,15 @@ def setupUi(self, MainWindow):
         QWidget.setTabOrder(self.autoDeleteHorizon, self.useSafetyMargin)
         QWidget.setTabOrder(self.useSafetyMargin, self.useDomeAz)
         QWidget.setTabOrder(self.useDomeAz, self.safetyMarginValue)
-        QWidget.setTabOrder(self.safetyMarginValue, self.progressiveTiming)
-        QWidget.setTabOrder(self.progressiveTiming, self.normalTiming)
-        QWidget.setTabOrder(self.normalTiming, self.conservativeTiming)
-        QWidget.setTabOrder(self.conservativeTiming, self.runModel)
+        QWidget.setTabOrder(self.safetyMarginValue, self.runModel)
         QWidget.setTabOrder(self.runModel, self.pauseModel)
         QWidget.setTabOrder(self.pauseModel, self.endModel)
         QWidget.setTabOrder(self.endModel, self.cancelModel)
         QWidget.setTabOrder(self.cancelModel, self.numberBuildRetries)
         QWidget.setTabOrder(self.numberBuildRetries, self.retriesReverse)
         QWidget.setTabOrder(self.retriesReverse, self.excludeDonePoints)
         QWidget.setTabOrder(self.excludeDonePoints, self.parkMountAfterModel)
-        QWidget.setTabOrder(self.parkMountAfterModel, self.plateSolveSync)
-        QWidget.setTabOrder(self.plateSolveSync, self.dataModel)
+        QWidget.setTabOrder(self.parkMountAfterModel, self.dataModel)
         QWidget.setTabOrder(self.dataModel, self.textBrowser)
         QWidget.setTabOrder(self.textBrowser, self.manageTabWidget)
         QWidget.setTabOrder(self.manageTabWidget, self.deleteWorstPoint)
@@ -8082,9 +8054,7 @@ def setupUi(self, MainWindow):
         QWidget.setTabOrder(self.coolerOff, self.downloadFast)
         QWidget.setTabOrder(self.downloadFast, self.downloadSlow)
         QWidget.setTabOrder(self.downloadSlow, self.fastDownload)
-        QWidget.setTabOrder(self.fastDownload, self.keepModelImages)
-        QWidget.setTabOrder(self.keepModelImages, self.keepAnalysisImages)
-        QWidget.setTabOrder(self.keepAnalysisImages, self.coverUnpark)
+        QWidget.setTabOrder(self.fastDownload, self.coverUnpark)
         QWidget.setTabOrder(self.coverUnpark, self.coverPark)
         QWidget.setTabOrder(self.coverPark, self.coverHalt)
         QWidget.setTabOrder(self.coverHalt, self.coverLightOn)
@@ -8339,7 +8309,7 @@ def setupUi(self, MainWindow):
 
         self.retranslateUi(MainWindow)
 
-        self.mainTabWidget.setCurrentIndex(4)
+        self.mainTabWidget.setCurrentIndex(0)
         self.mountTabWidget.setCurrentIndex(0)
         self.modelingTabWidget.setCurrentIndex(1)
         self.manageTabWidget.setCurrentIndex(2)
@@ -9296,15 +9266,6 @@ def retranslateUi(self, MainWindow):
 "li.checked::marker { content: \"\\2612\"; }\n"
 "</style></head><body style=\" font-family:'Arial'; font-size:12pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">For polar align, turn knobs info is only helpful for large errors. If turns &lt; 0.25 or polar error &lt; 5 arcmin, please center star for improvement.</span></p></body></html>", None))
-        self.plateSolveSyncGroup.setTitle(QCoreApplication.translate("MainWindow", u"Fast align", None))
-#if QT_CONFIG(tooltip)
-        self.plateSolveSync.setToolTip(QCoreApplication.translate("MainWindow", u"Image, Platesolve and Sync the alignment model of the mount to the given image coordinates. There is no model point added nor the model refined. It is just a matching of the model to that point. Attention: this might lead in worse model quality elsewhere.", None))
-#endif // QT_CONFIG(tooltip)
-        self.plateSolveSync.setText(QCoreApplication.translate("MainWindow", u"Plate solve image and sync model", None))
-#if QT_CONFIG(tooltip)
-        self.runTest.setToolTip(QCoreApplication.translate("MainWindow", u"Image, Platesolve and Sync the alignment model of the mount to the given image coordinates. There is no model point added nor the model refined. It is just a matching of the model to that point. Attention: this might lead in worse model quality elsewhere.", None))
-#endif // QT_CONFIG(tooltip)
-        self.runTest.setText(QCoreApplication.translate("MainWindow", u"Test", None))
         self.runModelGroup.setTitle(QCoreApplication.translate("MainWindow", u"Model build", None))
 #if QT_CONFIG(tooltip)
         self.cancelModel.setToolTip(QCoreApplication.translate("MainWindow", u"Cancels a model build.", None))
@@ -9537,10 +9498,6 @@ def retranslateUi(self, MainWindow):
 #if QT_CONFIG(tooltip)
         self.binning1.setToolTip(QCoreApplication.translate("MainWindow", u"<html><head/><body><p>Sets the binning for the camera</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-#if QT_CONFIG(tooltip)
-        self.keepModelImages.setToolTip(QCoreApplication.translate("MainWindow", u"Checked if you would like to keep the images of modeling session", None))
-#endif // QT_CONFIG(tooltip)
-        self.keepModelImages.setText(QCoreApplication.translate("MainWindow", u"Keep all images of modeling run", None))
         self.label_302.setText(QCoreApplication.translate("MainWindow", u"Exposure N", None))
 #if QT_CONFIG(tooltip)
         self.exposureTimeN.setToolTip(QCoreApplication.translate("MainWindow", u"<html><head/><body><p>Sets the exposure time</p></body></html>", None))
@@ -9607,10 +9564,6 @@ def retranslateUi(self, MainWindow):
         self.fastDownload.setToolTip(QCoreApplication.translate("MainWindow", u"Use Highspeed download of CCD camera if availabe", None))
 #endif // QT_CONFIG(tooltip)
         self.fastDownload.setText(QCoreApplication.translate("MainWindow", u"Use fast image download for modeling (if available)", None))
-#if QT_CONFIG(tooltip)
-        self.keepAnalysisImages.setToolTip(QCoreApplication.translate("MainWindow", u"Checked if you would like to keep the images of modeling session", None))
-#endif // QT_CONFIG(tooltip)
-        self.keepAnalysisImages.setText(QCoreApplication.translate("MainWindow", u"Keep all images of analysis run", None))
         self.label_21.setText(QCoreApplication.translate("MainWindow", u"Recommended optimal binning", None))
 #if QT_CONFIG(tooltip)
         self.optimalBinning.setToolTip(QCoreApplication.translate("MainWindow", u"<html><head/><body><p>Shows the optimal binning as result from number of camera pixels and needed size of images to fulfill the modeling and functional tasks within MW4 </p></body></html>", None))