Changeset 318b5bbb in sasview for fittingview/src/sans/perspectives/fitting/pagestate.py

Timestamp:

Dec 18, 2012 10:55:24 AM (12 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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• fittingview/src/sans/perspectives/fitting/pagestate.py (modified) (5 diffs)

fittingview/src/sans/perspectives/fitting/pagestate.py

@@ -52 +52 @@
                       ["structurecombobox", "structurecombobox", "string"],
                       ["multi_factor","multi_factor","float"],
+                      ["magnetic_on","magnetic_on", "bool"],
                       ["enable_smearer","enable_smearer","bool"],
                       ["disable_smearer","disable_smearer","bool"],
@@ -246 +247 @@
         self.name = ""
         self.multi_factor = None
+        self.magnetic_on = False
         ## enable smearering state
         self.enable_smearer = False
@@ -335 +337 @@
         obj.qmax = copy.deepcopy(self.qmax)
         obj.multi_factor = self.multi_factor
+        obj.magnetic_on = self.magnetic_on
         obj.npts = copy.deepcopy(self.npts)
         obj.cb1 = copy.deepcopy(self.cb1)
@@ -385 +388 @@
         #rep += "model type (form factor) selected: %s\n" % self.shape_rbutton 
         rep += "multi_factor : %s\n" % str(self.multi_factor)
+        rep += "magnetic_on : %s\n"% str(self.magnetic_on)
         rep += "model type (Category) selected: %s\n" % self.categorycombobox
         #rep += "model type (shape independent) selected: %s\n" % self.shape_indep_rbutton
@@ -500 +504 @@
                 muti_factor = ("muti_factor = " + value)
                 muti_factor_string = CENTRE % muti_factor
+            if name == "magentic_on ":
+                magentic_on = ("magentic_on = " + value)
+                if string(value) == 'True':
+                    magentic_on_string = CENTRE % magentic_on
             if name == "Title":
                 if len(value.strip()) == 0: