Changeset c0ff8cc in sasview for sansview/perspectives/fitting

Timestamp:

Apr 18, 2011 10:18:11 AM (14 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:

4bd492f

Parents:

69f9084

Message:

fixed problem in saving w/multifunctional models

File:

• sansview/perspectives/fitting/pagestate.py (modified) (18 diffs)

sansview/perspectives/fitting/pagestate.py

@@ -47 +47 @@
                       ["formfactorcombobox", "formfactorcombobox", "float"],
                       ["structurecombobox", "structurecombobox", "float"],
+                      ["multi_factor","multi_factor","float"],
                       ["enable_smearer","enable_smearer","bool"],
                       ["disable_smearer","disable_smearer","bool"],
@@ -149 +150 @@
         self.is_data = None
         self.data_name = ""
-        
+
         if self.data is not None:
             self.data_name = self.data.name
@@ -207 +208 @@
         self.values = {}
         self.weights = {}
-
                     
         #contains link between a model and selected parameters to fit 
@@ -218 +218 @@
         self.formfactorcombobox = None
         self.structurecombobox  = None
+
         ## radio box to select type of model
         self.shape_rbutton = False
@@ -314 +315 @@
         obj.qmin = copy.deepcopy(self.qmin)
         obj.qmax = copy.deepcopy(self.qmax)
-        obj.multi_factor = copy.deepcopy(self.multi_factor)
+        obj.multi_factor = self.multi_factor
         obj.npts = copy.deepcopy(self.npts )
         obj.cb1 = copy.deepcopy(self.cb1)
@@ -341 +342 @@
             rep += "parameter unit: %s\n\n"%str(item[7])
         return rep
- 
+    
     def __repr__(self):
         """ 
@@ -349 +350 @@
         t = time.localtime(self.timestamp)
         time_str = time.strftime("%b %d %H;%M of %Y", t)
+
         rep += "State created on : %s\n"%time_str
         rep += "State form factor combobox selection: %s\n"%self.formfactorcombobox
@@ -356 +358 @@
         rep += "data's id : %s\n"%self.data_id
         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
@@ -412 +415 @@
                 rep = self._repr_helper( list=self.orientation_params_disp, rep=rep)
             """
-        
         return rep
-
 
     def set_report_string(self):
@@ -429 +430 @@
         paramval_string = ""
         chi2_string = ""
+        multi_factor_string = ""
         q_range = ""
         strings = self.__repr__()
@@ -462 +464 @@
                 chi2 = ("Chi2/Npts = " + value)
                 chi2_string = CENTRE % chi2
+            if name == "multi_factor ":
+                muti_factor = ("muti_factor = " + value)
+                muti_factor_string = CENTRE % muti_factor
             if name == "Title":
                 if len(value.strip()) == 0:
@@ -540 +545 @@
         else:
             add_str = ""
+
         # final report html strings
         report_str = html_str % ("%s") + add_str
@@ -548 +554 @@
         dialog = ReportDialog(report_list, None, -1, "")
         dialog.ShowModal()
-          
+        
+   
     def _toXML_helper(self, list, element, newdoc):
         """
@@ -638 +645 @@
             exec "element.setAttribute(item[0], str(self.%s))" % (item[1])
             inputs.appendChild(element)
-
+            
         # For self.values ={ disp_param_name: [vals,...],...}   
-        # and for self.weights ={ disp_param_name: [weights,...],...}              
+        # and for self.weights ={ disp_param_name: [weights,...],...}  
         for item in list_of_model_attributes:
             element = newdoc.createElement(item[0])
@@ -673 +680 @@
             exec com % item[1]                       
             inputs.appendChild(element)
-               
+        
         # Save the file
         if doc is None:
@@ -870 +877 @@
             images.append(fig)
             
-        return images                   
+        return images
 
 class Reader(CansasReader):
@@ -1501 +1508 @@
             
         return doc 
-
     
 # Simple html report templet  
@@ -1542 +1548 @@
 ELINE = "<p class=MsoNormal>&nbsp;</p>"
 
- 
 if __name__ == "__main__":
     state = PageState(parent=None)