Changeset 3c6ecd9 in sasview for src/sas/qtgui/Plotting

Timestamp:

May 7, 2018 6:47:21 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

42787fb

Parents:

b0ba43e (diff), 80468f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

Location:

src/sas/qtgui/Plotting

Files:

• Plotter.py (modified) (3 diffs)
• SlicerParameters.py (modified) (1 diff)
• ConvertUnits.py (modified) (1 prop)
• DataTransform.py (modified) (1 prop)
• Slicers/Arc.py (modified) (1 prop)

src/sas/qtgui/Plotting/Plotter.py

@@ -13 +13 @@
 from sas.qtgui.Plotting.LinearFit import LinearFit
 from sas.qtgui.Plotting.PlotProperties import PlotProperties
+from sas.qtgui.Plotting.ScaleProperties import ScaleProperties
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -74 +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.
-        # TODO: it properly!
-        #if data.xtransform is not None or data.ytransform is not None:
-        #    a, b, c, d = GuiUtils.xyTransform(self.data, self.data.xtransform, self.data.ytransform)
+        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
@@ -276 +291 @@
         if self.properties.exec_() == QtWidgets.QDialog.Accepted:
             self.xLogLabel, self.yLogLabel = self.properties.getValues()
+            self.data.xtransform = self.xLogLabel
+            self.data.ytransform = self.yLogLabel
             self.xyTransform(self.xLogLabel, self.yLogLabel)
 

src/sas/qtgui/Plotting/SlicerParameters.py

@@ -86 +86 @@
         Display generic data averaging help
         """
-        location = "/user/sasgui/guiframe/graph_help.html#d-data-averaging"
+        location = "/user/qtgui/MainWindow/graph_help.html#d-data-averaging"
         self.parent.showHelp(location)