Changeset 9714ff5 in sasview for calculatorview/src/sans/perspectives/calculator

Timestamp:

Dec 18, 2012 6:01:40 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:

aaaf9b4

Parents:

87f8971

Message:

added toolbar

File:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (7 diffs)

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

@@ -733 +733 @@
             self._status_info(msg, status_type)
             
-            cal_out = CalcGen(input=[self.data.qx_data, self.data.qy_data,i_out],
-                         completefn=self.complete, updatefn=self._update)
+            cal_out = CalcGen(input=[self.data.qx_data, 
+                                     self.data.qy_data,i_out], 
+                              completefn=self.complete, 
+                              updatefn=self._update)
             cal_out.queue()
             
@@ -1510 +1512 @@
     """
     def __init__(self, parent=None, title="Generic Scattering Calculator",
-                size=(PANEL_WIDTH * 1.3, PANEL_HEIGHT * 1.5), *args, **kwds):
+                size=(PANEL_WIDTH * 1.3, PANEL_HEIGHT * 1.55), *args, **kwds):
         """
         Init
@@ -1525 +1527 @@
         self.sld_data = None
         self._default_save_location = os.getcwd() 
+        
         self._mgr = aui.AuiManager(self)
         self._mgr.SetDockSizeConstraint(0.5, 0.5)
@@ -1530 +1533 @@
         self.scale2d = 'log_{10}'
         
-        #self.plot_frame = PlotFrame(self, -1, 'testView')
+        self._build_toolbar()
         self._build_menubar()
         
@@ -1537 +1540 @@
         self.Show(True)
     
+    def _build_toolbar(self):
+        """
+        Build toolbar
+        """
+        tsize = (20, 20)
+        tb = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT)
+        open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, 
+                                            tsize)
+        save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR,
+                                            tsize)
+        close_bmp= wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
+                                            tsize)
+        help_bmp= wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
+                                           (17, 20))
+        
+        id = wx.NewId()
+        tb.AddLabelTool(id, "Open", open_bmp, shortHelp="Open", 
+                        longHelp="Open sld/omf file")
+        self.Bind(wx.EVT_TOOL, self.on_open_file, id=id)
+
+        id = wx.NewId()
+        tb.AddSimpleTool(id, save_bmp, "Save", "Save as sld file")
+        self.Bind(wx.EVT_TOOL, self.on_save_file, id=id)
+        
+        tb.AddSeparator()
+        id = wx.NewId()
+        tb.AddSimpleTool(id, close_bmp, "Quit", "Quit")
+        self.Bind(wx.EVT_TOOL, self.on_close, id=id)
+        
+        tb.AddSeparator()
+        id = wx.NewId()
+        tb.AddSimpleTool(id, help_bmp, "Help", "Help")
+        self.Bind(wx.EVT_TOOL, self.on_help, id=id)
+
+        tb.Realize()
+        
     def _build_menubar(self):
         """
-        Menu bar
-        """
+        Build menubar
+        """
+        tsize = (13, 13)
+        open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, 
+                                            tsize)
+        save_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR,
+                                            tsize)
+        quit_bmp= wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, 
+                                           tsize)
+        help_bmp= wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, 
+                                           (13, 15))
+        
         menu_bar = wx.MenuBar()
         
         menu = wx.Menu()
         id = wx.NewId()
-        menu.Append(id, "&Open sld/omf file")
+        item = wx.MenuItem(menu, id, "&Open sld/omf file")
+        item.SetBitmap(open_bmp)
+        menu.AppendItem(item)
         wx.EVT_MENU(self, id, self.on_open_file)
+        
         id = wx.NewId()
-        menu.Append(id, "&Save as sld file")
+        item = wx.MenuItem(menu, id, "&Save as sld file")
+        item.SetBitmap(save_bmp)
+        menu.AppendItem(item)
         wx.EVT_MENU(self, id, self.on_save_file)
+        
+        menu.AppendSeparator()
         id = wx.NewId()
-        menu.Append(id, "&Quit")
-        menu_bar.Append(menu, "File")
+        item = wx.MenuItem(menu, id, "&Quit")
+        item.SetBitmap(quit_bmp)
+        menu.AppendItem(item)
+
+        menu_bar.Append(menu, "&File")
         wx.EVT_MENU(self, id, self.on_close)
         
         menu_help = wx.Menu()
         id = wx.NewId()
-        menu_help.Append(id, "&Theory and GUI")
+        item = wx.MenuItem(menu_help, id, "&Theory and GUI")
+        item.SetBitmap(help_bmp)
+        menu_help.AppendItem(item)
         wx.EVT_MENU(self, id, self.on_help)
+        
         menu_bar.Append(menu_help, "&Help")
         
@@ -1571 +1633 @@
         self._mgr.AddPane(self.panel, aui.AuiPaneInfo().
                               Name(self.panel.window_name).
-                              #Caption(self.panel.window_caption).
                               CenterPane().
                               # This is where we set the size of
@@ -1581 +1642 @@
                               Name(self.omfpanel.window_name).
                               Caption(self.omfpanel.window_caption).
-                              #MinimizeButton(True).
                               CloseButton(False).
                               Right().