[GRASS-SVN] r57124 - in grass/trunk/gui/wxpython: lmgr nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-07-14 09:27:52 -0700 (Sun, 14 Jul 2013)
New Revision: 57124

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/nviz/mapwindow.py
Log:
wxNviz: fix color initializing of vector

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2013-07-14 16:11:38 UTC (rev 57123)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2013-07-14 16:27:52 UTC (rev 57124)
@@ -176,6 +176,10 @@
         self._auimgr.AddPane(self.notebook, wx.aui.AuiPaneInfo().
                              Left().CentrePane().BestSize((-1,-1)).Dockable(False).
                              CloseButton(False).DestroyOnClose(True).Row(1).Layer(0))
+        self._auimgr.AddPane(SearchModuleWindow(parent=self, model=self._menuTreeBuilder.GetModel()), wx.aui.AuiPaneInfo().
+                             Left().BestSize((-1,-1)).Dockable(True).
+                             CloseButton(False).DestroyOnClose(True).Row(1).Layer(0).
+                             PaneBorder(False).CaptionVisible(True))
 
         self._auimgr.Update()
 

Modified: grass/trunk/gui/wxpython/nviz/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/mapwindow.py	2013-07-14 16:11:38 UTC (rev 57123)
+++ grass/trunk/gui/wxpython/nviz/mapwindow.py	2013-07-14 16:27:52 UTC (rev 57124)
@@ -42,6 +42,7 @@
 from nviz.animation     import Animation
 from nviz               import wxnviz
 from core.globalvar     import CheckWxVersion
+from core.utils         import str2rgb
 
 wxUpdateProperties, EVT_UPDATE_PROP  = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW  = NewEvent()
@@ -1407,6 +1408,8 @@
             except ValueError:
                 continue
             if key == 'color':
+                if not ':' in value:
+                    value = ':'.join(map(str, str2rgb[value]))
                 data['lines']['color']['value'] = value
                 data['points']['color']['value'] = value