[GRASS-SVN] r32999 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-22 11:06:17 -0400 (Fri, 22 Aug 2008)
New Revision: 32999

Modified:
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
Log:
wxGUI: loading nviz fixed, suppress gettext warnings
(merge from devbr6, r32998)


Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2008-08-22 15:04:46 UTC (rev 32998)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2008-08-22 15:06:17 UTC (rev 32999)
@@ -55,8 +55,7 @@
         self.setDaemon(True)
         
     def run(self):
-        self.nvizClass = wxnviz.Nviz(self.log, self.progressbar,
-                                     self.window, wxCmdOutput)
+        self.nvizClass = wxnviz.Nviz(self.log)
         
 class GLWindow(MapWindow, glcanvas.GLCanvas):
     """OpenGL canvas for Map Display Window"""

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2008-08-22 15:04:46 UTC (rev 32998)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2008-08-22 15:06:17 UTC (rev 32999)
@@ -2438,7 +2438,8 @@
         else:
             desc = _("Vector map <%s> is 2D") % layer.name
             enable = True
-        desc += " - " + _("%d primitives (%d points)") % (nprimitives, npoints)
+        desc += " - " + _("%(primitives)d primitives (%(points)d points)") % \
+            { 'primitives' : nprimitives, 'points' : npoints }
 
         self.FindWindowById(self.win['vector']['lines']['flat']).Enable(enable)
         for v in ('lines', 'points'):