Changeset c365765 in sasview

Timestamp:

Jun 23, 2011 7:30:43 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:

92f5521a

Parents:

32dfbf76

Message:

another test

Files:

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

guiframe/local_perspectives/plotting/masking.py

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

sansview/perspectives/fitting/fitpage.py

@@ -1572 +1572 @@
         #wx.PostEvent(self.parent, event)
         
-    def _draw_masked_model(self):
+    def _draw_masked_model(self, event):
         """
         Draw model image w/mask
@@ -1580 +1580 @@
 
         if is_valid_qrange and self.model != None:
-            self.panel.Show(0)
-            self.panel.Destroy() # frame
+            #self.panel.Show(0)
+            #self.panel.Destroy() # frame
+            self.panel.MakeModal(False)
+            event.Skip() 
             # try re draw the model plot if it exists
             self._draw_model()
             self.set_npts2fit()
         elif self.model == None:
-            self.panel.Show(0)
-            self.panel.Destroy() # frame
+            #self.panel.Show(0)
+            #self.panel.Destroy() # frame
+            self.panel.MakeModal(False)
+            event.Skip()
             self.set_npts2fit()
             msg= "No model is found on updating MASK in the model plot... "
             wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
         else:
+            event.Skip()
             msg = ' Please consider your Q range, too.'
             self.panel.ShowMessage(msg)