Changeset ef6d1d8 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:

d9afe942

Parents:

aa6028c

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/10/16 11:39:28)

git-committer:

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

Message:

Add Kratky option to plot scale. Closes #205

Location:

src/sas/sasgui/plottools

Files:

• PlotPanel.py (modified) (2 diffs)
• PropertyDialog.py (modified) (2 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -731 +731 @@
                         self.xLabel = "x^(4)"
                         self.yLabel = "y*x^(4)"
+                        self.viewModel = "--"
+                        dial.setValues(self.xLabel, self.yLabel, self.viewModel)
+                    if self.viewModel == "Kratky y*x^(2) vs x":
+                        self.xLabel = "x"
+                        self.yLabel = "y*x^(2)"
                         self.viewModel = "--"
                         dial.setValues(self.xLabel, self.yLabel, self.viewModel)
@@ -1821 +1826 @@
                 yunits = convert_unit(-1, yunits)
                 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)
+                self.graph._yaxis_transformed("%s \ \ %s^{2}" % (yname, xname),
+                                              "%s%s" % (yunits, xunits))
             if self.yLabel == "y*x^(4)":
                 set_ylim = True

src/sas/sasgui/plottools/PropertyDialog.py

@@ -64 +64 @@
         self.yvalue.Insert("ln(y)", 2)
         self.yvalue.Insert("y^(2)", 3)
-        self.yvalue.Insert("y*x^(4)", 4)
-        self.yvalue.Insert("1/sqrt(y)", 5)
-        self.yvalue.Insert("log10(y)", 6)
-        self.yvalue.Insert("ln(y*x)", 7)
-        self.yvalue.Insert("ln(y*x^(2))", 8)
-        self.yvalue.Insert("ln(y*x^(4))", 9)
-        self.yvalue.Insert("log10(y*x^(4))", 10)
+        self.yvalue.Insert("y*x^(2)", 4)
+        self.yvalue.Insert("y*x^(4)", 5)
+        self.yvalue.Insert("1/sqrt(y)", 6)
+        self.yvalue.Insert("log10(y)", 7)
+        self.yvalue.Insert("ln(y*x)", 8)
+        self.yvalue.Insert("ln(y*x^(2))", 9)
+        self.yvalue.Insert("ln(y*x^(4))", 10)
+        self.yvalue.Insert("log10(y*x^(4))", 11)
         # type of view or model used
         self.view.SetValue("--")
@@ -78 +79 @@
         self.view.Insert("XS Guinier ln(y*x) vs x^(2)", 3)
         self.view.Insert("Porod y*x^(4) vs x^(4)", 4)
-        # This did not work in 3.1.2 and does not work now.
-        # prefer to fix (should not be too hard) but for the moment
-        # am removing as an option the user sees so they don't get
-        # disappointed.    PDB 7/10/2016 
-        # self.view.Insert("Kratky y*x^(2) vs x", 5)
+        self.view.Insert("Kratky y*x^(2) vs x", 5)
         self.SetSizer(vbox)
         self.Fit()