Changeset ebcdb02 in sasview

Timestamp:

Nov 8, 2018 5:01:08 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:

133812c7

Parents:

be74751

Message:

Analysis only for Fitting, project save on other perspectives saves
datasets. Fixed tab deletion on data removal for batch tabs.

Location:

src/sas/qtgui

Files:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -527 +527 @@
             if new_data.is_data:
                 model = self.model
+                # Caption for the theories
+                new_item.setChild(2, QtGui.QStandardItem("FIT RESULTS"))
+
             model.appendRow(new_item)
             self.manager.add_data(data_list={new_data.id:new_data})

src/sas/qtgui/MainWindow/GuiManager.py

@@ -570 +570 @@
 
         # fit tabs
-        params = self.perspective().serializeAllFitpage()
+        params={}
+        perspective = self.perspective()
+        if hasattr(perspective, 'isSerializable') and perspective.isSerializable():
+            params = perspective.serializeAllFitpage()
 
         # project dictionary structure:

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

@@ -1 +1 @@
 import numpy
+import copy
 
 from PyQt5 import QtCore
@@ -306 +307 @@
         for index_to_delete in index_list:
             index_to_delete_str = str(index_to_delete)
-            if index_to_delete_str in list(self.dataToFitTab.keys()):
-                for tab_name in self.dataToFitTab[index_to_delete_str]:
-                    # delete tab #index after corresponding data got removed
-                    self.closeTabByName(tab_name)
-                self.dataToFitTab.pop(index_to_delete_str)
+            orig_dict = copy.deepcopy(self.dataToFitTab)
+            for tab_key in orig_dict.keys():
+                if index_to_delete_str in tab_key:
+                    for tab_name in orig_dict[tab_key]:
+                        self.closeTabByName(tab_name)
+                    self.dataToFitTab.pop(tab_key)
 
     def allowBatch(self):