Changeset aa6028c in sasview

Timestamp:

Sep 15, 2016 6:33:57 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:

ef6d1d8

Parents:

ba0dc71

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/10/16 09:25:57)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 06:33:57)

Message:

Set ylim when scale changed to Porod

Location:

src/sas/sasgui/plottools

Files:

• PlotPanel.py (modified) (5 diffs)
• plottables.py (modified) (3 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -1211 +1211 @@
 
         # Properties defined by plot
-        
+
         # Ricardo:
-        # A empty label "$$" will prevent the panel from displaying! 
-        
+        # A empty label "$$" will prevent the panel from displaying!
         if prop["xlabel"]:
             self.subplot.set_xlabel(r"$%s$"%prop["xlabel"])
         if prop["ylabel"]:
             self.subplot.set_ylabel(r"$%s$"%prop["ylabel"])
+        if prop["xlim"] is not None:
+            self.subplot.set_xlim(prop["xlim"])
+        if prop["ylim"] is not None:
+            self.subplot.set_ylim(prop["ylim"])
         self.subplot.set_title(prop["title"])
-        
+
 
     def clear(self):
@@ -1564 +1567 @@
                                                   bins=[self.y_bins, self.x_bins],
                                                   weights=self.data)
-        # Now, normalize the image by weights only for weights>1: 
+        # Now, normalize the image by weights only for weights>1:
         # If weight == 1, there is only one data point in the bin so
         # that no normalization is required.
@@ -1759 +1762 @@
         _yscale = 'linear'
         for item in list:
+            set_ylim = False # Whether to set ylim based on data points or error bars
             item.setLabel(self.xLabel, self.yLabel)
-
             # control axis labels from the panel itself
             yname, yunits = item.get_yaxis()
@@ -1819 +1822 @@
                 self.graph._yaxis_transformed("1/%s" % yname, "%s" % yunits)
             if self.yLabel == "y*x^(4)":
+                set_ylim = True
                 item.transformY(transform.toYX4, transform.errToYX4)
                 xunits = convert_unit(4, self.xaxis_unit)
@@ -1863 +1867 @@
                                               "%s%s" % (yunits, xunits))
             item.transformView()
+            if set_ylim:
+                self.graph.ylim((min(item.view.y), max(item.view.y)))
+            else:
+                self.graph.ylim(None)
 
         # set new label and units

src/sas/sasgui/plottools/plottables.py

@@ -157 +157 @@
         self.prop["xunit_base"] = units
 
+    def xlim(self, xlim):
+        """
+        Set the limits of the x axis to (min, max).
+        """
+        self.prop["xlim"] = xlim
+
     def yaxis(self, name, units):
         """
@@ -167 +173 @@
         self.prop["ylabel_base"] = name
         self.prop["yunit_base"] = units
+
+    def ylim(self, ylim):
+        """
+        Set the limits of the y axis to (min, max).
+        """
+        self.prop["ylim"] = ylim
 
     def title(self, name):
@@ -266 +278 @@
         self.prop = {"xlabel": "", "xunit": None,
                      "ylabel": "", "yunit": None,
+                     "xlim": None, "ylim": None,
                      "title": ""}
         self.plottables = {}