[GRASS-SVN] r53264 - in grass/branches/releasebranch_6_4/gui/wxpython: core nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-09-21 09:01:39 -0700 (Fri, 21 Sep 2012)
New Revision: 53264

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/core/settings.py
   grass/branches/releasebranch_6_4/gui/wxpython/nviz/wxnviz.py
Log:
wxNviz: remove unused symbols from gui (merge from trunk, r53262)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/core/settings.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/core/settings.py	2012-09-21 16:01:08 UTC (rev 53263)
+++ grass/branches/releasebranch_6_4/gui/wxpython/core/settings.py	2012-09-21 16:01:39 UTC (rev 53264)
@@ -762,8 +762,6 @@
                                                                        _("sphere"),
                                                                        _("cube"),
                                                                        _("diamond"),
-                                                                       _("dtree"),
-                                                                       _("ctree"),
                                                                        _("aster"),
                                                                        _("gyro"),
                                                                        _("histogram"))

Modified: grass/branches/releasebranch_6_4/gui/wxpython/nviz/wxnviz.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/nviz/wxnviz.py	2012-09-21 16:01:08 UTC (rev 53263)
+++ grass/branches/releasebranch_6_4/gui/wxpython/nviz/wxnviz.py	2012-09-21 16:01:39 UTC (rev 53264)
@@ -936,6 +936,10 @@
         if not GP_site_exists(id):
             return -1
         
+        # dtree and ctree defined but not used
+        if marker > 5:
+            marker += 2
+        
         Debug.msg(3, "Nviz::SetVectorPointMode(): id=%d, color=%s, "
                   "width=%d, size=%f, marker=%d",
                   id, color_str, width, size, marker)