Changeset be74751 in sasview

Timestamp:

Nov 7, 2018 8:47:25 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:

ebcdb02

Parents:

490e230

Message:

More batchpage related functionality for Analysis save/load

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (4 diffs)
• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -266 +266 @@
         filename = QtWidgets.QFileDialog.getOpenFileName(**kwargs)[0]
         if filename:
-            self.readAnalysis(filename)
+            self.readProject(filename)
 
     def saveProject(self):
@@ -414 +414 @@
         if 'svs' in ext.lower():
             # backward compatibility mode.
-            datasets = GuiUtils.readProjectFromSVS(filename)
-            #[[item_1, state_1], [item_2, state_2],...]
-
+            try:
+                datasets = GuiUtils.readProjectFromSVS(filename)
+            except Exception as ex:
+                # disregard malformed SVS and try to recover whatever
+                # is available
+                msg = "Error while reading the project file: "+str(ex)
+                logging.error(msg)
+                pass
             # Convert fitpage properties and update the dict
             try:
@@ -422 +427 @@
             except Exception as ex:
                 # disregard malformed SVS and try to recover regardless
-                msg = "Error while reading the project file: "+str(ex)
+                msg = "Error while converting the project file: "+str(ex)
                 logging.error(msg)
                 pass
         else:
             with open(filename, 'r') as infile:
-                all_data = GuiUtils.readDataFromFile(infile)
-
+                try:
+                    all_data = GuiUtils.readDataFromFile(infile)
+                except Exception as ex:
+                    logging.error("Project load failed with " + str(ex))
+                    return
         for key, value in all_data.items():
             if key=='is_batch':
@@ -489 +497 @@
                 self._perspective().updateFromParameters(page)
         pass # debugger
-
-    def readAnalysis(self, filename):
-        """
-        Read out a single dataset and fitpage from file
-        """
-        with open(filename, 'r') as infile:
-            all_data = GuiUtils.readDataFromFile(infile)
-
-            # send newly created items to the perspective
-            self.updatePerspectiveWithProperties(1, all_data)
 
     def updateModelFromData(self, data):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -600 +600 @@
         # get fit page serialization
         params = per.serializeCurrentFitpage()
+        # Find dataset ids for the current tab
+        # (can be multiple, if batch)
         data_id = per.currentTabDataId()
         tab_id = per.currentTab.tab_id
-        data = self.filesWidget.getDataForID(data_id)
         analysis = {}
-        analysis['fit_data'] = data
-        analysis['fit_params'] = params
+        for id in data_id:
+            an = {}
+            data_for_id = self.filesWidget.getDataForID(id)
+            an['fit_data'] = data_for_id
+            an['fit_params'] = [params]
+            analysis[id] = an
 
         self.filesWidget.saveAnalysis(analysis, tab_id)
-
-        pass
 
     def actionQuit(self):

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -10 +10 @@
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
@@ -157 +158 @@
         Returns the data ID of the current tab
         """
-        tab_id = None
-        if self.currentTab.data:
-            tab_id = self.currentTab.data.id
+        tab_id = []
+        if not self.currentTab.data:
+            return tab_id
+        for item in self.currentTab.all_data:
+            data = GuiUtils.dataFromItem(item)
+            tab_id.append(data.id)
+
         return tab_id