Re #11689 make output dir default more uniform across UI

mantidproject · May 4, 2015 · 4c593b2 · 4c593b2
1 parent dd1aa6b
commit 4c593b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/eqsans_instrument.py
@@ -235,6 +235,7 @@ def _output_dir_browse(self):
                                                             | QtGui.QFileDialog.DontResolveSymlinks)
         if output_dir:
             self._summary.output_dir_edit.setText(output_dir)
+            self._settings.emit_key_value("OUTPUT_DIR", output_dir)
 
     def _tof_clicked(self, is_checked):
         self._summary.low_tof_edit.setEnabled(not is_checked)
@@ -458,7 +459,7 @@ def get_state(self):
         # Config Mask
         m.use_config_mask = self._summary.config_mask_chk.isChecked()
 
-       # Mask detector IDs
+        # Mask detector IDs
         m.use_mask_file = self._summary.mask_check.isChecked()
         m.mask_file = unicode(self._summary.mask_edit.text())
         m.detector_ids = self._masked_detectors
@@ -483,6 +484,7 @@ def get_state(self):
         self._settings.data_output_dir = m.output_directory
 
         self._settings.emit_key_value("DARK_CURRENT", str(self._summary.dark_file_edit.text()))
+        self._settings.emit_key_value("OUTPUT_DIR", m.output_directory)
         return m
 
     def _show_help(self):

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/stitcher.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/sans/stitcher.py
@@ -40,7 +40,7 @@ def __init__(self, parent=None):
             settings = GeneralSettings()
         self._settings = settings
 
-       # Connect do UI data update
+        # Connect do UI data update
         self._settings.data_updated.connect(self._data_updated)
 
         self._low_q_data = None
@@ -55,7 +55,7 @@ def __init__(self, parent=None):
         self._referenceID = 0
 
         self._graph = "StitchedData"
-        self._output_dir = None
+        self._output_dir = self._settings.data_output_dir
         self._stitcher = None
         self._plotted = False