Changeset d3ca363 in sasview

Timestamp:

Dec 19, 2016 8:05:25 AM (8 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:

257bd57

Parents:

9290b1a

Message:

Setting graph range - SASVIEW-381

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs, 1 prop)
• Plotter.py (modified) (2 diffs)
• SetGraphRange.py (added)
• UI/SetGraphRangeUI.ui (added)
• UnitTesting/PlotterTest.py (modified) (1 diff)
• UnitTesting/SetGraphRangeTest.py (added)
• run_tests.bat (modified) (1 diff)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/GUITests.py

@@ -19 +19 @@
 from UnitTesting import DensityCalculatorTest
 from UnitTesting import WindowTitleTest
+from UnitTesting import SetGraphRangeTest
 
 def suite():
@@ -40 +41 @@
         unittest.makeSuite(DensityCalculatorTest.DensityCalculatorTest, 'test'),
         unittest.makeSuite(WindowTitleTest.WindowTitleTest, 'test'),
+        unittest.makeSuite(SetGraphRangeTest.SetGraphRangeTest, 'test'),
     )
     return unittest.TestSuite(suites)

src/sas/qtgui/Plotter.py

@@ -9 +9 @@
 from sas.qtgui.PlotterBase import PlotterBase
 from sas.qtgui.AddText import AddText
+from sas.qtgui.SetGraphRange import SetGraphRange
 
 class PlotterWidget(PlotterBase):
@@ -206 +207 @@
         Show a dialog allowing setting the chart ranges
         """
-        print("onSetGraphRange")
-        pass
+        # min and max of data
+        x_range = self.ax.get_xlim()
+        y_range = self.ax.get_ylim()
+        self.setRange = SetGraphRange(parent=self,
+            x_range=x_range, y_range=y_range)
+        if self.setRange.exec_() == QtGui.QDialog.Accepted:
+            x_range = self.setRange.xrange()
+            y_range = self.setRange.yrange()
+            if x_range is not None and y_range is not None:
+                self.ax.set_xlim(x_range)
+                self.ax.set_ylim(y_range)
+                self.canvas.draw_idle()
 
     def onResetGraphRange(self):
         """
-        Resets the chart X and Y ranges to the original values
-        """
-        print("onResetGraphRange")
-        pass
+        Resets the chart X and Y ranges to their original values
+        """
+        x_range = (self.data.x.min(), self.data.x.max())
+        y_range = (self.data.y.min(), self.data.y.max())
+        if x_range is not None and y_range is not None:
+            self.ax.set_xlim(x_range)
+            self.ax.set_ylim(y_range)
+            self.canvas.draw_idle()
 
     def xyTransform(self, xLabel="", yLabel=""):

src/sas/qtgui/UnitTesting/PlotterTest.py

@@ -162 +162 @@
         pass
 
+    def testOnSetGraphRange(self):
+        """ Cheks if the graph can be resized for range """
+        pass
+
+    def testOnResetGraphRange(self):
+        """ Cheks if the graph can be reset after resizing for range """
+        pass
 
 if __name__ == "__main__":

src/sas/qtgui/run_tests.bat

@@ -18 +18 @@
 python -m UnitTesting.WindowTitleTest
 python -m UnitTesting.AddTextTest
+python -m UnitTesting.SetGraphRangeTest

src/sas/qtgui/run_tests.sh

@@ -17 +17 @@
 python -m UnitTesting.WindowTitleTest
 python -m UnitTesting.AddTextTest
+python -m UnitTesting.SetGraphRangeTest