Changeset 934cfc03 in sasview

Timestamp:

Oct 18, 2011 12:52:31 PM (13 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:

02b0988d

Parents:

afa0a31

Message:

make sure dispersity check does not uncheck other buttons

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (15 diffs)

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

@@ -691 +691 @@
         #sizer_select_dispers = wx.BoxSizer(wx.HORIZONTAL)  
         model_disp = wx.StaticText(self, -1, 'Function')
-            
+        CHECK_STATE = self.cb1.GetValue()     
         import sans.models.dispersion_models 
         self.polydisp= sans.models.dispersion_models.models
@@ -766 +766 @@
                         ix = 0
                         cb = wx.CheckBox(self, -1, name0, (10, 10))
+                        cb.SetValue(CHECK_STATE)
                         cb.SetToolTipString("Check mark to fit")
                         wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
@@ -888 +889 @@
                         ix = 0
                         cb = wx.CheckBox(self, -1, name0, (10, 10))
+                        cb.SetValue(CHECK_STATE)
                         cb.SetToolTipString("Check mark to fit")
                         wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
@@ -1050 +1052 @@
                         " Selected Distribution: Gaussian"))   
         #Fill the list of fittable parameters
-        self.select_all_param(event=None)
-        
+        #self.select_all_param(event=None)
+        self.get_all_checked_params()
         self.Layout()
 
@@ -1309 +1311 @@
             if copy_flag:
                 self.get_paste_params(copy_flag)
+                
             self._onDraw(event=None)
         else:
@@ -2632 +2635 @@
             pass  
             
-
-    def select_all_param(self,event): 
+    
+    def get_all_checked_params(self):
+        """
+        Found all parameters current check and add them to list of parameters to 
+        fit
+        """
+        self.param_toFit = []
+        for item in self.parameters:
+            if item[0].GetValue() and item not in self.param_toFit:
+                self.param_toFit.append(item)
+        for item in self.fittable_param:
+            if item[0].GetValue() and item not in self.param_toFit:
+                self.param_toFit.append(item)
+        self.save_current_state_fit()  
+       
+      
+        event = PageInfoEvent(page = self)
+        wx.PostEvent(self.parent, event) 
+        param2fit = []
+        for item in self.param_toFit:
+            if item[0]:
+                param2fit.append(item[1])     
+        self.parent._manager.set_param2fit(self.uid, param2fit)
+                
+    def select_all_param(self, event): 
         """
         set to true or false all checkBox given the main checkbox value cb1
         """            
-        self.param_toFit=[]
+        self.param_toFit = []
         if  self.parameters !=[]:
             if  self.cb1.GetValue():
@@ -2645 +2671 @@
                             self.enable2D:
                         item[0].SetValue(True)
-                        self.param_toFit.append(item )
+                        self.param_toFit.append(item)
                     else:
                         ## for 1D all parameters except orientation
@@ -2656 +2682 @@
                             self.enable2D:
                         item[0].SetValue(True)
-                        self.param_toFit.append(item )
+                        self.param_toFit.append(item)
                         try:
                             if len(self.values[item[1]]) > 0:
@@ -2700 +2726 @@
         in  self.param_toFit=[] list
         """
-        self.param_toFit=[]
+        self.param_toFit = []
         for item in self.parameters:
             #Skip t ifhe angle parameters if 1D data
@@ -2741 +2767 @@
         if len(self.fittable_param) > 0:
             len_orient_para *= 2
-        #Set the value of checkbox that selected every checkbox or not            
+        #Set the value of checkbox that selected every checkbox or not        
         if len(self.parameters)+len(self.fittable_param)-len_orient_para ==\
                 len(self.param_toFit):
@@ -2747 +2773 @@
         else:
             self.cb1.SetValue(False)
+       
+       
+       
         self.save_current_state_fit()
         if event !=None:
@@ -2877 +2906 @@
         self.text2_4.Hide()
         
+        CHECK_STATE = self.cb1.GetValue()
         for item in keys:
             if not item in self.disp_list and not item in \
@@ -2921 +2951 @@
                 else:
                     ## add parameters name with checkbox for selecting to fit
-                    cb = wx.CheckBox(self, -1, item )              
+                    cb = wx.CheckBox(self, -1, item)  
+                    cb.SetValue(CHECK_STATE)            
                     cb.SetToolTipString(" Check mark to fit.")
                     #cb.SetValue(True)
@@ -3018 +3049 @@
                     ## add parameters name with checkbox for selecting to fit
                     cb = wx.CheckBox(self, -1, item )
-                    cb.SetValue(False)
+                    cb.SetValue(CHECK_STATE)
                     cb.SetToolTipString("Check mark to fit")
                     wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
@@ -3115 +3146 @@
                 self.text2_4.Show()
         #Fill the list of fittable parameters
-        self.select_all_param(event=None)
-
+        self.get_all_checked_params()
         self.save_current_state_fit()
         boxsizer1.Add(sizer)