Changeset 6d52f21d in sasview

Timestamp:

Aug 19, 2011 3:48:30 PM (13 years ago)

Author:

Jessica Tumarkin <jtumarki@…>

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:

65db69d2

Parents:

39e52376

Message:

Added new toolbar options for adding/removing text, new option for editing legend text

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (7 diffs)

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

@@ -20 +20 @@
 
 from danse.common.plottools.PlotPanel import PlotPanel
+from danse.common.plottools.SizeDialog import SizeDialog
+from danse.common.plottools.LabelDialog import LabelDialog
 #from danse.common.plottools.plottables import Graph
 from sans.guiframe import dataFitting 
@@ -39 +41 @@
 BIN_WIDTH = 1
 
-class SizeDialog(wx.Dialog):
-    def __init__(self, parent, id, title):
-        wx.Dialog.__init__(self, parent, id, title, size=(300, 175))
-
-        #panel = wx.Panel(self, -1)
-        
-        mainbox = wx.BoxSizer(wx.VERTICAL)
-        vbox = wx.BoxSizer(wx.VERTICAL)
-        textbox = wx.BoxSizer(wx.HORIZONTAL)
-        
-        text1 = "Enter in a custom size (float values > 0 accepted)"
-        msg = wx.StaticText(self, -1, text1,(30,15), style=wx.ALIGN_CENTRE)
-        msg.SetLabel(text1)
-        self.myTxtCtrl = wx.TextCtrl(self, -1, '', (100, 50))
-        
-        textbox.Add(self.myTxtCtrl, flag=wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 
-                 border=10, proportion=2)
-        vbox.Add(msg, flag=wx.ALL, border=10, proportion=1)
-        vbox.Add(textbox, flag=wx.EXPAND|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE,
-                 border=10)
-    
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        okButton = wx.Button(self,wx.ID_OK, 'OK', size=(70, 30))
-        closeButton = wx.Button(self,wx.ID_CANCEL, 'Close', size=(70, 30))
-        hbox.Add(okButton, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 
-                 border=10)
-        hbox.Add(closeButton, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 
-                 border=10)
-        
-        mainbox.Add(vbox, flag=wx.ALL, border=10)
-        mainbox.Add(hbox, flag=wx.EXPAND|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 
-                    border=10)
-        self.SetSizer(mainbox)
-    
-    def getText(self):
-        return self.myTxtCtrl.GetValue()
 
 class ModelPanel1D(PlotPanel, PanelBase):
@@ -434 +400 @@
                 
                 self._slicerpop.AppendSeparator()
-    
+                
+                id = wx.NewId()
+                self._slicerpop.Append(id, '&Edit Legend Label', 'Edit Legend Label')
+                wx.EVT_MENU(self, id, self.onEditLabels)
+                
+                self._slicerpop.AppendSeparator()
+                
                 id = wx.NewId()
                 self.hide_menu = self._slicerpop.Append(id, "Hide Error")
@@ -468 +440 @@
         self.parent.onfreeze([plot.id])
     
+    def onEditLabels(self, event):
+        """
+        """
+        menu = event.GetEventObject()
+        id = event.GetId()
+        label =  menu.GetLabel(id)
+        selected_plot = self.plots[self.graph.selected_plottable]
+        
+        dial = LabelDialog(None, -1, 'Change Plot Label')
+        if dial.ShowModal() == wx.ID_OK:
+            newLabel = dial.getText()
+        dial.Destroy()
+
+        selected_plot.name = newLabel
+        self.graph.render(self)
+        self._onEVT_FUNC_PROPERTY()
+        
+        
     def onChangeColor(self, event):
         """
@@ -630 +620 @@
     def _add_more_tool(self):
         """
-        Add refresh button in the tool bar
+        Add refresh, add/delete button in the tool bar
         """
         if self.parent.__class__.__name__ != 'ViewerFrame':
@@ -642 +632 @@
         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()
+        text =  wx.ArtProvider.GetBitmap(wx.ART_CUT, wx.ART_TOOLBAR)
+        self.toolbar.AddSimpleTool(id_text, text,
+                           'Remove Text from Plot', 'Removes text from plot')
+
+        self.toolbar.Realize()
+        wx.EVT_TOOL(self, id_text,  self._on_removetext)
 
     def _on_delete(self, event): 
@@ -653 +662 @@
                                       action="delete"))
             
+