Changeset e030625 in sasview

Timestamp:

Mar 31, 2011 8:01:41 PM (14 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:

b0e8beb

Parents:

3450e7f

Message:

working fitpage inheritance

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -49 +49 @@
         """
         ScrolledPanel.__init__(self, parent, **kwargs)
-        PanelBase.__init__(self)
+        PanelBase.__init__(self, parent)
         self.SetupScrolling()
         #Set window's font size 

sansview/perspectives/fitting/fitpage.py

@@ -23 +23 @@
 from basepage import PageInfoEvent
 from sans.models.qsmearing import smear_selection
+
 
 class FitPage(BasicPage):
@@ -38 +39 @@
         """
         BasicPage.__init__(self, parent, color=color)
-       
+        
         ## draw sizer
         self._fill_datainfo_sizer()
@@ -141 +142 @@
         #Fit button
         self.btFit = wx.Button(self,wx.NewId(),'Fit', size=(88,25))
-        self.default_bt_colour = self.btFit.GetBackgroundColour()
+        self.default_bt_colour =  self.btFit.GetDefaultAttributes()
         self.btFit.Bind(wx.EVT_BUTTON, self._onFit,id= self.btFit.GetId())
         self.btFit.SetToolTipString("Start fitting.")
@@ -969 +970 @@
                              id=self.btFit.GetId())
         elif self.btFit.GetLabel().lower() == "fit":
-            self.btFit.SetBackgroundColour(self.default_bt_colour)
+            self.btFit.SetDefault()
+            #self.btFit.SetBackgroundColour(self.default_bt_colour)
             self.btFit.Bind(event=wx.EVT_BUTTON, handler=self._onFit, 
                             id=self.btFit.GetId())
@@ -1047 +1049 @@
                 self._draw_model()
         if event != None:
-            
             ## post state to fit panel
-            event = PageInfoEvent(page = self)
-            wx.PostEvent(self.parent, event) 
+            new_event = PageInfoEvent(page = self)
+            wx.PostEvent(self.parent, new_event) 
             #update list of plugins if new plugin is available
             if self.plugin_rbutton.GetValue():