Merge pull request #1067 from doutriaux1/line_duplicate_points_fix

Line duplicate points fix

Author: doutriaux1

Packages/vcs/Lib/vcs2vtk.py

@@ -1181,29 +1181,38 @@ def prepMarker(renWin,marker,cmap=None):
   return actors
 
 def prepLine(renWin,line,cmap=None):
-  n = prepPrimitive(line)
-  if n==0:
+  number_lines = prepPrimitive(line)
+
+  if number_lines == 0:
     return
+
   actors = []
-  for i in range(n):
+
+  for i in range(number_lines):
     l = vtk.vtkLine()
     lines = vtk.vtkCellArray()
     x = line.x[i]
-    y=line.y[i]
-    c=line.color[i]
-    w=line.width[i]
-    t=line.type[i]
-    N = max(len(x),len(y))
+    y = line.y[i]
+    c = line.color[i]
+    w = line.width[i]
+    t = line.type[i]
+    number_points = max(len(x),len(y))
+
+    # Extend x or y to the length of the other by duplicating the last coord.
     for a in [x,y]:
-      while len(a)<n:
+      while len(a)<number_points:
         a.append(a[-1])
+
     pts = vtk.vtkPoints()
-    for j in range(N):
+
+    for j in range(number_points):
       pts.InsertNextPoint(x[j],y[j],0.)
-    for j in range(N-1):
+
+    for j in range(number_points - 1):
       l.GetPointIds().SetId(0,j)
       l.GetPointIds().SetId(1,j+1)
       lines.InsertNextCell(l)
+
     linesPoly = vtk.vtkPolyData()
     geo,pts=project(pts,line.projection,line.worldcoordinate)
     linesPoly.SetPoints(pts)

testing/vcs/CMakeLists.txt

@@ -4,6 +4,10 @@ add_test(vcs_verify_import
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_import.py
 )
+add_test(vcs_line_duplicate_points_fix
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_line_point_extension.py
+)
 add_test(vcs_mkscale_zero_range
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_mkscale_zero_range.py

testing/vcs/test_vcs_line_point_extension.py

@@ -0,0 +1,23 @@
+import vcs, os, sys
+
+x = vcs.init()
+
+line = x.createline()
+line.x = [[0, .1], [.2, .3], [.4, .5], [.6, .7]]
+line.y = [[0, .1], [.2, .3, .4], [.5], [.6, .7]]
+
+x.plot(line, bg=1)
+
+if line.x[0] != [0, .1]:
+  print "line.x[0] should be [0, .1]; is %s" % line.x[0]
+  sys.exit(-1)
+
+if line.x[1] != [.2, .3, .3]:
+  print 'line.x[1] should be [.2, .3, .3]; is %s' % line.x[1]
+  sys.exit(-1)
+
+if line.y[2] != [.5, .5]:
+  print "line.y[2] should be [.5, .5]; is %s" % line.y[2]
+  sys.exit(-1)
+
+sys.exit(0)