Changeset 6c7ebb88 in sasview for src/sas/qtgui/Plotting

Timestamp:

Mar 31, 2019 8:04:26 AM (5 years ago)

Author:

GitHub <noreply@…>

Parents:

f994f188 (diff), d32a594 (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.

git-author:

Adam Washington <rprospero@…> (03/31/19 08:04:26)

git-committer:

GitHub <noreply@…> (03/31/19 08:04:26)

Message:

Merge d32a594acc82ad29555832f498167b51564c75f3 into f994f188e28dca36e7823b2deb3bf2bfc351c35c

Location:

src/sas/qtgui/Plotting

Files:

• Plotter.py (modified) (1 diff)
• UnitTesting/PlotterTest.py (modified) (2 diffs)
• PlotterBase.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)
 

src/sas/qtgui/Plotting/PlotterBase.py

@@ -111 +111 @@
         self.contextMenu = QtWidgets.QMenu(self)
         self.toolbar = NavigationToolbar(self.canvas, self)
+        cid = self.canvas.mpl_connect('resize_event', self.onResize)
+
         layout.addWidget(self.toolbar)
         if not quickplot:
@@ -244 +246 @@
         raise NotImplementedError("Context menu method must be implemented in derived class.")
 
+    def onResize(self, event):
+        """
+        Redefine default resize event
+        """
+        pass
+
     def contextMenuEvent(self, event):
         """