Changeset e9875db in sasview for sansview/perspectives

Timestamp:

Apr 14, 2011 2:39:23 PM (14 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:

06aa2eeb

Parents:

0f8f831

Message:

Disabled Npts_total w/ proper bg_color on set_data

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -1754 +1754 @@
                 return 
             #Check if # of points for theory model are valid(>0).
-            if self.Npts_total.IsEnabled() :
+            if self.Npts_total.IsEditable() :
                 if check_float(self.Npts_total):
                     temp_npts = float(self.Npts_total.GetValue())

sansview/perspectives/fitting/fitpage.py

@@ -195 +195 @@
         # StaticText for chi2, N(for fitting), Npts
         self.tcChi    =  BGTextCtrl(self, -1, "-", size=(75,20), style=0)
-        self.tcChi.SetToolTipString("Chi2/Npts")
+        self.tcChi.SetToolTipString("Chi2/Npts(Fit)")
         self.Npts_fit    =  BGTextCtrl(self, -1, "-", size=(75,20), style=0)
         self.Npts_fit.SetToolTipString(\
@@ -1610 +1610 @@
                 self.btEditMask.Enable()  
                 self.EditMask_title.Enable() 
-        self.Npts_total.Disable()
+        self.Npts_total.SetEditable(False)
+        self.Npts_total.SetBackgroundColour(\
+                                    self.GetParent().GetBackgroundColour())
+        
+        self.Npts_total.Bind(wx.EVT_MOUSE_EVENTS, self._npts_click)
+        #self.Npts_total.Disable()
         self.dataSource.SetValue(data_name)
         self.qmin_x = data_min
@@ -1636 +1641 @@
             self.model_view.Disable()
             self._draw_model()
-        
+    
+    def _npts_click(self, event):
+        """
+        Prevent further handling of the mouse event on Npts_total
+        by not calling Skip().
+        """ 
+        pass
+    
     def reset_page(self, state,first=False):
         """