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

Timestamp:

Sep 20, 2012 1:22:02 PM (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:

bda809e

Parents:

b71a53b

Message:

category stuffs start working in interp. environment

File:

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

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

@@ -44 +44 @@
                       ["qmax", "qmax", "float"],
                       ["npts", "npts", "float"],
-                      ["shape_rbutton", "shape_rbutton", "bool"],
-                      ["shape_indep_rbutton", "shape_indep_rbutton", "bool"],
-                      ["plugin_rbutton", "plugin_rbutton", "bool"],
-                      ["struct_rbutton", "struct_rbutton", "bool"],
+                      #["shape_rbutton", "shape_rbutton", "bool"],
+                      #["shape_indep_rbutton", "shape_indep_rbutton", "bool"],
+                      #["plugin_rbutton", "plugin_rbutton", "bool"],
+                      #["struct_rbutton", "struct_rbutton", "bool"],
+                      ["categorycombobox", "categorycombobox", "string"],
                       ["formfactorcombobox", "formfactorcombobox", "string"],
                       ["structurecombobox", "structurecombobox", "string"],
@@ -224 +225 @@
         ## save selection of combobox
         self.formfactorcombobox = None
+        self.categorycombobox = None
         self.structurecombobox = None
 
         ## radio box to select type of model
-        self.shape_rbutton = False
-        self.shape_indep_rbutton = False
-        self.struct_rbutton = False
-        self.plugin_rbutton = False
+        #self.shape_rbutton = False
+        #self.shape_indep_rbutton = False
+        #self.struct_rbutton = False
+        #self.plugin_rbutton = False
         ## the indice of the current selection
         self.disp_box = 0
@@ -281 +283 @@
         obj.engine_type = copy.deepcopy(self.engine_type)
         
+        obj.categorycombobox = self.categorycombobox
         obj.formfactorcombobox = self.formfactorcombobox
         obj.structurecombobox = self.structurecombobox
         
-        obj.shape_rbutton = self.shape_rbutton
-        obj.shape_indep_rbutton = self.shape_indep_rbutton
-        obj.struct_rbutton = self.struct_rbutton
-        obj.plugin_rbutton = self.plugin_rbutton
+        #obj.shape_rbutton = self.shape_rbutton
+        #obj.shape_indep_rbutton = self.shape_indep_rbutton
+        #obj.struct_rbutton = self.struct_rbutton
+        #obj.plugin_rbutton = self.plugin_rbutton
         
         obj.manager = self.manager
@@ -380 +383 @@
         else:
             rep += "model name : None\n"
-        rep += "model type (form factor) selected: %s\n" % self.shape_rbutton 
+        #rep += "model type (form factor) selected: %s\n" % self.shape_rbutton 
         rep += "multi_factor : %s\n" % str(self.multi_factor)
-        rep += "model type (shape independent) selected: %s\n" % self.shape_indep_rbutton
-        rep += "model type (structure factor) selected: %s\n" % self.struct_rbutton
-        rep += "model type (plug-in ) selected: %s\n" % self.plugin_rbutton
+        rep += "model type (Category) selected: %s\n" % self.categorycombobox
+        #rep += "model type (shape independent) selected: %s\n" % self.shape_indep_rbutton
+        #rep += "model type (structure factor) selected: %s\n" % self.struct_rbutton
+        #rep += "model type (plug-in ) selected: %s\n" % self.plugin_rbutton
         rep += "data : %s\n" % str(self.data)
         rep += "Plotting Range: min: %s, max: %s, steps: %s\n" % (str(self.qmin),