Changeset ae84427 in sasview for calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.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/gen_scatter_panel.py (modified) (8 diffs)

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

@@ -19 +19 @@
 matplotlib.use('WXAgg')
 
+#from sans.guiframe.gui_manager import MDIFrame
 from data_util.calcthread import CalcThread
 from sans.guiframe.local_perspectives.plotting.SimplePlot import PlotFrame
@@ -1113 +1114 @@
         num_graph = str(self.graph_num)
         wx.CallAfter(self.parent.draw_graph, new_plot, 
-                     title="Graph %s: "% num_graph + new_plot.id )
+                     title="GEN Graph %s: "% num_graph + new_plot.id )
         self.graph_num += 1
                 
@@ -1172 +1173 @@
         num_graph = str(self.graph_num)
         wx.CallAfter(self.parent.draw_graph, new_plot, 
-                     title="Graph %s: "% num_graph + new_plot.id )
+                     title="GEN Graph %s: "% num_graph + new_plot.id )
         self.graph_num += 1
-        
+         
     def set_scale2d(self, scale):
         """
@@ -1794 +1795 @@
     GEN SAS main window
     """
-    def __init__(self, parent=None, title="Generic Scattering Calculator",
+    def __init__(self, parent=None, manager= None, title="Generic Scattering Calculator",
                 size=(PANEL_WIDTH * 1.3, PANEL_HEIGHT * 1.65), *args, **kwds):
         """
@@ -1804 +1805 @@
         wx.Frame.__init__(self, parent, *args, **kwds)
         self.parent = parent
+        self.base = manager
         self.omfpanel = OmfPanel(parent=self)
         self.panel = SasGenPanel(parent=self)
@@ -1815 +1817 @@
         self._plot_title = ''
         self.scale2d = 'log_{10}'
+        self.Bind(wx.EVT_CLOSE, self.on_close)
         
         self._build_toolbar()
-        self._build_menubar()
         
         self.build_panels()
@@ -2008 +2010 @@
         frame.Show(True)
         frame.SetFocus()
-    
+
+    def set_schedule_full_draw(self, panel=None, func='del'):  
+        """
+        Send full draw to gui frame
+        """
+        self.parent.set_schedule_full_draw(panel, func)
+        
     def get_npix(self):
         """
@@ -2082 +2090 @@
         Close
         """
+        if self.base != None:
+            self.base.gen_frame = None
         self.Destroy()