[GRASS-SVN] r32474 - in grass/trunk/gui: icons/silk wxpython wxpython/gui_modules wxpython/icons wxpython/icons/silk

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-02 19:12:45 -0400 (Sat, 02 Aug 2008)
New Revision: 32474

Added:
   grass/trunk/gui/icons/silk/bricks.png
Modified:
   grass/trunk/gui/wxpython/gui_modules/goutput.py
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/icons/silk/__init__.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxGUI: menu item for 3d raster element added (including silk icon)

Added: grass/trunk/gui/icons/silk/bricks.png
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/icons/silk/bricks.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: grass/trunk/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/goutput.py	2008-08-02 22:44:03 UTC (rev 32473)
+++ grass/trunk/gui/wxpython/gui_modules/goutput.py	2008-08-02 23:12:45 UTC (rev 32474)
@@ -193,10 +193,9 @@
         """
         if Debug.get_level() == 0:
             # don't redirect when debugging is enabled
-            #sys.stdout = self.cmd_stdout
-            #sys.stderr = self.cmd_stderr
-            pass
-
+            sys.stdout = self.cmd_stdout
+            sys.stderr = self.cmd_stderr
+            
             return True
 
         return False

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2008-08-02 22:44:03 UTC (rev 32473)
+++ grass/trunk/gui/wxpython/icons/icon.py	2008-08-02 23:12:45 UTC (rev 32474)
@@ -87,6 +87,7 @@
     "workspaceOpen" : 'file-open.gif',
     "workspaceSave" : 'file-save.gif',
     "addrast"    : 'element-cell.gif',
+    "addrast3d"    : 'element-grid3.gif',
     "addvect"    : 'element-vector.gif',
     "addcmd"     : 'gui-cmd.gif',
     "addgrp"     : 'gui-group.gif',
@@ -314,6 +315,8 @@
                              label=_("Add labels")),
     "addtext"    : MetaIcon (img=icons_img["addtext"],
                              label=_("Add text layer")),
+    "addrast3d"  : MetaIcon (img=icons_img["addrast3d"],
+                             label=_("Add 3D raster map")),
     # digit
     "digAddPoint": MetaIcon (img=icons_img["digAddPoint"],
                              label=_("Digitize new point"),

Modified: grass/trunk/gui/wxpython/icons/silk/__init__.py
===================================================================
--- grass/trunk/gui/wxpython/icons/silk/__init__.py	2008-08-02 22:44:03 UTC (rev 32473)
+++ grass/trunk/gui/wxpython/icons/silk/__init__.py	2008-08-02 23:12:45 UTC (rev 32474)
@@ -57,13 +57,14 @@
     "digUndo" : 'arrow_undo.png',
     "digSettings" : 'color_swatch.png',
     "digAdditionalTools" : 'plugin.png',
-    # gis manager
+    # layer manager
     "newdisplay" : 'application_add.png',
     "workspaceNew" : 'page_white.png',
     "workspaceLoad" : 'page_white_get.png',
     "workspaceOpen" : 'folder.png',
     "workspaceSave" : 'page_save.png',
     "addrast"    : 'image_add.png',
+    "addrast3d"  : 'bricks.png',
     "addshaded"  : 'picture_empty.png',
     "addrarrow"  : 'arrow_inout.png',
     "addvect"    : 'map_add.png',

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2008-08-02 22:44:03 UTC (rev 32473)
+++ grass/trunk/gui/wxpython/wxgui.py	2008-08-02 23:12:45 UTC (rev 32474)
@@ -1166,6 +1166,12 @@
         rastmenu.AppendItem(addrast)
         self.Bind(wx.EVT_MENU, self.AddRaster, addrast)
 
+        if self.curr_page.maptree.mapdisplay.toolbars['nviz']:
+            addrast3d = wx.MenuItem(rastmenu, -1, Icons ["addrast3d"].GetLabel())
+            addrast3d.SetBitmap(Icons["addrast3d"].GetBitmap (self.iconsize))
+            rastmenu.AppendItem(addrast3d)
+            self.Bind(wx.EVT_MENU, self.AddRaster3d, addrast3d)
+
         addshaded = wx.MenuItem(rastmenu, -1, Icons ["addshaded"].GetLabel())
         addshaded.SetBitmap(Icons["addshaded"].GetBitmap (self.iconsize))
         rastmenu.AppendItem(addshaded)
@@ -1292,6 +1298,10 @@
         self.notebook.SetSelection(0)
         self.curr_page.maptree.AddLayer('rastnum')
 
+    def AddRaster3d(self, event):
+        self.notebook.SetSelection(0)
+        self.curr_page.maptree.AddLayer('raster')
+
     def addVector(self, event):
         """Add vector layer"""
         self.notebook.SetSelection(0)