Changeset 133812c7 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Nov 12, 2018 6:47:59 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:

e5ae812

Parents:

ebcdb02

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/31/18 06:34:14)

git-committer:

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

Message:

Merged ESS_GUI

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (12 diffs)
• GuiManager.py (modified) (5 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -49 +49 @@
         self.parent = guimanager
         self.loader = Loader()
+
+        # Read in default locations
+        self.default_save_location = None
+        self.default_load_location = GuiUtils.DEFAULT_OPEN_FOLDER
+        self.default_project_location = None
+
         self.manager = manager if manager is not None else DataManager()
         self.txt_widget = QtWidgets.QTextEdit(None)
@@ -99 +105 @@
         self.communicator.extMaskEditorSignal.connect(self.extShowEditDataMask)
         self.communicator.changeDataExplorerTabSignal.connect(self.changeTabs)
+        self.communicator.forcePlotDisplaySignal.connect(self.displayData)
+        self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
 
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
@@ -205 +213 @@
         Opens the Qt "Open Folder..." dialog
         """
-        folder = QtWidgets.QFileDialog.getExistingDirectory(self, "Choose a directory", "",
-              QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog)
+        kwargs = {
+            'parent'    : self,
+            'caption'   : 'Choose a directory',
+            'options'   : QtWidgets.QFileDialog.ShowDirsOnly | QtWidgets.QFileDialog.DontUseNativeDialog,
+            'directory' : self.default_load_location
+        }
+        folder = QtWidgets.QFileDialog.getExistingDirectory(**kwargs)
+
         if folder is None:
             return
 
         folder = str(folder)
-
         if not os.path.isdir(folder):
             return
-
+        self.default_load_location = folder
         # get content of dir into a list
         path_str = [os.path.join(os.path.abspath(folder), filename)
@@ -251 +264 @@
         filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
         if filename:
+            self.default_project_location = os.path.dirname(filename)
             self.deleteAllItems()
             self.readProject(filename)
@@ -276 +290 @@
             'caption'   : 'Save Project',
             'filter'    : 'Project (*.json)',
-            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog
+            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog,
+            'directory' : self.default_project_location
         }
         name_tuple = QtWidgets.QFileDialog.getSaveFileName(**kwargs)
@@ -282 +297 @@
         if not filename:
             return
+        self.default_project_location = os.path.dirname(filename)
         _, extension = os.path.splitext(filename)
         if not extension:
@@ -616 +632 @@
         Send selected item data to the current perspective and set the relevant notifiers
         """
-        # Set the signal handlers
-        self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
-
         def isItemReady(index):
             item = self.model.item(index)
@@ -903 +916 @@
             # Try the current item
             main_data = GuiUtils.dataFromItem(plot_item)
+        # 1D dependent plots of 2D sets - special treatment
+        if isinstance(main_data, Data2D) and isinstance(plot_to_show, Data1D):
+            main_data = None
 
         # Make sure main data for 2D is always displayed
-        if main_data and not self.isPlotShown(main_data):
+        if main_data is not None and not self.isPlotShown(main_data):
             if isinstance(main_data, Data2D):
                 self.plotData([(plot_item, main_data)])
@@ -923 +939 @@
             # Plots with main data points on the same chart
             # Get the main data plot
-            if main_data and not self.isPlotShown(main_data):
+            if main_data is not None and not self.isPlotShown(main_data):
                 new_plots.append((plot_item, main_data))
             new_plots.append((plot_item, plot_to_show))
@@ -1083 +1099 @@
         # List of known extensions
         wlist = self.getWlist()
-
         # Location is automatically saved - no need to keep track of the last dir
         # But only with Qt built-in dialog (non-platform native)
-        paths = QtWidgets.QFileDialog.getOpenFileNames(self, "Choose a file", "",
-                wlist, None, QtWidgets.QFileDialog.DontUseNativeDialog)[0]
+        kwargs = {
+            'parent'    : self,
+            'caption'   : 'Choose files',
+            'filter'    : wlist,
+            'options'   : QtWidgets.QFileDialog.DontUseNativeDialog,
+            'directory' : self.default_load_location
+        }
+        paths = QtWidgets.QFileDialog.getOpenFileNames(**kwargs)[0]
         if not paths:
             return
@@ -1094 +1115 @@
             paths = [paths]
 
+        self.default_load_location = os.path.dirname(paths[0])
         return paths
 
@@ -1729 +1751 @@
             raise AttributeError(msg)
 
-        # TODO: Assert other properties
-
-        # Reset the view
-        ##self.model.reset()
-        # Pass acting as a debugger anchor
+        # send in the new item
+        self.model.appendRow(model_item)
         pass
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -51 +51 @@
 
 from sas.qtgui.Utilities.AddMultEditor import AddMultEditor
+from sas.qtgui.Utilities.ImageViewer import ImageViewer
 
 logger = logging.getLogger(__name__)
@@ -352 +353 @@
         # Exit if yes
         if reply == QMessageBox.Yes:
+            # save the paths etc.
+            self.saveCustomConfig()
             reactor.callFromThread(reactor.stop)
             return True
@@ -457 +460 @@
         self._workspace.actionReset.setVisible(False)
         self._workspace.actionStartup_Settings.setVisible(False)
-        self._workspace.actionImage_Viewer.setVisible(False)
+        #self._workspace.actionImage_Viewer.setVisible(False)
         self._workspace.actionCombine_Batch_Fit.setVisible(False)
         # orientation viewer set to invisible SASVIEW-1132
@@ -825 +828 @@
         """
         """
-        print("actionImage_Viewer TRIGGERED")
-        pass
+        try:
+            self.image_viewer = ImageViewer(self)
+            if sys.platform == "darwin":
+                self.image_viewer.menubar.setNativeMenuBar(False)
+            self.image_viewer.show()
+        except Exception as ex:
+            logging.error(str(ex))
+            return
 
     #============ FITTING =================
@@ -1114 +1123 @@
         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