Changeset 749b715 in sasview

Timestamp:

Oct 27, 2017 6:28:17 AM (7 years ago)

Author:

Piotr Rozyczko <piotr.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:

b3e8629

Parents:

9e54199

git-author:

Adam Washington <rprospero@…> (10/27/17 06:28:17)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (10/27/17 06:28:17)

Message:

Ess sesans plots (#113)

• Line Endings in QtGui?

• Fix line endings

• Keep the isSesans parameter when making copies.

• Draw Sesans data in linear coordinates

• Add unit test for Sesans Plotting

• Remove lint

Location:

src/sas

Files:

• qtgui/Plotting/Plotter.py (modified) (1 diff)
• qtgui/Plotting/PlotterData.py (modified) (1 diff)
• qtgui/Plotting/UnitTesting/PlotterTest.py (modified) (1 diff)
• sascalc/dataloader/data_info.py (modified) (1 diff)

src/sas/qtgui/Plotting/Plotter.py

@@ -56 +56 @@
         self.xLabel = "%s(%s)"%(value._xaxis, value._xunit)
         self.yLabel = "%s(%s)"%(value._yaxis, value._yunit)
+        if value.isSesans:
+            self.xscale = 'linear'
+            self.yscale = 'linear'
         self.title(title=value.name)
 

src/sas/qtgui/Plotting/PlotterData.py

@@ -54 +54 @@
         self.yaxis(data1d._yaxis, data1d._yunit)
         self.title = data1d.title
+        self.isSesans = data1d.isSesans
         
     def __str__(self):

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

@@ -73 +73 @@
 
         self.assertEqual(self.plotter.ax.get_yscale(), 'log')
+        self.assertTrue(FigureCanvas.draw.called)
+
+    def testPlotWithSesans(self):
+        """ 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],
+                      dx=[0.1, 0.2, 0.3],
+                      dy=[0.1, 0.2, 0.3])
+        data.title = "Sesans data"
+        data.name = "Test Sesans"
+        data.isSesans = True
+        data.id = 2
+
+        self.plotter.data = data
+        self.plotter.show()
+        FigureCanvas.draw = MagicMock()
+
+        self.plotter.plot(hide_error=True)
+
+        self.assertEqual(self.plotter.ax.get_xscale(), 'linear')
+        self.assertEqual(self.plotter.ax.get_yscale(), 'linear')
         self.assertTrue(FigureCanvas.draw.called)
 

src/sas/sascalc/dataloader/data_info.py

@@ -775 +775 @@
         clone.meta_data = deepcopy(self.meta_data)
         clone.errors = deepcopy(self.errors)
+        clone.isSesans = self.isSesans
 
         return clone