implement fixes (#495)

* implement fixes

* fix integration test

* set the ui default to dspacing

Author: walshmm

src/snapred/backend/dao/request/ReductionRequest.py

@@ -6,6 +6,7 @@
 from snapred.backend.dao.state.FocusGroup import FocusGroup
 from snapred.backend.error.ContinueWarning import ContinueWarning
 from snapred.meta.mantid.WorkspaceNameGenerator import WorkspaceName
+from snapred.meta.mantid.WorkspaceNameGenerator import WorkspaceNameGenerator as wng
 
 Versions = NamedTuple("Versions", [("calibration", Optional[int]), ("normalization", Optional[int])])
 
@@ -17,7 +18,7 @@ class ReductionRequest(BaseModel):
     focusGroups: List[FocusGroup] = []
 
     keepUnfocused: bool = False
-    convertUnitsTo: str = None
+    convertUnitsTo: str = wng.Units.DSP
 
     # Calibration and normalization versions:
     #   `None` => <use latest version>

src/snapred/ui/presenter/TestPanelPresenter.py

@@ -32,9 +32,9 @@ def __init__(self, view):
         self.normalizationCalibrationWidget = self._addWorkflowWidget(self.normalizationCalibrationWorkflow.widget)
         self.reductionWidget = self._addWorkflowWidget(self.reductionWorkflow.widget)
 
+        self.view.tabWidget.addTab(self.reductionWidget, "Reduction")
         self.view.tabWidget.addTab(self.diffractionCalibrationWidget, "Diffraction Calibration")
         self.view.tabWidget.addTab(self.normalizationCalibrationWidget, "Normalization")
-        self.view.tabWidget.addTab(self.reductionWidget, "Reduction")
 
     def _addWorkflowWidget(self, widget_):
         layout = QGridLayout()

src/snapred/ui/view/TestPanelView.py

@@ -1,5 +1,5 @@
 from qtpy.QtCore import Slot
-from qtpy.QtWidgets import QGridLayout, QMainWindow, QTabWidget, QWidget
+from qtpy.QtWidgets import QDesktopWidget, QGridLayout, QMainWindow, QTabWidget, QWidget
 
 
 class TestPanelView(QMainWindow):
@@ -17,7 +17,8 @@ def __init__(self, parent=None):
         self.tabWidget = QTabWidget()
         self.tabWidget.setTabPosition(QTabWidget.West)
         self.grid.addWidget(self.tabWidget)
-        self.adjustSize()
+        self.resize(1280, 720)
+        self.center()
 
     @Slot()
     def enableAllWorkflows(self):
@@ -32,3 +33,9 @@ def disableOtherWorkflows(self):
         for n in range(self.tabWidget.count()):
             if n != currentTab:
                 self.tabWidget.setTabEnabled(n, False)
+
+    def center(self):
+        qr = self.frameGeometry()
+        cp = QDesktopWidget().availableGeometry().center()
+        qr.moveCenter(cp)
+        self.move(qr.topLeft())

src/snapred/ui/view/reduction/ReductionRequestView.py

@@ -38,6 +38,7 @@ def __init__(
         # Horizontal layout for run number input and button
         self.runNumberLayout = QHBoxLayout()
         self.runNumberInput = QLineEdit()
+        self.runNumberInput.returnPressed.connect(self.addRunNumber)
         self.enterRunNumberButton = QPushButton("Enter Run Number")
         self.clearButton = QPushButton("Clear")
         self.runNumberButtonLayout = QVBoxLayout()
@@ -57,6 +58,7 @@ def __init__(
         self.convertUnitsDropdown = self._sampleDropDown(
             "Convert Units", ["TOF", "dSpacing", "Wavelength", "MomentumTransfer"]
         )
+        self.convertUnitsDropdown.setCurrentIndex(1)
 
         # Set field properties
         self.liteModeToggle.setEnabled(False)

tests/integration/test_workflow_panels_happy_path.py

@@ -271,7 +271,7 @@ def test_calibration_and_reduction_panels_happy_path(
             ##########################################################################################################
 
             # Diffraction calibration:
-            calibrationPanelTabs.setCurrentIndex(0)
+            calibrationPanelTabs.setCurrentIndex(1)
             diffractionCalibrationWidget = calibrationPanelTabs.currentWidget()
 
             ### The use of this next signal is somewhat cryptic, but it makes testing the GUI much more stable:
@@ -442,7 +442,7 @@ def test_calibration_and_reduction_panels_happy_path(
             #####################################################################################################
 
             # Normalization calibration:
-            calibrationPanelTabs.setCurrentIndex(1)
+            calibrationPanelTabs.setCurrentIndex(2)
             normalizationCalibrationWidget = calibrationPanelTabs.currentWidget()
 
             #################################################################
@@ -589,7 +589,7 @@ def test_calibration_and_reduction_panels_happy_path(
             #################################################################################################
 
             # Reduction:
-            calibrationPanelTabs.setCurrentIndex(2)
+            calibrationPanelTabs.setCurrentIndex(1)
             reductionWidget = calibrationPanelTabs.currentWidget()
 
             #################################################################
@@ -762,7 +762,7 @@ def test_diffraction_calibration_panel_happy_path(self, qtbot, qapp, calibration
             ##########################################################################################################
 
             # Diffraction calibration:
-            calibrationPanelTabs.setCurrentIndex(0)
+            calibrationPanelTabs.setCurrentIndex(1)
             diffractionCalibrationWidget = calibrationPanelTabs.currentWidget()
 
             ### The use of this next signal is somewhat cryptic, but it makes testing the GUI much more stable:
@@ -995,7 +995,7 @@ def test_normalization_panel_happy_path(self, qtbot, qapp, calibration_home_from
             #####################################################################################################
 
             # Normalization calibration:
-            calibrationPanelTabs.setCurrentIndex(1)
+            calibrationPanelTabs.setCurrentIndex(2)
             normalizationCalibrationWidget = calibrationPanelTabs.currentWidget()
 
             #################################################################
@@ -1234,7 +1234,7 @@ def completionMessageBoxAssert(*args, **kwargs):  # noqa: ARG001
             #################################################################################################
 
             # Reduction:
-            calibrationPanelTabs.setCurrentIndex(2)
+            calibrationPanelTabs.setCurrentIndex(0)
             reductionWidget = calibrationPanelTabs.currentWidget()
 
             #################################################################