Changeset b742b2b9 in sasview

Timestamp:

Sep 15, 2016 8:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

1729738

Parents:

f0858b6

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/12/16 04:31:53)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Remove menu icons from Image Viewer tool (references #368)

Location:

src/sas/sasgui

Files:

• guiframe/local_perspectives/plotting/SimplePlot.py (modified) (6 diffs)
• perspectives/calculator/image_viewer.py (modified) (3 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py

@@ -188 +188 @@
     """
     def __init__(self, parent, id, title, scale='log_{10}',
-                 size=wx.Size(550, 470)):
+                 size=wx.Size(550, 470), show_menu_icons=True):
         """
         comment
@@ -202 +202 @@
         self._default_save_location = None
         self.scale = scale
+        self._show_menu_icons = show_menu_icons
         self.plotpanel = SimplePlotPanel(self, -1)
         self._build_menubar()
@@ -213 +214 @@
         quit_bmp = wx.ArtProvider.GetBitmap(wx.ART_QUIT, wx.ART_TOOLBAR, tsize)
         print_bmp = wx.ArtProvider.GetBitmap(wx.ART_PRINT, wx.ART_TOOLBAR, tsize)
-        preview_bmp = wx.ArtProvider.GetBitmap(wx.ART_REPORT_VIEW, wx.ART_TOOLBAR, tsize)
         copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
         menu_bar = wx.MenuBar()
@@ -219 +219 @@
         menu = wx.Menu()
         id = wx.NewId()
-        item = wx.MenuItem(menu, id, "&Save Image")
-        item.SetBitmap(save_bmp)
-        menu.AppendItem(item)
+        save_item = wx.MenuItem(menu, id, "&Save Image")
+        menu.AppendItem(save_item)
         wx.EVT_MENU(self, id, self.on_save_file)
 
         id = wx.NewId()
-        item = wx.MenuItem(menu, id, "&Print Image")
-        item.SetBitmap(print_bmp)
-        menu.AppendItem(item)
+        print_item = wx.MenuItem(menu, id, "&Print Image")
+        menu.AppendItem(print_item)
         wx.EVT_MENU(self, id, self.on_print_image)
 
         menu.AppendSeparator()
         id = wx.NewId()
-        item = wx.MenuItem(menu, id, "&Quit")
-        item.SetBitmap(quit_bmp)
-        menu.AppendItem(item)
+        quit_item = wx.MenuItem(menu, id, "&Quit")
+        menu.AppendItem(quit_item)
 
         menu_bar.Append(menu, "&File")
@@ -241 +238 @@
         menu_edit = wx.Menu()
         id = wx.NewId()
-        item = wx.MenuItem(menu_edit, id, "&Copy")
-        item.SetBitmap(copy_bmp)
-        menu_edit.AppendItem(item)
+        copy_item = wx.MenuItem(menu_edit, id, "&Copy")
+        menu_edit.AppendItem(copy_item)
         wx.EVT_MENU(self, id, self.on_copy_image)
+
+        if self._show_menu_icons:
+            save_item.SetBitmap(save_bmp)
+            print_item.SetBitmap(print_bmp)
+            quit_item.SetBitmap(quit_bmp)
+            copy_item.SetBitmap(copy_bmp)
 
         menu_bar.Append(menu_edit, "&Edit")
@@ -324 +326 @@
         except:
             self.Destroy()
-

src/sas/sasgui/perspectives/calculator/image_viewer.py

@@ -73 +73 @@
                     parent.put_icon(plot_frame)
             except:
-                print "parent", parent
                 err_msg += "Failed to load '%s'.\n" % basename
         if err_msg:
@@ -109 +108 @@
         """
         # Initialize the Frame object
-        PlotFrame.__init__(self, parent, id, title, scale, size)
+        PlotFrame.__init__(self, parent, id, title, scale, size,
+            show_menu_icons=False)
         self.parent = parent
         self.data = image
@@ -437 +437 @@
     ImageView(None).load()
     app.MainLoop()
-