Changeset be74751 in sasview for src/sas/qtgui/MainWindow/DataExplorer.py

Timestamp:

Nov 7, 2018 6:47:25 AM (5 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

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (4 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):