Changeset 821c330 in sasview

Timestamp:

Sep 15, 2016 8: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:

ab4581b

Parents:

1e5005e

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/11/16 06:22:16)

git-committer:

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

Message:

Fix error bar calculations

Fixing the error bar calculations also removes the need to scale the y
axis when changing to a Porod or Kratky plot, so commit f2f6af9 has
effectively been reverted.

Location:

src/sas/sasgui/plottools

Files:

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

src/sas/sasgui/plottools/PlotPanel.py

@@ -1223 +1223 @@
         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"])
 
@@ -1767 +1763 @@
         _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
@@ -1827 +1822 @@
                 self.graph._yaxis_transformed("1/%s" % yname, "%s" % yunits)
             if self.yLabel == "y*x^(2)":
-                set_ylim = True
                 item.transformY(transform.toYX2, transform.errToYX2)
                 xunits = convert_unit(4, self.xaxis_unit)
@@ -1833 +1827 @@
                                               "%s%s" % (yunits, xunits))
             if self.yLabel == "y*x^(4)":
-                set_ylim = True
                 item.transformY(transform.toYX4, transform.errToYX4)
                 xunits = convert_unit(4, self.xaxis_unit)
@@ -1864 +1857 @@
                 self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname, xname),
                                               "%s%s" % (yunits, xunits))
-            if self.viewModel == "Guinier lny vs x^(2)":
-                item.transformX(transform.toX2, transform.errToX2)
-                xunits = convert_unit(2, xunits)
-                self.graph._xaxis_transformed("%s^{2}" % xname, "%s" % xunits)
-                item.transformY(transform.toLogX, transform.errToLogX)
-                self.graph._yaxis_transformed("\ln\ \ %s" % yname, "%s" % yunits)
-            if self.viewModel == "Porod y*x^(4) vs x^(4)":
-                item.transformX(transform.toX4, transform.errToX4)
-                xunits = convert_unit(4, self.xaxis_unit)
-                self.graph._xaxis_transformed("%s^{4}" % xname, "%s" % xunits)
-                item.transformY(transform.toYX4, transform.errToYX4)
-                self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname, xname),
-                                              "%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):
         """
@@ -173 +167 @@
         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):
@@ -278 +266 @@
         self.prop = {"xlabel": "", "xunit": None,
                      "ylabel": "", "yunit": None,
-                     "xlim": None, "ylim": None,
                      "title": ""}
         self.plottables = {}

src/sas/sasgui/plottools/transform.py

@@ -291 +291 @@
 
 
-def errToYX2(x, y, dx=None, dy=None):
+def errToYX2(y, x, dy=None, dx=None):
     """
     """
@@ -325 +325 @@
 
 
-def errToLogYX2(x, y, dx=None, dy=None):
+def errToLogYX2(y, x, dy=None, dx=None):
     """
     calculate error of Log(yx**2)
@@ -375 +375 @@
 
 
-def errToLogYX4(x, y=None, dx=None, dy=None):
+def errToLogYX4(y, x, dy=None, dx=None):
     """
     error for ln(y*x^(4))
@@ -396 +396 @@
 
 
-def errToYX4(x, y=None, dx=None, dy=None):
+def errToYX4(y, x, dy=None, dx=None):
     """
     error for (y*x^(4))