Changeset cb4d219 in sasview for src/sas/qtgui/Plotting

Timestamp:

Nov 24, 2017 4:13:11 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:

8f83719f

Parents:

c6fb57c

Message:

Minor layout changes to corfunc. Transformed plots now in Data Explorer. SASVIEW-608

File:

• src/sas/qtgui/Plotting/Plotter.py (modified) (2 diffs)

src/sas/qtgui/Plotting/Plotter.py

@@ -49 +49 @@
         """ data setter """
         self._data = value
-        self.xLabel = "%s(%s)"%(value._xaxis, value._xunit)
-        self.yLabel = "%s(%s)"%(value._yaxis, value._yunit)
-        if value.isSesans:
+        if value._xunit:
+            self.xLabel = "%s(%s)"%(value._xaxis, value._xunit)
+        else:
+            self.xLabel = "%s"%(value._xaxis)
+        if value._yunit:
+            self.yLabel = "%s(%s)"%(value._yaxis, value._yunit)
+        else:
+            self.yLabel = "%s"%(value._yaxis)
+
+        if value.scale == 'linear' or value.isSesans:
             self.xscale = 'linear'
             self.yscale = 'linear'
@@ -83 +90 @@
             # Try name first
             try:
-                marker = PlotUtilities.SHAPES[marker]
+                marker = dict(PlotUtilities.SHAPES)[marker]
             except KeyError:
-                marker = list(PlotUtilities.SHAPES.values())[marker]
+                list(PlotUtilities.SHAPES.values())[marker]
 
         assert marker is not None