Changeset 8c21d53 in sasview

Timestamp:

Jun 23, 2011 5:51:54 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:

15bcc1a

Parents:

b9d68ff

Message:

better handling close event

Files:

• guiframe/local_perspectives/plotting/masking.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/masking.py

@@ -93 +93 @@
             self.Layout()
             # bind evt_close to _draw in fitpage
-            #self.Bind(wx.EVT_CLOSE, self._draw_model)
+            self.Bind(wx.EVT_CLOSE, self.OnClose)
             
     def ShowMessage(self, msg=''):
@@ -493 +493 @@
         """
         """
-        event.Skip()
+        self.parent._draw_masked_model()
         self.Destroy()
            

sansview/perspectives/fitting/fitpage.py

@@ -1567 +1567 @@
         import MaskPanel as MaskDialog
         
-        self.panel = MaskDialog(self, data=self.data,id =-1 )
+        self.panel = MaskDialog(base=self, data=self.data,id =-1 )
         #self.panel.Bind(wx.EVT_CLOSE, self._draw_masked_model)
         self.panel.ShowModal()
         #wx.PostEvent(self.parent, event)
         
-    def _draw_masked_model(self,event):
+    def _draw_masked_model(self,event=None):
         """
         Draw model image w/mask
@@ -1582 +1582 @@
             # try re draw the model plot if it exists
             self._draw_model()
-            self.panel.OnClose(event)#Destroy() # frame
+            #self.panel.OnClose(event)#Destroy() # frame
             self.set_npts2fit()
         elif self.model == None:
-            self.panel.OnClose(event)#Destroy()
+            #self.panel.OnClose(event)#Destroy()
             self.set_npts2fit()
             msg= "No model is found on updating MASK in the model plot... "