Changeset 513115c in sasview for sansview

Timestamp:

Apr 20, 2009 4:38:55 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

773806e

Parents:

2b8b1a2

Message:

reducing possibility to fit the same model many time

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (1 diff)
• fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1157 +1157 @@
         if len(self.param_toFit)>0:
             for item in self.fittable_param:
-                if item in self.para_toFit:
+                if item in self.param_toFit:
                     self.param_toFit.remove(item)
             for item in self.orientation_params_disp:
-                if item in self.para_toFit:
+                if item in self.param_toFit:
                     self.param_toFit.remove(item)
-                
+         
         self.fittable_param=[]
         self.fixed_param=[]
@@ -1229 +1229 @@
             draw sizer with array dispersity  parameters
         """
+        if len(self.param_toFit)>0:
+            for item in self.fittable_param:
+                if item in self.param_toFit:
+                    self.param_toFit.remove(item)
+            for item in self.orientation_params_disp:
+                if item in self.param_toFit:
+                    self.param_toFit.remove(item)
         self.fittable_param=[]
         self.fixed_param=[]

sansview/perspectives/fitting/fitpage.py

@@ -814 +814 @@
                         else:
                             ## for 1D all parameters except orientation
-                            if not item in self.orientation_params:
+                            if not item in self.orientation_params_disp:
                                 item[0].SetValue(True)
                                 self.param_toFit.append(item )

sansview/perspectives/fitting/fitting.py

@@ -167 +167 @@
         self.graph=graph
         for item in graph.plottables:
+            if hasattr(item,"is_data"):
+                if item.is_data== False:
+                    return []
+           
             if item.__class__.__name__ is "Data2D":
                 return [["Select data  for Fitting",\
@@ -434 +438 @@
                     templist = page.get_param_list()
                     for element in templist:
-                        name = str(element[0].GetLabelText())
+                        name = str(element[1])
                         pars.append(name)
                     #Set Engine  (model , data) related to the page on 
@@ -967 +971 @@
                 if new_plot.id == data.id:
                     new_plot.id += "Model"
-         
+                new_plot.is_data =False 
             # Pass the reset flag to let the plotting event handler
             # know that we are replacing the whole plot
@@ -1020 +1024 @@
         
         else:
-            theory.id= "Model"
-            theory.group_id= "Model"+data.name
+            theory.id= data.id+"Model"
+            theory.group_id= data.name+"Model"
             theory.x_bins= data.x_bins
             theory.y_bins= data.y_bins
             theory.detector= data.detector
             theory.source= data.source
-            
+            theory.is_data =False 
             ## plot boundaries
             theory.ymin= data.ymin