Changeset a47d0c8 in sasview for src/sas/sasgui/guiframe

Timestamp:

Aug 12, 2016 6:40:40 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1925a8e

Parents:

2c627ad (diff), 2cff9db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into corfunc

Location:

src/sas/sasgui/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (3 diffs)
• Plotter2D.py (modified) (2 diffs)
• SimplePlot.py (modified) (6 diffs)

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

@@ -580 +580 @@
         self._slicerpop.set_graph(self.graph)
         ids = iter(self._menu_ids)
-        if not self.graph.selected_plottable in self.plots:
-            # Various plot options
-            wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG')
-            wx.EVT_MENU(self, wx_id, self.onSaveImage)
-            wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
-            wx.EVT_MENU(self, wx_id, self.onPrint)
-
-            wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Copy to Clipboard',
-                                   'Copy to the clipboard')
-            wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)
-
-            self._slicerpop.AppendSeparator()
+
+        # Various plot options
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG')
+        wx.EVT_MENU(self, wx_id, self.onSaveImage)
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
+        wx.EVT_MENU(self, wx_id, self.onPrint)
+
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Copy to Clipboard',
+                               'Copy to the clipboard')
+        wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)
+
+        self._slicerpop.AppendSeparator()
 
         for plot in self.plots.values():
@@ -617 +617 @@
             item_list = self.parent.get_current_context_menu(self)
             if (not item_list == None) and (not len(item_list) == 0):
-                # Note: reusing menu ids in submenu.  This code works because
-                # IdItems is set up as a lazy iterator returning each id in
-                # sequence, creating new ids as needed so it never runs out.
-                # zip() is set up to stop when any iterator is empty, so it
-                # only asks for the number of ids in item_list.
-                for item, wx_id in zip(item_list, self._menu_ids):
+                for item, wx_id in zip(item_list, [ids.next() for i in range(len(item_list))]):
 
                     try:
@@ -671 +666 @@
             # Option to hide
             # TODO: implement functionality to hide a plottable (legend click)
-        if not self.graph.selected_plottable in self.plots:
+
+        self._slicerpop.AppendSeparator()
+        loc_menu = wx.Menu()
+        for label in self._loc_labels:
+            wx_id = ids.next()
+            loc_menu.Append(wx_id, str(label), str(label))
+            wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc)
+
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Modify Graph Appearance',
+                               'Modify graph appearance')
+        wx.EVT_MENU(self, wx_id, self.modifyGraphAppearance)
+        self._slicerpop.AppendSeparator()
+
+
+        if self.position != None:
+            wx_id = ids.next()
+            self._slicerpop.Append(wx_id, '&Add Text')
+            wx.EVT_MENU(self, wx_id, self._on_addtext)
+            wx_id = ids.next()
+            self._slicerpop.Append(wx_id, '&Remove Text')
+            wx.EVT_MENU(self, wx_id, self._on_removetext)
             self._slicerpop.AppendSeparator()
-            loc_menu = wx.Menu()
-            for label in self._loc_labels:
-                wx_id = ids.next()
-                loc_menu.Append(wx_id, str(label), str(label))
-                wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc)
-
-            wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Modify Graph Appearance',
-                                   'Modify graph appearance')
-            wx.EVT_MENU(self, wx_id, self.modifyGraphAppearance)
-            self._slicerpop.AppendSeparator()
-
-
-            if self.position != None:
-                wx_id = ids.next()
-                self._slicerpop.Append(wx_id, '&Add Text')
-                wx.EVT_MENU(self, wx_id, self._on_addtext)
-                wx_id = ids.next()
-                self._slicerpop.Append(wx_id, '&Remove Text')
-                wx.EVT_MENU(self, wx_id, self._on_removetext)
-                self._slicerpop.AppendSeparator()
-            wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Change Scale')
-            wx.EVT_MENU(self, wx_id, self._onProperties)
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Change Scale')
+        wx.EVT_MENU(self, wx_id, self._onProperties)
+        self._slicerpop.AppendSeparator()
+        wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Reset Graph Range')
+        wx.EVT_MENU(self, wx_id, self.onResetGraph)
+
+        if self.parent.ClassName.count('wxDialog') == 0:
             self._slicerpop.AppendSeparator()
             wx_id = ids.next()
-            self._slicerpop.Append(wx_id, '&Reset Graph Range')
-            wx.EVT_MENU(self, wx_id, self.onResetGraph)
-
-            if self.parent.ClassName.count('wxDialog') == 0:
-                self._slicerpop.AppendSeparator()
-                wx_id = ids.next()
-                self._slicerpop.Append(wx_id, '&Window Title')
-                wx.EVT_MENU(self, wx_id, self.onChangeCaption)
+            self._slicerpop.Append(wx_id, '&Window Title')
+            wx.EVT_MENU(self, wx_id, self.onChangeCaption)
         try:
             pos_evt = event.GetPosition()

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

@@ -293 +293 @@
 
         wx_id = ids.next()
-        slicerpop.Append(wx_id, '&Save Image')
+        slicerpop.Append(wx_id, '&Save Image', 'Save image as png')
         wx.EVT_MENU(self, wx_id, self.onSaveImage)
 
@@ -320 +320 @@
             if (not item_list == None) and (not len(item_list) == 0) and\
                 self.data2D.name.split(" ")[0] != 'Residuals':
-                # The line above; Not for trunk
-                # Note: reusing menu ids for the sub-menus.  See Plotter1D.
-                for item, wx_id in zip(item_list, self._menu_ids):
+                for item, wx_id in zip(item_list, [ids.next() for i in range(len(item_list))]):
                     try:
                         slicerpop.Append(wx_id, item[0], item[1])

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()
-