[GRASS-SVN] r58001 - grass/trunk/gui/wxpython/wxplot

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-10-15 04:49:27 -0700 (Tue, 15 Oct 2013)
New Revision: 58001

Modified:
   grass/trunk/gui/wxpython/wxplot/base.py
   grass/trunk/gui/wxpython/wxplot/histogram.py
Log:
wxGUI/histogram: use fully-qualified names
                 cosmetics


Modified: grass/trunk/gui/wxpython/wxplot/base.py
===================================================================
--- grass/trunk/gui/wxpython/wxplot/base.py	2013-10-15 09:52:01 UTC (rev 58000)
+++ grass/trunk/gui/wxpython/wxplot/base.py	2013-10-15 11:49:27 UTC (rev 58001)
@@ -193,7 +193,7 @@
             if ret['units'] not in ('(none)', '"none"', '', None):
                 rdict[r]['units'] = ret['units']
             
-            rdict[r]['plegend'] = r.split('@')[0]
+            rdict[r]['plegend'] = r   # use fully-qualified names
             rdict[r]['datalist'] = [] # list of cell value,frequency pairs for plotting histogram
             rdict[r]['pline'] = None
             rdict[r]['datatype'] = ret['datatype']

Modified: grass/trunk/gui/wxpython/wxplot/histogram.py
===================================================================
--- grass/trunk/gui/wxpython/wxplot/histogram.py	2013-10-15 09:52:01 UTC (rev 58000)
+++ grass/trunk/gui/wxpython/wxplot/histogram.py	2013-10-15 11:49:27 UTC (rev 58001)
@@ -7,7 +7,7 @@
  - histogram::HistogramPlotFrame
  - histogram::HistogramPlotToolbar
 
-(C) 2011 by the GRASS Development Team
+(C) 2011-2013 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -118,15 +118,12 @@
         # update title
         #
         if self.maptype == 'group':
-            self.ptitle = _('Histogram of %s') % self.group.split('@')[0] 
+            self.ptitle = _('Histogram of image group <%s>') % self.group
         else: 
-            rastText = ''
-            for r in self.rasterList:
-                rs = r.split('@')[0]
-                rastText += '%s, ' % rs
-            rastText = rastText.rstrip(', ')
-            self.ptitle = _('Histogram of %s') % rastText
-
+            if len(self.rasterList) == 1:
+                self.ptitle = _('Histogram of raster map <%s>') % self.rasterList[0]
+            else:
+                self.ptitle = _('Histogram of selected raster maps')
         
         #
         # set xlabel based on first raster map in list to be histogrammed
@@ -200,6 +197,7 @@
                                self.raster[r]['pcolor'][1],
                                self.raster[r]['pcolor'][2],
                                255)
+                
                 self.raster[r]['pline'] = plot.PolyLine(self.raster[r]['datalist'],
                                                         colour = col,
                                                         width = self.raster[r]['pwidth'],
@@ -261,7 +259,7 @@
                                       self.parent.OnDrag),
                                      ('zoom', BaseIcons['zoomIn'],
                                       self.parent.OnZoom),
-                                     ('unzoom', BaseIcons['zoomBack'],
+                                     ('unzoom', BaseIcons['zoomExtent'],
                                       self.parent.OnRedraw),
                                      (None, ),
                                      ('statistics', PlotIcons['statistics'],