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

Timestamp:

Apr 24, 2013 10:16:12 AM (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/gen_scatter_panel.py (modified) (5 diffs)

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

@@ -1791 +1791 @@
         return flag
 
-class SasGenWindow(wx.Frame):
+class SasGenWindow(wx.MDIChildFrame):
     """
     GEN SAS main window
@@ -1800 +1800 @@
         Init
         """
+        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['size'] = size
         kwds['title'] = title
-        
-        wx.Frame.__init__(self, parent, *args, **kwds)
+        wx.MDIChildFrame.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.base = manager
@@ -1822 +1828 @@
         
         self.build_panels()
-        self.Centre()
+        #self.Centre()
+        self.SetPosition((0, 0))
         self.Show(True)
     
@@ -2004 +2011 @@
         """
         """
+        from sans.guiframe.events import NewPlotEvent 
+        wx.PostEvent(self.parent, NewPlotEvent(plot=plot, title=title))
+        """
         frame = PlotFrame(self, -1, 'testView', self.scale2d)
         add_icon(self.parent, frame)
@@ -2010 +2020 @@
         frame.Show(True)
         frame.SetFocus()
-
+        """
     def set_schedule_full_draw(self, panel=None, func='del'):  
         """