Changeset ae84427 in sasview for calculatorview/src/sans/perspectives/calculator/data_operator.py

Timestamp:

Apr 20, 2013 7:14:41 PM (12 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:

ba152f1

Parents:

d4895dd

Message:

mdi frames for main applications

File:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (3 diffs)

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

@@ -615 +615 @@
         event.Skip()
     
+    def disconnect_panels(self):
+        """
+        """
+        self.out_pic.connect.disconnect()
+        self.equal_pic.connect.disconnect()
+        self.data1_pic.connect.disconnect()
+        self.operator_pic.connect.disconnect()
+        self.data2_pic.connect.disconnect()
+    
     def on_close(self, event):
         """
@@ -926 +935 @@
         
 class DataOperatorWindow(wx.Frame):
-    def __init__(self, parent, *args, **kwds):
+    def __init__(self, parent, manager, *args, **kwds):
         kwds["size"] = (PANEL_WIDTH, PANEL_HEIGTH)
         wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
+        self.manager = manager
         self.panel = DataOperPanel(parent=self)
         wx.EVT_CLOSE(self, self.OnClose)
@@ -939 +949 @@
         On close event
         """
-        self.Show(False)
+        if self.manager != None:
+            self.manager.data_operator_frame = None
+        self.panel.disconnect_panels()
+        self.Destroy()