Changeset 7aa1685 in sasview for calculatorview/src/sans/perspectives/calculator/resolution_calculator_panel.py

Timestamp:

Apr 24, 2013 12:16:12 PM (11 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:

b07ffca

Parents:

9159cb9

Message:

put most tools in MDI.

File:

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

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

@@ -823 +823 @@
         if self.image != None:
             #_pylab_helpers.Gcf.set_active(self.fm)
+            _pylab_helpers.Gcf.figs = {}
             # Clear the image before redraw
             self.image.clf()
@@ -1389 +1390 @@
             raise 
         
-class ResolutionWindow(wx.Frame):
+class ResolutionWindow(wx.MDIChildFrame):
     """
     Resolution Window
@@ -1396 +1397 @@
                  title = "SANS Resolution Estimator",
                  size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds):
+        if parent != None:
+            # set max size depending up on client size
+            wth, hgt = parent.get_client_size()
+            if hgt < size[1]:
+                size = (size[0], hgt)
+            if wth < size[0]:
+                size = (wth, size[1])
         kwds['title'] = title
         kwds['size'] = size
-        wx.Frame.__init__(self, parent=None, *args, **kwds)
+        wx.MDIChildFrame.__init__(self, parent=parent, *args, **kwds)
         self.parent = parent
         self.manager = manager
         self.panel = ResolutionCalculatorPanel(parent=self)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
-        self.Centre()
+        self.SetPosition((0, 0))
+        #self.Center()
         self.Show(True)