Changeset ae84427 in sasview for invariantview

Timestamp:

Apr 20, 2013 5: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

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant.py (modified) (2 diffs)
• invariant_panel.py (modified) (3 diffs)

invariantview/src/sans/perspectives/invariant/invariant.py

@@ -17 +17 @@
 import copy
 import logging
-
+from sans.guiframe.gui_manager import MDIFrame
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.events import NewPlotEvent
@@ -83 +83 @@
         ## Save a reference to the parent
         self.parent = parent
-        self.invariant_panel = InvariantPanel(parent=self.parent)
+        self.frame = MDIFrame(self.parent, None, 'None', (100, 200))     
+        self.invariant_panel = InvariantPanel(parent=self.frame)        
+        self.frame.set_panel(self.invariant_panel)
+        self._frame_set_helper()
         self.invariant_panel.set_manager(manager=self)
         self.perspective.append(self.invariant_panel.window_name)  

invariantview/src/sans/perspectives/invariant/invariant_panel.py

@@ -71 +71 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         #Object that receive status event
-        self.parent = parent
+        self.parent = parent.parent
         #plug-in using this panel
         self._manager = manager 
@@ -646 +646 @@
                                                   type="stop"))
             return
-        self.Show(False)
+        #self.Show(False)
         r_msg = ''
         try:
@@ -712 +712 @@
             wx.PostEvent(self.parent,
                 StatusEvent(status='\nFinished invariant computation...'))
-        self.Show(True)
+        #self.Show(True)
         self.Refresh()