浏览代码

wxNviz: fix color initializing of vector

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57124 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 12 年之前
父节点
当前提交
1fba229ade
共有 2 个文件被更改,包括 7 次插入0 次删除
  1. 4 0
      gui/wxpython/lmgr/frame.py
  2. 3 0
      gui/wxpython/nviz/mapwindow.py

+ 4 - 0
gui/wxpython/lmgr/frame.py

@@ -176,6 +176,10 @@ class GMFrame(wx.Frame):
         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()
 

+ 3 - 0
gui/wxpython/nviz/mapwindow.py

@@ -42,6 +42,7 @@ from nviz.workspace     import NvizSettings
 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 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
             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