Changeset 0cf97c5 in sasview

Timestamp:

Apr 14, 2011 1:19:16 PM (13 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:

0f8f831

Parents:

f932c02

Message:

fixed npts input w/o data and removed theory_npts_ctr

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (8 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1242 +1242 @@
                                               uid=self.uid, 
                                                  qmax= float(self.qmax_x))
-                    index_data = ((self.qmin_x <= self.data.x)&\
-                                  (self.data.x <= self.qmax_x))
-                    val = str(len(self.data.x[index_data==True]))
-                    self.Npts_fit.SetValue(val)
+                    if self.data != None:
+                        index_data = ((self.qmin_x <= self.data.x)&\
+                                      (self.data.x <= self.qmax_x))
+                        val = str(len(self.data.x[index_data==True]))
+                        self.Npts_fit.SetValue(val)
+                    else:
+                        # No data in the panel
+                        try:
+                            self.npts_x = float(self.Npts_total.GetValue())
+                        except:
+                            flag = False
+                            return flag
                     flag = True
                 if self._is_2D():
@@ -1746 +1754 @@
                 return 
             #Check if # of points for theory model are valid(>0).
-            if self.theory_npts != None:
-                if check_float(self.theory_npts):
-                    temp_npts = float(self.theory_npts.GetValue())
+            if self.Npts_total.IsEnabled() :
+                if check_float(self.Npts_total):
+                    temp_npts = float(self.Npts_total.GetValue())
                     if temp_npts !=  self.num_points:
                         self.num_points = temp_npts

sansview/perspectives/fitting/fitpage.py

@@ -130 +130 @@
         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)
+        sizer_fit = wx.GridSizer(2, 4, 2, 6)
         
         # combobox for smear2d accuracy selection
@@ -197 +197 @@
         self.tcChi.SetToolTipString("Chi2/Npts")
         self.Npts_fit    =  BGTextCtrl(self, -1, "-", size=(75,20), style=0)
-        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.SetToolTipString(" Total Npts : total number of data points")
+        self.Npts_fit.SetToolTipString(\
+                            " Npts : number of points selected for fitting")
+        self.Npts_total  =  self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20), 
+                        style=wx.TE_PROCESS_ENTER, 
+                        text_enter_callback=self._onQrangeEnter)
+        self.Npts_total.SetValue(format_number(self.npts_x))
+        self.Npts_total.SetToolTipString(\
+                                " Total Npts : total number of data points")
+        
         # Update and Draw button
         self.draw_button = wx.Button(self,wx.NewId(),'Compute', size=(88,24))
-        self.draw_button.Bind(wx.EVT_BUTTON, self._onDraw,id= self.draw_button.GetId())
+        self.draw_button.Bind(wx.EVT_BUTTON, \
+                              self._onDraw,id= self.draw_button.GetId())
         self.draw_button.SetToolTipString("Compute and Draw.")
         
         box_description_1= wx.StaticText(self, -1,'    Chi2/Npts')
-        box_description_2= wx.StaticText(self, -1,'Fitted Npts')
-        box_description_3= wx.StaticText(self, -1,'Data Npts')
+        box_description_2= wx.StaticText(self, -1,'Npts(Fit)')
+        box_description_3= wx.StaticText(self, -1,'Total Npts')
+        box_description_3.SetToolTipString( \
+                                " Total Npts : total number of data points")
         #box_description_4= wx.StaticText(self, -1,' ')
         
@@ -318 +327 @@
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
-        
+        """
         self.theory_npts_tcrtl  = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20), 
                         style=wx.TE_PROCESS_ENTER, 
@@ -324 +333 @@
         self.theory_npts_tcrtl.SetValue(format_number(self.npts_x))
         self.theory_npts_tcrtl.SetToolTipString("Number of point to plot.")
+        """
         id = wx.NewId()
         self.reset_qrange =wx.Button(self,id,'Reset',size=(77,20))
@@ -331 +341 @@
      
         sizer_horizontal=wx.BoxSizer(wx.HORIZONTAL)
-        sizer= wx.GridSizer(2, 5,0, 0)
+        sizer= wx.GridSizer(2, 4, 2, 6)
 
         self.btEditMask = wx.Button(self,wx.NewId(),'Editor', size=(88,23))
@@ -341 +351 @@
         sizer.Add(wx.StaticText(self, -1, ' Min[1/A]'))
         sizer.Add(wx.StaticText(self, -1, ' Max[1/A]'))
-        sizer.Add(wx.StaticText(self, -1, ' Theory Npts'))
         sizer.Add(self.EditMask_title)
+        #sizer.Add(wx.StaticText(self, -1, ''))
         sizer.Add(self.reset_qrange)   
         sizer.Add(self.qmin)
         sizer.Add(self.qmax)
-        sizer.Add(self.theory_npts_tcrtl)
+        #sizer.Add(self.theory_npts_tcrtl)
         sizer.Add(self.btEditMask)
         boxsizer_range.Add(sizer_chi2) 
@@ -1224 +1234 @@
                                   (self.data.x <= self.qmax_x))
                     self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
-               
+            else:
+                self.npts_x = self.Npts_total.GetValue()
+                self._save_plotting_range()
+
         else:
            tcrtl.SetBackgroundColour("pink")
@@ -1591 +1604 @@
                 self.btEditMask.Enable()  
                 self.EditMask_title.Enable() 
+        self.Npts_total.Disable()
         self.dataSource.SetValue(data_name)
         self.qmin_x = data_min