Changeset 5d75a181 in sasview

Timestamp:

Nov 29, 2018 9:19:45 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_sync_sascalc

Children:

d9e7792

Parents:

376a939

Message:

Various fixes to project read/save for theories and frozen theories

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -4 +4 @@
 import time
 import logging
+import copy
 
 from PyQt5 import QtCore
@@ -240 +241 @@
         # check if any items loaded and warn about data deletion
         if self.model.rowCount() > 0:
-            msg = "This operation will set remove all data, plots and analyses from"
+            msg = "This operation will remove all data, plots and analyses from"
             msg += " SasView before loading the project. Do you wish to continue?"
             msgbox = QtWidgets.QMessageBox(self)
@@ -539 +540 @@
             # add the main index
             if not value: continue
-            #if key=='is_batch':
-            #    self.chkBatch.setChecked(True if value=='True' else False)
-            #    continue
             new_data = value[0]
             from sas.sascalc.dataloader.data_info import Data1D as old_data1d
@@ -557 +555 @@
             items.append(new_item)
             model = self.theory_model
-            if new_data.is_data:
+            if value[0].is_data:
                 model = self.model
                 # Caption for the theories
@@ -797 +795 @@
         info_item = QtGui.QStandardItem("Info")
         data_item = QtGui.QStandardItem()
-        data_item.setData(item_from.child(0).data())
+        orig_data = copy.deepcopy(item_from.child(0).data())
+        data_item.setData(orig_data)
         new_item.setText(item_from.text())
         new_item.setChild(0, data_item)
@@ -809 +808 @@
             new_item.child(0).data().is_data = True
             new_item.child(0).data().symbol = 'Circle'
+            new_item.child(0).data().id = new_name
         except AttributeError:
             #no data here, pass
@@ -1530 +1530 @@
             data.is_data = True
             data.symbol = 'Circle'
+            data.id = new_name
         except AttributeError:
             #no data here, pass
@@ -1559 +1560 @@
         deleted_items = [self.model.item(row) for row in range(self.model.rowCount())
                          if self.model.item(row).isCheckable()]
+        deleted_theory_items = [self.theory_model.item(row)
+                                for row in range(self.theory_model.rowCount())
+                                if self.theory_model.item(row).isCheckable()]
+        deleted_items += deleted_theory_items
         deleted_names = [item.text() for item in deleted_items]
+        deleted_names += deleted_theory_items
         # Let others know we deleted data
         self.communicator.dataDeletedSignal.emit(deleted_items)
@@ -1567 +1573 @@
         # Clear the model
         self.model.clear()
+        self.theory_model.clear()
 
     def deleteSelectedItem(self):