Changeset fe48fcc in sasview for sansguiframe/src/sans/guiframe

Timestamp:

Aug 31, 2011 10:56:12 AM (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:

49a470d

Parents:

e4a703a

Message:

added 2D plot label modif

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (1 diff)
• Plotter2D.py (modified) (5 diffs)

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

@@ -247 +247 @@
             ## Set the view scale for all plots
             self._onEVT_FUNC_PROPERTY()
+            self.toolbar.update()
         
           

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

@@ -20 +20 @@
 from danse.common.plottools.PlotPanel import PlotPanel
 from danse.common.plottools.plottables import Graph
+from danse.common.plottools.LabelDialog import LabelDialog
 from sans.guiframe.events import EVT_NEW_PLOT
 from sans.guiframe.events import EVT_SLICER_PARS
@@ -198 +199 @@
         self.graph.xaxis(data._xaxis, data._xunit)
         self.graph.yaxis(data._yaxis, data._yunit)
-        self.graph.title(self.data2D.name)
+        if data.label == None:
+            data.label = data.name
+        self.graph.title(data.label)
         self.graph.render(self)
         self.draw_plot()
@@ -210 +213 @@
                         ylo > data.ymin and yhi < data.ymax):
                 self.subplot.set_xlim((xlo, xhi))     
-                self.subplot.set_ylim((ylo, yhi))  
+                self.subplot.set_ylim((ylo, yhi)) 
+            else: 
+                self.toolbar.update()
 
     def onContextMenu(self, event):
@@ -298 +303 @@
                     wx.EVT_MENU(self, id, self._onEditSlicer) 
             slicerpop.AppendSeparator() 
+            
+        id = wx.NewId()
+        slicerpop.Append(id, '&Edit Label', 'Edit Label')
+        wx.EVT_MENU(self, id, self.onEditLabels)
+        slicerpop.AppendSeparator()
+        
         id = wx.NewId()
         slicerpop.Append(id, '&2D Color Map')
@@ -307 +318 @@
         pos = self.ScreenToClient(pos)
         self.PopupMenu(slicerpop, pos)
-   
+            
+    def onEditLabels(self, event):
+        """
+        Edit legend label
+        """
+        selected_plot = self.plots[self.graph.selected_plottable]
+        label = selected_plot.label
+        dial = LabelDialog(None, -1, 'Change Label', label)
+        if dial.ShowModal() == wx.ID_OK:
+            newLabel = dial.getText() 
+            selected_plot.label = newLabel
+        dial.Destroy()
+        ## render the graph
+        self.subplot.set_title(selected_plot.label)
+        self.subplot.figure.canvas.draw_idle()
+        
     def _onEditDetector(self, event):
         """