Changeset 49a470d in sasview for sansguiframe/src/sans

Timestamp:

Aug 31, 2011 1:29:29 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:

c17760d

Parents:

fe48fcc

Message:

adde 2D plot label editor

File:

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

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 danse.common.plottools.TextDialog import TextDialog
 from sans.guiframe.events import EVT_NEW_PLOT
 from sans.guiframe.events import EVT_SLICER_PARS
@@ -32 +32 @@
 from danse.common.plottools.toolbar import NavigationToolBar 
 from sans.guiframe.dataFitting import Data1D
+from matplotlib.font_manager import FontProperties
 (InternalEvent, EVT_INTERNAL) = wx.lib.newevent.NewEvent()
 
@@ -116 +117 @@
         ## panel that contains result from slicer motion (ex: Boxsum info)
         self.panel_slicer = None
+        self.title_label = None
+        self.title_font = None
+        self.title_color = 'black'
         ## Graph        
         self.graph = Graph()
@@ -172 +176 @@
         yhi = None
         ## Update self.data2d with the current plot
-        self.data2D = data
+        
         if data.id in self.plots.keys():
             #replace
@@ -191 +195 @@
                 
         #data2D: put 'Pixel (Number)' for axis title and unit in case of having no detector info and none in _units
-        if len(self.data2D.detector) < 1: 
+        if len(data.detector) < 1: 
             if len(data._xunit) < 1 and len(data._yunit) < 1:
                 data._xaxis = '\\rm{x}'
@@ -199 +203 @@
         self.graph.xaxis(data._xaxis, data._xunit)
         self.graph.yaxis(data._yaxis, data._yunit)
+        data.label = self.title_label
+        
         if data.label == None:
             data.label = data.name
-        self.graph.title(data.label)
-        self.graph.render(self)
-        self.draw_plot()
-        #self.subplot.figure.canvas.draw_idle()
+            
+        if not self.title_font:
+            self.graph.title(data.label)
+            self.graph.render(self)
+            self.draw_plot()
+            
+        else:
+            self.graph.render(self)
+            self.draw_plot()
+            self.subplot.set_title(label=data.label,
+                                   fontproperties=self.title_font,
+                                   color=self.title_color)
+            self.subplot.figure.canvas.draw_idle() 
+        
+        self.data2D = data
         ## store default value of zmin and zmax 
         self.default_zmin_ctl = self.zmin_2D
@@ -325 +342 @@
         selected_plot = self.plots[self.graph.selected_plottable]
         label = selected_plot.label
-        dial = LabelDialog(None, -1, 'Change Label', label)
+        dial = TextDialog(None, -1, 'Change Label', label)
         if dial.ShowModal() == wx.ID_OK:
-            newLabel = dial.getText() 
-            selected_plot.label = newLabel
+            try:
+                FONT = FontProperties()
+                newlabel = dial.getText()
+                font = FONT.copy()
+                font.set_size(dial.getSize())
+                font.set_family(dial.getFamily())
+                font.set_style(dial.getStyle())
+                font.set_weight(dial.getWeight())
+                colour = dial.getColor()
+                if len(newlabel) > 0:
+                    selected_plot.label = newlabel
+                    self.title_label = selected_plot.label
+                    self.title_font = font
+                    self.title_color = colour
+                    ## render the graph
+                    self.subplot.set_title(label=self.title_label,
+                                           fontproperties=self.title_font,
+                                           color=self.title_color)
+                    self.subplot.figure.canvas.draw_idle()  
+            except:
+                if self.parent != None:
+                    from sans.guiframe.events import StatusEvent 
+                    msg= "Add Text: Error. Check your property values..."
+                    wx.PostEvent(self.parent, StatusEvent(status = msg ))
+                else:
+                    raise
         dial.Destroy()
-        ## render the graph
-        self.subplot.set_title(selected_plot.label)
-        self.subplot.figure.canvas.draw_idle()
+
         
     def _onEditDetector(self, event):