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

Timestamp:

Oct 22, 2018 7:48:54 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:

d00475d

Parents:

b8dccb8

Message:

Working project load/save. new format only. SASVIEW-983/984

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -268 +268 @@
         self.communicator.statusBarUpdateSignal.emit("Saving Project... %s\n" % os.path.basename(filename))
 
-        with open(filename, 'w') as outfile:
-            self.saveDataToFile(outfile)
+        return filename
 
     def saveAsAnalysisFile(self, tab_id=1):
@@ -318 +317 @@
             is_checked = item.checkState()
             properties['checked'] = is_checked
-            other_datas = GuiUtils.plotsFromFilename(filename, model)
+            other_datas = []
+            # no need to save other_datas - things will be refit on read
+            #other_datas = GuiUtils.plotsFromFilename(filename, model)
             # skip the main plot
-            other_datas = list(other_datas.values())[1:]
+            #other_datas = list(other_datas.values())[1:]
             all_data[data.id] = [data, properties, other_datas]
         return all_data
@@ -375 +376 @@
         with open(filename, 'r') as infile:
             all_data = GuiUtils.readDataFromFile(infile)
-            items = self.updateModelFromData(all_data)
+
+        for key, value in all_data.items():
+            data_dict = {key:value['fit_data']}
+            items = self.updateModelFromData(data_dict)
+            # send newly created item to its perspective
+            if 'fit_params' in value:
+                self.sendItemToPerspective(items[0])
+                # Make the perspective read the rest of the read data
+                self._perspective().updateFromParameters(value['fit_params'])
 
         pass # debugger