[GRASS-SVN] r50039 - in grass/branches/develbranch_6: gui/wxpython/vdigit lib/vector/vedit

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-02 11:45:10 -0800 (Mon, 02 Jan 2012)
New Revision: 50039

Modified:
   grass/branches/develbranch_6/gui/wxpython/vdigit/wxdisplay.py
   grass/branches/develbranch_6/lib/vector/vedit/render.c
Log:
wxGUI: don't fill selected areas
       (merge r50038 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/wxdisplay.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/wxdisplay.py	2012-01-02 19:10:25 UTC (rev 50038)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/wxdisplay.py	2012-01-02 19:45:10 UTC (rev 50039)
@@ -229,11 +229,14 @@
         brush = None
         if self._isSelected(robj.fid):
             pdc = self.dcTmp
-            if self.settings['highlightDupl']['enabled'] and self._isDuplicated(robj.fid):
-                pen = wx.Pen(self.settings['highlightDupl']['color'], self.settings['lineWidth'], wx.SOLID)
-            else:            
-                pen = wx.Pen(self.settings['highlight'], self.settings['lineWidth'], wx.SOLID)
-            
+            if robj.type == TYPE_AREA:
+                return 1
+            else:
+                if self.settings['highlightDupl']['enabled'] and self._isDuplicated(robj.fid):
+                    pen = wx.Pen(self.settings['highlightDupl']['color'], self.settings['lineWidth'], wx.SOLID)
+                else:            
+                    pen = wx.Pen(self.settings['highlight'], self.settings['lineWidth'], wx.SOLID)
+                    
             dcId = 1
             self.topology['highlight'] += 1
             if not self._drawSelected:

Modified: grass/branches/develbranch_6/lib/vector/vedit/render.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/vedit/render.c	2012-01-02 19:10:25 UTC (rev 50038)
+++ grass/branches/develbranch_6/lib/vector/vedit/render.c	2012-01-02 19:45:10 UTC (rev 50039)
@@ -464,6 +464,7 @@
     /* get area's boundary */
     Vect_get_area_points(Map, area, state.Points);
     robj = robj_alloc(TYPE_AREA, state.Points->n_points);
+    robj->fid = centroid;
     robj_points(robj, state.Points);
     list_append(list, robj);
 
@@ -476,6 +477,7 @@
 
 	Vect_get_isle_points(Map, isle, ipoints);
 	robj = robj_alloc(TYPE_ISLE, ipoints->n_points);
+	robj->fid = -1;
 	robj_points(robj, ipoints);
 	list_append(list, robj);
     }