Changeset 67346f9 in sasview

Timestamp:

Nov 12, 2018 5:59:11 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9d23e4c

Parents:

859d960

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (11/12/18 05:48:13)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (11/12/18 05:59:11)

Message:

Save load path and sas_opencl values to the custom config, if changed
during the session.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• MainWindow/GuiManager.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -52 +52 @@
         # Read in default locations
         self.default_save_location = None
-        self.default_load_location = os.path.join(os.path.dirname(sys.argv[0]), "test")
+        self.default_load_location = GuiUtils.DEFAULT_OPEN_FOLDER
         self.default_project_location = None
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -354 +354 @@
         # Exit if yes
         if reply == QMessageBox.Yes:
+            # save the paths etc.
+            self.saveCustomConfig()
             reactor.callFromThread(reactor.stop)
             return True
@@ -1071 +1073 @@
         elif isinstance(perspective, Perspectives.PERSPECTIVES["Corfunc"]):
             self.checkAnalysisOption(self._workspace.actionCorfunc)
+
+    def saveCustomConfig(self):
+        """
+        Save the config file based on current session values
+        """
+        # Load the current file
+        config_content = GuiUtils.custom_config
+
+        changed = self.customSavePaths(config_content)
+        changed = changed or self.customSaveOpenCL(config_content)
+
+        if changed:
+            self.writeCustomConfig(config_content)
+
+    def customSavePaths(self, config_content):
+        """
+        Update the config module with current session paths
+        Returns True if update was done, False, otherwise
+        """
+        changed = False
+        # Find load path
+        open_path = GuiUtils.DEFAULT_OPEN_FOLDER
+        defined_path = self.filesWidget.default_load_location
+        if open_path != defined_path:
+            # Replace the load path
+            config_content.DEFAULT_OPEN_FOLDER = defined_path
+            changed = True
+        return changed
+
+    def customSaveOpenCL(self, config_content):
+        """
+        Update the config module with current session OpenCL choice
+        Returns True if update was done, False, otherwise
+        """
+        changed = False
+        # Find load path
+        file_value = GuiUtils.SAS_OPENCL
+        session_value = os.environ.get("SAS_OPENCL", "")
+        if file_value != session_value:
+            # Replace the load path
+            config_content.SAS_OPENCL = session_value
+            changed = True
+        return changed
+
+    def writeCustomConfig(self, config):
+        """
+        Write custom configuration
+        """
+        from sas import make_custom_config_path
+        path = make_custom_config_path()
+        # Just clobber the file - we already have its content read in
+        with open(path, 'w') as out_f:
+            out_f.write("#Application appearance custom configuration\n")
+            for key, item in config.__dict__.items():
+                if key[:2] != "__":
+                    if isinstance(item, str):
+                        item = '"' + item + '"'
+                    out_f.write("%s = %s\n" % (key, str(item)))
+        pass # debugger anchor

src/sas/qtgui/Utilities/GuiUtils.py

@@ -151 +151 @@
     DEFAULT_PERSPECTIVE = custom_config.DEFAULT_PERSPECTIVE
     CLEANUP_PLOT = custom_config.CLEANUP_PLOT
+    SAS_OPENCL = custom_config.SAS_OPENCL
     # custom open_path
     open_folder = custom_config.DEFAULT_OPEN_FOLDER
@@ -171 +172 @@
     CLEANUP_PLOT = False
     DEFAULT_OPEN_FOLDER = PATH_APP
+    SAS_OPENCL = config.SAS_OPENCL
 
 #DEFAULT_STYLE = config.DEFAULT_STYLE