瀏覽代碼

wxGUI/vdigit: fix copy features in edited vector map (merge from devbr6, https://trac.osgeo.org/grass/changeset/32642)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32643 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 年之前
父節點
當前提交
3474f3f13e
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 1 1
      gui/wxpython/gui_modules/mapdisp.py
  2. 6 2
      gui/wxpython/gui_modules/vdigit.py

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

@@ -1270,7 +1270,7 @@ class BufferedWindow(MapWindow, wx.Window):
                     self.mouse['box'] = 'box'
                     self.mouse['box'] = 'box'
 
 
             elif digitToolbar.action == "copyLine":
             elif digitToolbar.action == "copyLine":
-                self.copyIds = None
+                self.copyIds = []
                 self.layerTmp = None
                 self.layerTmp = None
 
 
             elif digitToolbar.action == "zbulkLine":
             elif digitToolbar.action == "zbulkLine":

+ 6 - 2
gui/wxpython/gui_modules/vdigit.py

@@ -1070,7 +1070,7 @@ class VDigit(AbstractDigit):
 
 
         return ret
         return ret
         
         
-    def CopyLine(self, ids=None):
+    def CopyLine(self, ids=[]):
         """Copy features from (background) vector map
         """Copy features from (background) vector map
 
 
         @param ids list of line ids to be copied
         @param ids list of line ids to be copied
@@ -1078,7 +1078,11 @@ class VDigit(AbstractDigit):
         @return number of copied features
         @return number of copied features
         @return -1 on error
         @return -1 on error
         """
         """
-        ret = self.digit.CopyLines(ids, str(UserSettings.Get(group='vdigit', key='backgroundMap', subkey='value')))
+        bgmap = str(UserSettings.Get(group='vdigit', key='backgroundMap', subkey='value'))
+        if len(bgmap) > 0:
+            ret = self.digit.CopyLines(ids, bgmap)
+        else:
+            ret = self.digit.CopyLines(ids, None)
 
 
         if ret > 0:
         if ret > 0:
             self.toolbar.EnableUndo()
             self.toolbar.EnableUndo()