Changeset 63077

Timestamp:

Nov 26, 2014, 7:37:03 AM (10 years ago)

Author:

mmetz

Message:

vector digitizer: fix #2439

File:

• grass/trunk/gui/wxpython/vdigit/wxdigit.py (modified) (3 diffs)

grass/trunk/gui/wxpython/vdigit/wxdigit.py

@@ -1767 +1767 @@
             self._error.WriteLine()
             return (-1, None)
-        else:
-            fids.append(newline)
-        
-        # break at intersection
-        if self._settings['breakLines']:
-            self._breakLineAtIntersection(newline, self.poPoints)
-            
+        
         # add centroids for left/right area
         if ftype & GV_AREA:
@@ -1803 +1797 @@
                     Vect_reset_line(bpoints)
                     Vect_append_point(bpoints, x.value, y.value, 0.0)
-                    newline = Vect_write_line(self.poMapInfo, GV_CENTROID,
+                    newc = Vect_write_line(self.poMapInfo, GV_CENTROID,
                                               bpoints, self.poCats)
-                    if newline < 0:
+                    if newc < 0:
                         self._error.WriteLine()
                         return (len(fids), fids)
                     else:
-                        fids.append(newline)
+                        fids.append(newc)
                     
             if right > 0 and \
@@ -1818 +1812 @@
                     Vect_reset_line(bpoints)
                     Vect_append_point(bpoints, x.value, y.value, 0.0)
-                    newline =  Vect_write_line(self.poMapInfo, GV_CENTROID,
+                    newc =  Vect_write_line(self.poMapInfo, GV_CENTROID,
                                                bpoints, self.poCats)
-                    if newline < 0:
+                    if newc < 0:
                         self._error.WriteLine()
                         return (len(fids, fids))
                     else:
-                        fids.append(newline)
+                        fids.append(newc)
                     
             Vect_destroy_line_struct(bpoints)
-        
+
+        # break line or boundary at intersection
+        if self._settings['breakLines']:
+            if not self._breakLineAtIntersection(newline, self.poPoints):
+                fids.append(newline)
+
         self._addChangeset()