Changeset 3cd5806 in sasview

Timestamp:

Feb 4, 2011 3:41:13 PM (13 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:

73b3ae2

Parents:

3f0351c6

Message:

bindind save button with guiframe toolbar

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (14 diffs)
• fitpanel.py (modified) (6 diffs)
• fitting.py (modified) (1 diff)
• hint_fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -11 +11 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 from sans.guiframe.utils import format_number,check_float
+from sans.guiframe.events import PanelOnFocusEvent
 from sans.guiframe.events import StatusEvent
 import pagestate
@@ -53 +54 @@
         self.parent = parent
         ## manager is the fitting plugin
-        self.manager = None
         ## owner of the page (fitting plugin)
         self.event_owner = None
@@ -172 +172 @@
         self.set_layout()
         
+    def on_set_focus(self, event):
+        """
+        """
+        print "fitting panel", self.window_name
+        if self._manager is not None:
+            wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
+        
     class ModelTextCtrl(wx.TextCtrl):
         """
@@ -267 +274 @@
         self.window_caption = page_info.window_caption
         ## manager is the fitting plugin
-        self.manager= page_info.manager
+        self._manager= page_info.manager
         ## owner of the page (fitting plugin)
         self.event_owner= page_info.event_owner
@@ -373 +380 @@
         
         """
-        self.manager = manager  
+        print "manager", manager
+        self._manager = manager  
         self.state.manager = manager
         
@@ -601 +609 @@
             self.reset_page(previous_state)      
          
-    def on_save_state(self, event):   
+    def on_save(self, event):   
         """
         Save the current state into file
@@ -617 +625 @@
             return None
         #the manager write the state into file
-        self.manager.save_fit_state(filepath=path, fitstate=new_state)
+        self._manager.save_fit_state(filepath=path, fitstate=new_state)
         return new_state  
     
@@ -668 +676 @@
         if self.engine_type == None: 
             self.engine_type = "scipy"
-        if self.manager !=None:
-            self.manager._on_change_engine(engine=self.engine_type)
+        if self._manager !=None:
+            self._manager._on_change_engine(engine=self.engine_type)
         
             self.state.engine_type = self.engine_type
@@ -973 +981 @@
         self._on_select_model(event=None)
        
-        if self.manager !=None:
-            self.manager._on_change_engine(engine=self.engine_type)
+        if self._manager !=None:
+            self._manager._on_change_engine(engine=self.engine_type)
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
@@ -1330 +1338 @@
         is_modified = False
 
-        wx.PostEvent(self.manager.parent, StatusEvent(status=" \
+        wx.PostEvent(self._manager.parent, StatusEvent(status=" \
         updating ... ",type="update"))
 
@@ -1363 +1371 @@
                         flag = self.update_pinhole_smear()
                     else:
-                        self.manager.set_smearer_nodraw(smearer=temp_smearer,
+                        self._manager.set_smearer_nodraw(smearer=temp_smearer,
                                                      qmin=float(self.qmin_x),
                                                       qmax=float(self.qmax_x))
                 elif not self._is_2D():
-                    self.manager.set_smearer(smearer=temp_smearer,
+                    self._manager.set_smearer(smearer=temp_smearer,
                                               qmin=float(self.qmin_x),
                                                  qmax= float(self.qmax_x))
@@ -1632 +1640 @@
                     temp_smear= self.current_smearer
             
-            self.manager.draw_model(self.model, 
+            self._manager.draw_model(self.model, 
                                     data=self.data,
                                     smearer= temp_smear,
@@ -2173 +2181 @@
             msg="Please select a Model first..."
             wx.MessageBox(msg, 'Info')
-            wx.PostEvent(self.manager.parent, StatusEvent(status=\
+            wx.PostEvent(self._manager.parent, StatusEvent(status=\
                             "Polydispersion: %s"%msg))
             return
@@ -2475 +2483 @@
         self.btSave_title = wx.StaticText(self, -1, 'Save the current Model')
         self.btSave = wx.Button(self,wx.NewId(),'Save')
-        self.btSave.Bind(wx.EVT_BUTTON, self.on_save_state,id= self.btSave.GetId())
+        self.btSave.Bind(wx.EVT_BUTTON, self.on_save,id= self.btSave.GetId())
         self.btSave.SetToolTipString("Save the current Model")
+        self._set_save_flag(True)
         
         sizer_save.Add(self.btSave_title)  

sansview/perspectives/fitting/fitpanel.py

@@ -6 +6 @@
 
 from sans.guiframe.panel_base import PanelBase
+from sans.guiframe.events import PanelOnFocusEvent
 import basepage
 
@@ -167 +168 @@
                     wx.aui.AUI_NB_DEFAULT_STYLE|
                     wx.CLIP_CHILDREN)
-        PanelBase.__init__(self)
+        PanelBase.__init__(self, parent)
     
         self._manager = None
@@ -188 +189 @@
         self.Bind(basepage.EVT_PREVIOUS_STATE, self._onUndo)
         self.Bind(basepage.EVT_NEXT_STATE, self._onRedo)
-        
+       
         #add default pages
         self.add_default_pages()
-        
+     
         # increment number for model name
         self.count = 0
@@ -198 +199 @@
         self.Center()
         
+    def on_set_focus(self, event):
+        """
+        """
+        pos = self.GetSelection()
+        selected_page = self.GetPage(pos)
+        print "panel on fogus", selected_page.window_name
+        wx.PostEvent(self.parent, PanelOnFocusEvent(panel=selected_page))
+        
     def get_data(self):
         """
@@ -222 +231 @@
         self.hint_page = HintFitPage(self) 
         self.AddPage(page=self.hint_page, caption="Hint")
-         
+        self.hint_page.set_manager(self._manager)
         #Add the first fit page
         self.add_empty_page()
@@ -316 +325 @@
         """
         self._manager = manager
+        for pos in range(self.GetPageCount()):
+            page = self.GetPage(pos)
+            if page is not None:
+                page.set_manager(self._manager)
 
         

sansview/perspectives/fitting/fitting.py

@@ -256 +256 @@
         loader.associate_file_reader(".fitv", self.state_reader)
         loader.associate_file_reader(".svs", self.state_reader)
-        from sans.perspectives.calculator.sld_panel import SldPanel
         #Send the fitting panel to guiframe
         self.mypanels.append(self.fit_panel) 
-        self.mypanels.append(SldPanel(parent=self.parent, base=self.parent))
+      
         return self.mypanels
     

sansview/perspectives/fitting/hint_fitpage.py

@@ -1 +1 @@
 import wx
+from sans.guiframe.panel_base import PanelBase
 
-
-class HintFitPage(wx.ScrolledWindow):
+class HintFitPage(wx.ScrolledWindow, PanelBase):
     """
         This class provide general structure of  fitpanel page
@@ -13 +13 @@
     def __init__(self, parent):
         wx.ScrolledWindow.__init__(self, parent,
-                 style= wx.FULL_REPAINT_ON_RESIZE )
-        
+                 style= wx.FULL_REPAINT_ON_RESIZE)
+        PanelBase.__init__(self, parent)
         msg = "right click on the data when it is highlighted "
         msg += "the select option to fit for futher options"