Changeset dc51a7f in sasview

Timestamp:

Sep 2, 2011 2:54:20 PM (13 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:

37c36d9

Parents:

49ad00b

Message:

added an access to the plotpanel contextmenu from toobar

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

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

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -460 +460 @@
         self._slicerpop.Append(id, '&Reset Graph')
         wx.EVT_MENU(self, id, self.onResetGraph)  
-        pos = event.GetPosition()
-        pos = self.ScreenToClient(pos)
+        try:
+            pos_evt = event.GetPosition()
+            pos = self.ScreenToClient(pos_evt)
+        except:
+            pos_x, pos_y = self.toolbar.GetPositionTuple()
+            pos = (pos_x, pos_y + 5)
+
         self.PopupMenu(self._slicerpop, pos)
-     
+        
     def onFreeze(self, event):
         """
@@ -658 +663 @@
         self.toolbar.Realize()
         wx.EVT_TOOL(self, id_delete,  self._on_delete)
-        """
-        #New toolbar option - adding text to the plot
-        self.toolbar.AddSeparator()
-        id_text = wx.NewId()
-        text =  wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR)
-        self.toolbar.AddSimpleTool(id_text, text,
-                           'Add Text to Plot', 'Adds text to plot')
-
-        self.toolbar.Realize()
-        wx.EVT_TOOL(self, id_text,  self._on_addtext)
-        
+        
+        """
         self.toolbar.AddSeparator()
         id_text = wx.NewId()

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -62 +62 @@
         add item to the toolbar
         """
+        #add button
+        id_context = wx.NewId()
+        context_tip = 'Graph Menu'
+        context =  wx.ArtProvider.GetBitmap(wx.ART_LIST_VIEW, wx.ART_TOOLBAR)
+        self.InsertSimpleTool(0, id_context, context, 
+                                   context_tip, context_tip)
+        wx.EVT_TOOL(self, id_context,  self.parent.onToolContextMenu)
+        self.InsertSeparator(1)
         #add print button
         id_print = wx.NewId()
@@ -355 +363 @@
             
         id = wx.NewId()
-        slicerpop.Append(id, '&Edit Label', 'Edit Label')
+        slicerpop.Append(id, '&Edit Graph Label', 'Edit Graph Label')
         wx.EVT_MENU(self, id, self.onEditLabels)
         slicerpop.AppendSeparator()
@@ -375 +383 @@
         slicerpop.Append(id, '&Toggle Linear/Log Scale')
         wx.EVT_MENU(self, id, self._onToggleScale) 
-        pos = event.GetPosition()
-        pos = self.ScreenToClient(pos)
+        try:
+            pos_evt = event.GetPosition()
+            pos = self.ScreenToClient(pos_evt)
+        except:
+            pos_x, pos_y = self.toolbar.GetPositionTuple()
+            pos = (pos_x, pos_y + 5)
         self.PopupMenu(slicerpop, pos)