Changeset 25952cd in sasview

Timestamp:

Jun 23, 2011 6:49:49 PM (13 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:

3e0e4b6

Parents:

8ce1ad1

Message:

give mask panel id from wx

Files:

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

guiframe/local_perspectives/plotting/masking.py

@@ -493 +493 @@
         """
         """
-        self.Destroy()
         self.parent._draw_masked_model()
-           
+        
 class Maskplotpanel(PlotPanel):
     """

sansview/perspectives/fitting/fitpage.py

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