Changeset 75a6cf0 in sasview for plottools/src/danse/common

Timestamp:

Jun 20, 2012 7:13:41 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9bab141

Parents:

23b44dd

Message:

Added cs guinier and linear quick scaling

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (1 diff)
• PropertyDialog.py (modified) (1 diff)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -719 +719 @@
                 if dial.ShowModal() == wx.ID_OK:
                     self.xLabel, self.yLabel, self.viewModel = dial.getValues()
+                    if self.viewModel == "Linear y vs x":
+                        self.xLabel = "x"
+                        self.yLabel = "y"
+                        self.viewModel = "--"
+                        dial.setValues(self.xLabel, self.yLabel, self.viewModel)
                     if self.viewModel == "Guinier lny vs x^(2)":
                         self.xLabel = "x^(2)"
                         self.yLabel = "ln(y)"
+                        self.viewModel = "--"
+                        dial.setValues(self.xLabel, self.yLabel, self.viewModel)
+                    if self.viewModel == "CS Guinier ln(y*x) vs x^(2)":
+                        self.xLabel = "x^(2)"
+                        self.yLabel = "ln(y*x)"
                         self.viewModel = "--"
                         dial.setValues(self.xLabel, self.yLabel, self.viewModel)

plottools/src/danse/common/plottools/PropertyDialog.py

@@ -77 +77 @@
         self.view.SetValue("--")
         self.view.Insert("--", 0)
-        self.view.Insert("Guinier lny vs x^(2)", 1)
-        self.view.Insert("Porod y*x^(4) vs x^(4)", 2)
+        self.view.Insert("Linear y vs x", 1)
+        self.view.Insert("Guinier lny vs x^(2)", 2)
+        self.view.Insert("CS Guinier ln(y*x) vs x^(2)", 3)
+        self.view.Insert("Porod y*x^(4) vs x^(4)", 4)
         self.SetSizer(vbox)
         self.Fit()