Merge bb2e2f4 into eae8b87

mantidproject · May 20, 2024 · 9f92dd3 · 9f92dd3
2 parents eae8b87 + bb2e2f4
commit 9f92dd3
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 25 deletions.
diff --git a/docs/release_notes/next/feature-2094-Load_ShutterCount_files_front-end b/docs/release_notes/next/feature-2094-Load_ShutterCount_files_front-end
@@ -0,0 +1 @@
+#2094: Front-end for loading ShutterCount files into Mantid Imaging.
diff --git a/mantidimaging/core/io/instrument_log.py b/mantidimaging/core/io/instrument_log.py
@@ -246,6 +246,3 @@ def pulse_per_shutter_range_numbers(self) -> np.ndarray[Any, Any]:
 
     def has_Pulse(self) -> bool:
         return ShutterCountColumn.PULSE in self.data
-
-    def raise_if_counts_missing(self):
-        pass
diff --git a/mantidimaging/core/utility/data_containers.py b/mantidimaging/core/utility/data_containers.py
@@ -143,11 +143,11 @@ class FILE_TYPES(Enum):
     DARK_AFTER = ("Dark", "After", "images")
     PROJ_180 = ("180 degree", "", "180")
     SAMPLE_LOG = ("Sample Log", "", "log")
-    FLAT_BEFORE_LOG = ("Flat Before Log", "", "log")
-    FLAT_AFTER_LOG = ("Flat After Log", "", "log")
     SHUTTER_COUNTS = ("Sample Shutter Counts", "", "ShutterCount")
     FLAT_BEFORE_SHUTTER_COUNTS = ("Flat Before Shutter Counts", "", "ShutterCount")
     FLAT_AFTER_SHUTTER_COUNTS = ("Flat After Shutter Counts", "", "ShutterCount")
+    FLAT_BEFORE_LOG = ("Flat Before Log", "", "log")
+    FLAT_AFTER_LOG = ("Flat After Log", "", "log")
 
     def __init__(self, tname: str, suffix: str, mode: str) -> None:
         self.tname = tname

diff --git a/mantidimaging/gui/ui/image_load_dialog.ui b/mantidimaging/gui/ui/image_load_dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>690</width>
-    <height>497</height>
+    <height>530</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -129,24 +129,30 @@
       </property>
      </item>
      <item>
-      <property name="text">
-       <string>Flat Before Log</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
+        <property name="text">
+            <string>Sample Shutter Counts</string>
+        </property>
      </item>
      <item>
-      <property name="text">
-       <string>Flat After Log</string>
-      </property>
+        <property name="text">
+            <string>Flat Before Shutter Counts</string>
+        </property>
+    </item>
+     <item>
+        <property name="text">
+            <string>Flat After Shutter Counts</string>
+        </property>
      </item>
+     <item>
+    <property name="text">
+            <string>Flat Before Log</string>
+      </property>
+    </item>
+    <item>
+        <property name="text">
+            <string>Flat After Log</string>
+        </property>
+    </item>
     </widget>
    </item>
    <item>

diff --git a/mantidimaging/gui/ui/main_window.ui b/mantidimaging/gui/ui/main_window.ui
@@ -38,6 +38,7 @@
     <addaction name="actionLoadImages"/>
     <addaction name="actionLoadNeXusFile"/>
     <addaction name="actionSampleLoadLog"/>
+    <addaction name="actionShutterCounts"/>
     <addaction name="actionLoadProjectionAngles"/>
     <addaction name="actionLoad180deg"/>
     <addaction name="separator"/>
@@ -189,6 +190,14 @@
     <string>Load log for stack...</string>
    </property>
   </action>
+  <action name="actionShutterCounts">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
+    <property name="text">
+     <string>Load ShutterCounts file for stack...</string>
+    </property>
+   </action>
   <action name="actionLoad180deg">
    <property name="enabled">
     <bool>false</bool>

diff --git a/mantidimaging/gui/windows/image_load_dialog/presenter.py b/mantidimaging/gui/windows/image_load_dialog/presenter.py
@@ -111,6 +111,12 @@ def do_update_shutter_counts(self, field: Field, selected_file: str) -> None:
         filename_group.find_shutter_count_file()
         field.set_images(list(filename_group.all_files()))
         self._update_field_action(field, selected_file)
+        self.ensure_sample_shuttercount_consistency(field, selected_file)
+
+    def ensure_sample_shuttercount_consistency(self, field: Field, file_name: str) -> None:
+        if file_name is None or file_name == "":
+            return
+        self._update_field_action(field, file_name)
 
     def do_update_flat_or_dark(self, field: Field, selected_file: str) -> None:
         """
@@ -164,8 +170,7 @@ def _update_loading_param(self, file_type: FILE_TYPES, loading_param: LoadingPar
         if file_type in log_for_file_type:
             self._update_image_param(file_type, image_param, log_for_file_type, 'log_file')
         if file_type in shuttercounts_for_file_type:
-            # self._update_image_param(file_type, image_param, shuttercounts_for_file_type, 'shutter_count_file')
-            pass
+            self._update_image_param(file_type, image_param, shuttercounts_for_file_type, 'shutter_count_file')
 
         if file_type == FILE_TYPES.SAMPLE:
             image_param.indices = field.indices

diff --git a/mantidimaging/gui/windows/image_load_dialog/view.py b/mantidimaging/gui/windows/image_load_dialog/view.py
@@ -39,8 +39,6 @@ def __init__(self, parent: QWidget) -> None:
         self.tree.setTabKeyNavigation(True)
 
         for n, file_info in enumerate(FILE_TYPES):
-            if file_info.fname in ["Sample Shutter Counts", "Flat Before Shutter Counts", "Flat After Shutter Counts"]:
-                continue
             self.fields[file_info.fname] = self.create_file_input(n, file_info)
 
         self.sample = self.fields["Sample"]

diff --git a/mantidimaging/gui/windows/main/view.py b/mantidimaging/gui/windows/main/view.py
@@ -88,6 +88,7 @@ class MainWindowView(BaseMainWindowView):
     actionSpectrumViewer: QAction
     actionLiveViewer: QAction
     actionSampleLoadLog: QAction
+    actionShutterCounts: QAction
     actionLoadProjectionAngles: QAction
     actionLoad180deg: QAction
     actionLoadDataset: QAction
@@ -184,6 +185,7 @@ def setup_shortcuts(self):
         self.actionLoadImages.triggered.connect(self.load_image_stack)
         self.actionLoadNeXusFile.triggered.connect(self.show_nexus_load_dialog)
         self.actionSampleLoadLog.triggered.connect(self.load_sample_log_dialog)
+        self.actionShutterCounts.triggered.connect(self.load_shuttercounts_dialog)
         self.actionLoad180deg.triggered.connect(self.load_180_deg_dialog)
         self.actionLoadProjectionAngles.triggered.connect(self.load_projection_angles)
         self.actionSaveImages.triggered.connect(self.show_image_save_dialog)
@@ -227,6 +229,7 @@ def update_shortcuts(self):
         self.actionSaveImages.setEnabled(has_datasets)
         self.actionSaveNeXusFile.setEnabled(has_strict_datasets)
         self.actionSampleLoadLog.setEnabled(has_datasets)
+        self.actionShutterCounts.setEnabled(has_datasets)
         self.actionLoad180deg.setEnabled(has_strict_datasets)
         self.actionLoadProjectionAngles.setEnabled(has_datasets)
         self.menuWorkflow.setEnabled(has_datasets)