Changeset 685e0e3 in sasview for src/sas

Timestamp:

Aug 10, 2018 6: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.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Plotting/Plotter.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (1 diff)

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):

src/sas/qtgui/Plotting/Plotter.py

@@ -75 +75 @@
         is_fit = (self.data.id=="fit")
 
-        # make sure we have some function to operate on
-        if self.data.xtransform is None:
-            self.data.xtransform = 'log10(x)'
-        if self.data.ytransform is None:
-            self.data.ytransform = 'log10(y)'
-
-        # Transform data if required.
-        if self.data.xtransform is not None or self.data.ytransform is not None:
-            _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
-            if xscale != 'log':
-                self.xscale = xscale
-            if yscale != 'log':
-                self.yscale = yscale
-
-            # Redefine the Scale properties dialog
-            self.properties = ScaleProperties(self,
-                                    init_scale_x=self.data.xtransform,
-                                    init_scale_y=self.data.ytransform)
+        if not is_fit:
+            # make sure we have some function to operate on
+            if self.data.xtransform is None:
+                self.data.xtransform = 'log10(x)'
+            if self.data.ytransform is None:
+                self.data.ytransform = 'log10(y)'
+
+            # Transform data if required.
+            if self.data.xtransform is not None or self.data.ytransform is not None:
+                _, _, xscale, yscale = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
+                if xscale != 'log':
+                    self.xscale = xscale
+                if yscale != 'log':
+                    self.yscale = yscale
+
+                # Redefine the Scale properties dialog
+                self.properties = ScaleProperties(self,
+                                        init_scale_x=self.data.xtransform,
+                                        init_scale_y=self.data.ytransform)
 
         # Shortcuts

src/sas/qtgui/Utilities/GuiUtils.py

@@ -427 +427 @@
     for index in range(model_item.rowCount()):
         item = model_item.item(index)
-        if str(item.text()) == filename:
+        if filename in str(item.text()):
             # TODO: assure item type is correct (either data1/2D or Plotter)
             plot_data[item] = item.child(0).data()