Changeset 685e0e3 in sasview for src/sas/qtgui/Plotting/Plotter.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/Plotting/Plotter.py (modified) (1 diff)

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