Changes in / [f994f188:6c7ebb88] in sasview

Location:

src/sas/qtgui/Plotting

Files:

• Plotter.py (modified) (1 diff)
• UnitTesting/PlotterTest.py (modified) (2 diffs)

src/sas/qtgui/Plotting/Plotter.py

@@ -91 +91 @@
             # make sure we have some function to operate on
             if self.data.xtransform is None:
-                self.data.xtransform = 'log10(x)'
+                if self.data.isSesans:
+                    self.data.xtransform='x'
+                else:
+                    self.data.xtransform = 'log10(x)'
             if self.data.ytransform is None:
-                self.data.ytransform = 'log10(y)'
+                if self.data.isSesans:
+                    self.data.ytransform='y'
+                else:
+                    self.data.ytransform = 'log10(y)'
             #Added condition to Dmax explorer from P(r) perspective
             if self.data._xaxis == 'D_{max}':

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -81 +81 @@
         """ Ensure that Sesans data is plotted in linear cooredinates"""
         data = Data1D(x=[1.0, 2.0, 3.0],
-                      y=[10.0, 11.0, 12.0],
+                      y=[-10.0, -11.0, -12.0],
                       dx=[0.1, 0.2, 0.3],
                       dy=[0.1, 0.2, 0.3])
@@ -97 +97 @@
         self.assertEqual(self.plotter.ax.get_xscale(), 'linear')
         self.assertEqual(self.plotter.ax.get_yscale(), 'linear')
+        self.assertEqual(self.plotter.data.ytransform, "y")
         self.assertTrue(FigureCanvas.draw_idle.called)