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

Timestamp:

Aug 10, 2018 8:41:49 AM (6 years ago)

Author:

piotr

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c7f259d

Parents:

a2cc8b97

Message:

Fix for frozen theories not showing correct plots. SASVIEW-978
Fix for Linear Fit not working properly after recent changes.

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -405 +405 @@
                 self.model.beginResetModel()
                 theories_copied += 1
-                new_item = self.recursivelyCloneItem(outer_item)
-                # Append a "unique" descriptor to the name
-                time_bit = str(time.time())[7:-1].replace('.', '')
-                new_name = new_item.text() + '_@' + time_bit
-                new_item.setText(new_name)
+                new_item = self.cloneTheory(outer_item)
                 self.model.appendRow(new_item)
                 self.model.endResetModel()
-            #self.model.reset()
 
         freeze_msg = ""
@@ -427 +422 @@
         # Actively switch tabs
         self.setCurrentIndex(1)
+
+    def cloneTheory(self, item_from):
+        """
+        Manually clone theory items into a new HashableItem
+        """
+        new_item = GuiUtils.HashableStandardItem()
+        new_item.setCheckable(True)
+        new_item.setCheckState(QtCore.Qt.Checked)
+        info_item = QtGui.QStandardItem("Info")
+        data_item = QtGui.QStandardItem()
+        data_item.setData(item_from.child(0).data())
+        new_item.setText(item_from.text())
+        new_item.setChild(0, data_item)
+        new_item.setChild(1, info_item)
+        # Append a "unique" descriptor to the name
+        time_bit = str(time.time())[7:-1].replace('.', '')
+        new_name = new_item.text() + '_@' + time_bit
+        new_item.setText(new_name)
+        # Change the underlying data so it is no longer a theory
+        try:
+            new_item.child(0).data().is_data = True
+        except AttributeError:
+            #no data here, pass
+            pass
+        return new_item
 
     def recursivelyCloneItem(self, item):