浏览代码

wxGUI/vdigit: fix area filling
(merge from devbr6, https://trac.osgeo.org/grass/changeset/33401)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33402 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 16 年之前
父节点
当前提交
5cb7ef2c28
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 1 1
      gui/wxpython/gui_modules/dbm.py
  2. 1 2
      gui/wxpython/vdigit/driver_draw.cpp

+ 1 - 1
gui/wxpython/gui_modules/dbm.py

@@ -1057,7 +1057,7 @@ class AttributeManager(wx.Frame):
         cats = map(int, list.GetSelectedItems())
 
         digitToolbar = self.mapdisplay.toolbars['vdigit']
-        if digitToolbar and \
+        if digitToolbar and digitToolbar.GetLayer() and \
                 digitToolbar.GetLayer().GetName() == self.vectmap:
 
             self.mapdisplay.digit.driver.SetSelected(cats, cats=True)

+ 1 - 2
gui/wxpython/vdigit/driver_draw.cpp

@@ -64,8 +64,7 @@ int DisplayDriver::DrawMap(bool force)
 
 	wxBrush *fillArea, *fillAreaSelected, *fillIsle;
 
-	// fillArea = new wxBrush(settings.area.color);
-	fillArea = new wxBrush(wxColour(100,100,100,0));
+	fillArea = new wxBrush(settings.area.color);
 	fillAreaSelected = new wxBrush(settings.highlight);
 	fillIsle = new wxBrush(*wxWHITE_BRUSH);