Changeset 29bf83b in sasview for sansview/perspectives/fitting

Timestamp:

Jun 22, 2011 4:42:02 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:

8c6a0b9

Parents:

f4bbb07

Message:

print if bound

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -64 +64 @@
         """
         self.btFit.SetLabel("Fit")
-        print "fit button"
         self.bind_fit_button()
         
@@ -149 +148 @@
         self.btFit = wx.Button(self,wx.NewId(),'Fit', size=(88,25))
         self.default_bt_colour =  self.btFit.GetDefaultAttributes()
-        self.Bind(wx.EVT_BUTTON, self._onFit,id= self.btFit.GetId())
+        self.btFit.Bind(wx.EVT_BUTTON, self._onFit,id= self.btFit.GetId())
         self.btFit.SetToolTipString("Start fitting.")
         
@@ -1016 +1015 @@
         bind the fit button to either fit handler or stop fit handler
         """
-        self.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
+        print "bind"
+        
+        self.btFit.Unbind(event=wx.EVT_BUTTON, id= self.btFit.GetId())
+        print "unbind"
         if self.btFit.GetLabel().lower() == "stop":
             self.fit_started = True
-            if not self.is_mac:
-                self.btFit.SetForegroundColour('red')
-            self.Bind(event=wx.EVT_BUTTON, handler=self._StopFit,
+            self.btFit.SetForegroundColour('red')
+            self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._StopFit,
                              id=self.btFit.GetId())
+            print "bind00"
         elif self.btFit.GetLabel().lower() == "fit":
             self.fit_started = False
             self.btFit.SetDefault()
-            if not self.is_mac:
-                self.btFit.SetForegroundColour('black')
+            self.btFit.SetForegroundColour('black')
             #self.btFit.SetBackgroundColour(self.default_bt_colour)
-            self.Bind(event=wx.EVT_BUTTON, handler=self._onFit, 
+            self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit, 
                             id=self.btFit.GetId())
         else: