Changeset b025572 in sasview for calculatorview/src/sans

Timestamp:

Dec 20, 2011 6:57:30 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:

6e01f06

Parents:

7c8d3093

Message:

cleanup the _pylab_helpers.Gcf.figs for resolution panel on close: that caused C++ error on sansview exit

File:

• calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py

@@ -706 +706 @@
         if self.image != None:
             self.image.clf()
-            #self.image.draw()
+            # reset image
+            self.image = None
         # Close panel
-        self.parent.Close()
-        # reset image
-        self.image = None
+        self.parent.OnClose(None)
+        
     
     def on_compute(self, event = None):  
@@ -1403 +1403 @@
         self.Centre()
         self.Show(True)
+        wx.EVT_CLOSE(self, self.OnClose)
+    
+    def OnClose(self, event):  
+        """
+        On close event
+        """
+        _pylab_helpers.Gcf.figs = {}
+        self.Destroy()  
+
         
 if __name__ == "__main__":