Changeset 2012eae in sasview

Timestamp:

Apr 14, 2010 6:44:26 PM (15 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:

5dc4236

Parents:

f1b0f70

Message:

Fixed MAC bugs: fit button(not accepting click),not displaying chi2 and npts

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (9 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1035 +1035 @@
                     # set mask   
                     is_modified = self._validate_Npts()
+                    #reset npts for fitting textctrl.
+                    self.set_npt2fit()
 
             else:

sansview/perspectives/fitting/fitpage.py

@@ -81 +81 @@
                 if self.model != None:
                     self.smear_description_2d.Show(True)
-                    self.npts = len(self.data.data)
-            else:
-                self.npts = len(self.data.x)
-                
-
+                    
         self.disp_cb_dict = {}
         ## to update the panel according to the fit engine type selected
@@ -193 +189 @@
         smear_message_slit_height_title = "Slit height[1/A]:"
         smear_message_slit_width_title = "Slit width[1/A]:"
-        #Fit button
-        self.btFit = wx.Button(self,wx.NewId(),'Fit', size=(88,25))
-        self.btFit.Bind(wx.EVT_BUTTON, self._onFit,id= self.btFit.GetId())
-        self.btFit.SetToolTipString("Start fitting.")
         
         self._get_smear_info()
@@ -211 +203 @@
         sizer_smearer_box = wx.StaticBoxSizer(smear_set_box, wx.HORIZONTAL)
         sizer_smearer_box.SetMinSize((_DATA_BOX_WIDTH,85))
+        sizer_fit = wx.GridSizer(2, 4,2,6)
+        
+        #Fit button
+        self.btFit = wx.Button(self,wx.NewId(),'Fit', size=(88,25))
+        self.btFit.Bind(wx.EVT_BUTTON, self._onFit,id= self.btFit.GetId())
+        self.btFit.SetToolTipString("Start fitting.")
         
         #textcntrl for new resolution
@@ -262 +260 @@
         self.Npts_fit.SetToolTipString(" Npts : number of points selected for fitting")
         self.Npts_total  =  BGTextCtrl(self, -1, "-", size=(75,20), style=0)
-        self.Npts_total.SetValue(str(self.npts))
         self.Npts_total.SetToolTipString(" Total Npts : total number of data points")
         box_description_1= wx.StaticText(self, -1,'    Chi2/Npts')
@@ -269 +266 @@
         box_description_4= wx.StaticText(self, -1,' ')
         
-        sizer_fit = wx.GridSizer(2, 4,2,6)
+        
         sizer_fit.Add(box_description_1,0,0)
         sizer_fit.Add(box_description_2,0,0)
@@ -840 +837 @@
 
         if check_float(tcrtl):
-            flag = self._onparamEnter_helper()  
+            flag = self._onparamEnter_helper() 
+            self.set_npts2fit() 
             if self.fitrange:             
                 temp_smearer = None
@@ -1268 +1266 @@
             return the current chi2
         """
-        return self.tcChi.GetLabel()
+        return self.tcChi.GetValue()
         
     def get_param_list(self):
@@ -1308 +1306 @@
                     chisqr =chisqr/npt_fit    
             chi2 = format_number(chisqr)    
-            self.tcChi.SetLabel(chi2)    
+            self.tcChi.SetValue(chi2)    
             self.tcChi.Refresh()    
         else:
-            self.tcChi.SetLabel("-")
+            self.tcChi.SetValue("-")
         
         #Hide error title
@@ -1770 +1768 @@
                 output= "-"
 
-            self.tcChi.SetLabel(str(format_number(output)))
+            self.tcChi.SetValue(str(format_number(output)))
 
             self.state.tcChi =self.tcChi