wxGUI/vdigit: fix copying feature from background map

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

gui/wxpython/gui_modules/mapdisp_vdigit.py

@@ -21,10 +21,11 @@ import wx
 import dbm_dialogs
 
 import gcmd
-from debug import Debug
+from debug          import Debug
 from mapdisp_window import BufferedWindow
-from preferences import globalSettings as UserSettings
-
+from preferences    import globalSettings as UserSettings
+from utils          import ListOfCatsToRange
+from globalvar      import QUERYLAYER
 from vdigit import VDigitCategoryDialog
 from vdigit import VDigitZBulkDialog
 from vdigit import VDigitDuplicatesDialog
@@ -705,7 +706,7 @@ class VDigitWindow(BufferedWindow):
         if UserSettings.Get(group = 'vdigit', key = 'bgmap',
                             subkey = 'value', internal = True) == '':
             # no background map -> copy from current vector map layer
-            nselected = self.digit.GetDisplay().SelectLinesByBox((pos1, pos2))
+            nselected = self.bdigit.GetDisplay().SelectLinesByBox((pos1, pos2))
             
             if nselected > 0:
                 # highlight selected features
@@ -714,17 +715,15 @@ class VDigitWindow(BufferedWindow):
                 self.UpdateMap(render = False, renderVector = False)
         else:
             # copy features from background map
-            self.copyIds += self.digit.SelectLinesFromBackgroundMap(bbox = (pos1, pos2))
+            self.copyIds = self.digit.SelectLinesFromBackgroundMap(bbox = (pos1, pos2))
             if len(self.copyIds) > 0:
                 color = UserSettings.Get(group = 'vdigit', key = 'symbol',
                                          subkey = ['highlight', 'color'])
-                colorStr = str(color[0]) + ":" + \
-                    str(color[1]) + ":" + \
-                    str(color[2])
+                colorStr = str(color[0]) + ":" + str(color[1]) + ":" + str(color[2])
                 dVectTmp = ['d.vect',
                             'map=%s' % UserSettings.Get(group = 'vdigit', key = 'bgmap',
                                                         subkey = 'value', internal = True),
-                            'cats=%s' % utils.ListOfCatsToRange(self.copyIds),
+                            'cats=%s' % ListOfCatsToRange(self.copyIds),
                             '-i',
                             'color=%s' % colorStr,
                             'fcolor=%s' % colorStr,
@@ -733,16 +732,16 @@ class VDigitWindow(BufferedWindow):
                 
                 if not self.layerTmp:
                     self.layerTmp = self.Map.AddLayer(type = 'vector',
-                                                      name = globalvar.QUERYLAYER,
+                                                      name = QUERYLAYER,
                                                       command = dVectTmp)
                 else:
                     self.layerTmp.SetCmd(dVectTmp)
-                
-                self.UpdateMap(render = True, renderVector = False)
             else:
-                self.UpdateMap(render = False, renderVector = False)
+                if self.layerTmp:
+                    self.Map.DeleteLayer(self.layerTmp)
+                    self.layerTmp = None
             
-            self.redrawAll = None
+            self.UpdateMap(render = True, renderVector = True)
             
     def OnLeftUpBulkLine(self, event):
         """!Left mouse button released - vector digitizer z-bulk line

gui/wxpython/gui_modules/wxvdigit.py

@@ -1729,15 +1729,12 @@ class IVDigit:
         
         @return list of selected feature ids
         """
-        ret = list()
-        
-        # try select features by Box
-        ids = self._display.SelectLinesByBox(bbox, poMapInfo = self.poBgMapInfo)
-        if not ids:
-            ids = [self._display.SelectLineByPoint(bbox[0], poMapInfo = self.poBgMapInfo)['line'], ]
+        # try select features by box first
+        if self._display.SelectLinesByBox(bbox, poMapInfo = self.poBgMapInfo) < 1:
+            self._display.SelectLineByPoint(bbox[0], poMapInfo = self.poBgMapInfo)['line']
+            
+        return self._display.selected['ids']
         
-        return ids
-
     def GetUndoLevel(self):
         """!Get undo level (number of active changesets)
         

gui/wxpython/gui_modules/wxvdriver.py

@@ -527,11 +527,6 @@ class DisplayDriver:
             # select by ids
             self.selected['cats'] = list()
         
-        if thisMapInfo:
-            selected = self.selected['ids']
-        else:
-            selected = list()
-        
         poList = Vect_new_list()
         x1, y1 = bbox[0]
         x2, y2 = bbox[1]
@@ -568,9 +563,9 @@ class DisplayDriver:
                     continue # skip lines just overlapping bbox
             
             if not self._isSelected(line):
-                selected.append(line)
+                self.selected['ids'].append(line)
             else:
-                selected.remove(line)
+                self.selected['ids'].remove(line)
         
         Vect_destroy_line_struct(poBbox)
         Vect_destroy_list(poList)
@@ -601,11 +596,6 @@ class DisplayDriver:
             # select by ids 
             self.selected['cats'] = list()
         
-        if thisMapInfo:
-            selected = self.selected['ids']
-        else:
-            selected = list()
-        
         poFound = Vect_new_list()
         
         lineNearest = Vect_find_line_list(poMapInfo, point[0], point[1], 0,
@@ -615,9 +605,9 @@ class DisplayDriver:
         
         if lineNearest > 0:
             if not self._isSelected(lineNearest):
-                selected.append(lineNearest)
+                self.selected['ids'].append(lineNearest)
             else:
-                selected.remove(lineNearest)
+                self.selected['ids'].remove(lineNearest)
         
         px = c_double()
         py = c_double()
@@ -635,14 +625,14 @@ class DisplayDriver:
 	    for i in range(found.n_values):
 		line = found.value[i]
 		if line != lineNearest:
-                    selected.append(line)
+                    self.selected['ids'].append(line)
 	    
             self.GetDuplicates()
 	    
 	    for i in range(found.n_values):
 		line = found.value[i]
 		if line != lineNearest and not self._isDuplicated(line):
-                    selected.remove(line)
+                    self.selected['ids'].remove(line)
         
         Vect_destroy_list(poFound)