Merge pull request #144 from neutrons/clean_settings

Cleanup startup configuration

Author: Mat Doucet

RefRed/config/gui.py

@@ -23,3 +23,14 @@
     {'top': 0.95, 'right': 0.95, 'bottom': 0.1, 'left': 0.15},  # x_project
     {'top': 0.95, 'right': 0.95, 'bottom': 0.1, 'left': 0.15},  # y_project
 ]
+
+# Default values to populate in the GUI
+gui_metadata = dict(
+    q_min=0.005,
+    d_q0=0.0,
+    dq_over_q=0.028,
+    tof_bin=40,  # micros
+    q_bin=0.01,  # logarithmic binning
+    angle_offset=0.0,
+    angle_offset_error=0.001,
+)

RefRed/configuration/user_configuration_handler.py

@@ -4,8 +4,6 @@
 from RefRed.configuration.user_configuration import UserConfiguration
 from RefRed.utilities import str2bool
 
-# from RefRed.settings.list_settings import ListSettings
-
 
 class RetrieveUserConfiguration(object):
     def __init__(self, parent=None):
@@ -37,8 +35,3 @@ def __init__(self, parent=None):
         o_user_config = self.parent.o_user_configuration
         settings.setValue('is_reduced_plot_stitching_tab_xlog', str(o_user_config.is_reduced_plot_stitching_tab_xlog))
         settings.setValue('is_reduced_plot_stitching_tab_ylog', str(o_user_config.is_reduced_plot_stitching_tab_ylog))
-
-        _gui_metadata = self.parent.gui_metadata
-        for _key in _gui_metadata.keys():
-            _value = str(_gui_metadata[_key])
-            settings.setValue(_key, _value)

RefRed/interfaces/refred_main_interface.ui

@@ -6479,22 +6479,6 @@ p, li { white-space: pre-wrap; }
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>actionSettings</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>settings_editor()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>784</x>
-     <y>563</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>actionNew</sender>
    <signal>triggered()</signal>

RefRed/interfaces/settings.ui

@@ -43,14 +43,13 @@
 from RefRed.reduction_table_handling.update_reduction_table import UpdateReductionTable
 from RefRed.reduction_table_handling.reduction_table_right_click import ReductionTableRightClick
 from RefRed.reduction_table_handling.reduction_table_handler import ReductionTableHandler
-from RefRed.settings.initialize_settings import InitializeSettings
-from RefRed.settings.settings_editor import SettingsEditor
 from RefRed.sf_calculator.sf_calculator import SFCalculator
 from RefRed.sf_preview.sf_preview import SFPreview
 from RefRed.decorators import config_file_has_been_modified, config_file_modification_reset
 from RefRed.about_dialog import AboutDialog
 from RefRed.browsing_runs import BrowsingRuns
 from RefRed.config.mantid_config import MantidConfig
+import RefRed.config.gui
 from RefRed.tabledata import TableData
 
 
@@ -126,7 +125,9 @@ def __init__(self, argv=[], parent=None):
             QtWidgets.QMainWindow.__init__(self, parent, QtCore.Qt.Window)
         self.ui = load_ui("refred_main_interface.ui", self)
 
-        InitializeSettings(self)
+        # Get default values for widgets
+        self.gui_metadata = RefRed.config.gui.gui_metadata
+
         self.config = MantidConfig(self)
         InitializeGui(self)
         self.ui.reductionTable.setUI(self)
@@ -660,10 +661,6 @@ def about_message(self):
         o_about_message = AboutDialog(parent=self)
         o_about_message.display()
 
-    def settings_editor(self):
-        o_settings_editor = SettingsEditor(parent=self)
-        o_settings_editor.show()
-
     def apply_deadtime_update(self):
         r"""Update option apply_deadtime of field deadtime_settings when the associated checkbox
         changes its state"""