Changeset 6b44403 in sasview for sansview/perspectives/fitting/fitpage1D.py

Timestamp:

Feb 3, 2009 11:47:46 AM (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:

94999eb

Parents:

ca88b2e

Message:

using new panels only fitpanel1D and modelpanel are used this time

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -264 +264 @@
         self.parameters=[]
         self.fixed_param=[]
+        self.fittable_param=[]
         #list of dispersion paramaters
         self.disp_list=None
@@ -589 +590 @@
                     list= [item[0],item[1],item[2],item[3]]
                     self.param_toFit.append(list )
+                if len(self.fittable_param)>0:
+                    for item in self.fittable_param:
+                        item[0].SetValue(True)
+                        list= [item[0],item[1],item[2],item[3]]
+                        self.param_toFit.append(list )
                
                 if not (len(self.param_toFit ) >0):
-                    self.xmin.Disable()
-                    self.xmax.Disable()
+                    self.qmin.Disable()
+                    self.qmax.Disable()
                 else:
-                    self.xmin.Enable()
-                    self.xmax.Enable()
+                    self.qmin.Enable()
+                    self.qmax.Enable()
             else:
                 for item in self.parameters:
                     item[0].SetValue(False)
+                for item in self.fittable_param:
+                    item[0].SetValue(False)
                 self.param_toFit=[]
               
-                self.xmin.Disable()
-                self.xmax.Disable()
+                self.qmin.Disable()
+                self.qmax.Disable()
                 
                 
@@ -619 +627 @@
                 if item in self.param_toFit:
                     self.param_toFit.remove(item)
-        if len(self.parameters)==len(self.param_toFit):
+                    
+        for item in self.fittable_param:
+            if item[0].GetValue()==True:
+                list= [item[0],item[1],item[2],item[3]]
+                if not (list  in self.param_toFit):
+                    self.param_toFit.append(list )  
+            else:
+                if item in self.param_toFit:
+                    self.param_toFit.remove(item)           
+                    
+                    
+        if len(self.parameters)+len(self.fittable_param) ==len(self.param_toFit):
             self.cb1.SetValue(True)
         else: