Merge pull request #76 from neutrons/update_reduce_dialog

Always output ASCII
neutrons · Mar 21, 2024 · e7d9302 · e7d9302
2 parents ba09e11 + fa55058
commit e7d9302
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/reflectivity_ui/interfaces/data_handling/processing_workflow.py b/reflectivity_ui/interfaces/data_handling/processing_workflow.py
@@ -33,7 +33,6 @@
     format_genx=False,
     format_matlab=False,
     format_mantid=True,
-    format_multi=True,
     format_numpy=False,
     format_5cols=False,
     output_sample_size=10,
@@ -219,9 +218,8 @@ def specular_reflectivity(self):
         output_data = self.get_output_data()
 
         # QuickNXS format
-        if self.output_options["format_multi"]:
-            output_file_base = self.get_file_name(run_list)
-            self.write_quicknxs(output_data, output_file_base)
+        output_file_base = self.get_file_name(run_list)
+        self.write_quicknxs(output_data, output_file_base)
 
         # Numpy arrays
         if self.output_options["format_numpy"]:

diff --git a/reflectivity_ui/interfaces/reduction_dialog.py b/reflectivity_ui/interfaces/reduction_dialog.py
@@ -36,7 +36,6 @@ def __init__(self, parent):
         # Formats
         self.ui.genx.setChecked(self._verify_true("format_genx", False))
         self.ui.matlab.setChecked(self._verify_true("format_matlab", False))
-        self.ui.multiAscii.setChecked(self._verify_true("format_multi", False))
         self.ui.numpy.setChecked(self._verify_true("format_numpy", False))
         self.ui.mantid_script_checkbox.setChecked(self._verify_true("format_mantid", False))
         self.ui.five_cols_checkbox.setChecked(self._verify_true("format_5cols", True))
@@ -78,7 +77,6 @@ def get_options(self):
             format_genx=self.ui.genx.isChecked(),
             format_matlab=self.ui.matlab.isChecked(),
             format_mantid=self.ui.mantid_script_checkbox.isChecked(),
-            format_multi=self.ui.multiAscii.isChecked(),
             format_numpy=self.ui.numpy.isChecked(),
             format_5cols=self.ui.five_cols_checkbox.isChecked(),
             output_directory=self.ui.directoryEntry.text(),
@@ -119,7 +117,6 @@ def save_settings(self):
 
         self.settings.setValue("format_genx", self.ui.genx.isChecked())
         self.settings.setValue("format_matlab", self.ui.matlab.isChecked())
-        self.settings.setValue("format_multi", self.ui.multiAscii.isChecked())
         self.settings.setValue("format_numpy", self.ui.numpy.isChecked())
         self.settings.setValue("format_mantid", self.ui.mantid_script_checkbox.isChecked())
         self.settings.setValue("format_5cols", self.ui.five_cols_checkbox.isChecked())

diff --git a/reflectivity_ui/ui/ui_reduce_dialog.ui b/reflectivity_ui/ui/ui_reduce_dialog.ui
@@ -106,22 +106,10 @@
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
-           <widget class="QCheckBox" name="multiAscii">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
-            <property name="mouseTracking">
-             <bool>true</bool>
-            </property>
+           <widget class="QLabel" name="label_7">
             <property name="text">
              <string>ASCII</string>
             </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
            </widget>
           </item>
           <item row="2" column="0">
@@ -250,6 +238,19 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
+       <item>
+        <widget class="QLabel" name="label_8">
+         <property name="styleSheet">
+          <string notr="true">color: red;</string>
+         </property>
+         <property name="text">
+          <string>Email can only be sent to @ornl addresses.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
        <item>
         <layout class="QGridLayout" name="gridLayout_3">
          <item row="0" column="2">
@@ -376,7 +377,6 @@
   <tabstop>exportOffSpecular</tabstop>
   <tabstop>exportOffSpecularSmoothed</tabstop>
   <tabstop>exportGISANS</tabstop>
-  <tabstop>multiAscii</tabstop>
   <tabstop>toolButton</tabstop>
   <tabstop>tabWidget</tabstop>
  </tabstops>