Merge pull request #1122 from UV-CDAT/issue_1103_marker_none_1d

Issue 1103 marker none 1d

Author: David Lonie

Packages/vcs/Lib/VTKPlots.py

@@ -535,31 +535,33 @@ def plot1D(self,data1,data2,tmpl,gm):
         x1-=.0001
         x2+=.0001
     l._worldcoordinate = [x1,x2,y1,y2]
-    m=self.canvas.createmarker()
-    m.type = gm.marker
-    m.color = gm.markercolor
-    if gm.markersize>0:
-        m.size = gm.markersize
-    else:
-        m.priority=0
-    m._x = l.x
-    m._y = l.y
-    m._viewport=l.viewport
-    m._worldcoordinate = l.worldcoordinate
+    if gm.marker is not None:
+        m=self.canvas.createmarker()
+        m.type = gm.marker
+        m.color = gm.markercolor
+        if gm.markersize>0:
+            m.size = gm.markersize
+        else:
+            m.priority=0
+        m._x = l.x
+        m._y = l.y
+        m._viewport=l.viewport
+        m._worldcoordinate = l.worldcoordinate
 
     if not (Y[:].min()>max(y1,y2) or Y[:].max()<min(y1,y2) \
             or X[:].min()>max(x1,x2) or X[:].max()<min(x1,x2)):
     	if l.priority>0:
             self.canvas.plot(l,donotstoredisplay=True)
-        if m.priority>0:
+        if gm.marker is not None and m.priority>0:
             self.canvas.plot(m,donotstoredisplay=True)
     ren2 = self.createRenderer()
     self.renWin.AddRenderer(ren2)
     tmpl.plot(self.canvas,data1,gm,bg=self.bg,renderer=ren2,X=X,Y=Y)
     if hasattr(data1,"_yname"):
       del(data1._yname)
     del(vcs.elements["line"][l.name])
-    del(vcs.elements["marker"][m.name])
+    if gm.marker is not None:
+        del(vcs.elements["marker"][m.name])
 
     if tmpl.legend.priority>0:
         legd = self.canvas.createline()

testing/vcs/CMakeLists.txt

@@ -127,6 +127,11 @@ cdat_add_test(vcs_test_vectors_missing
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_vectors_missing.py
   "--source=${BASELINE_DIR}/test_vcs_vectors_missing.png"
   )
+cdat_add_test(vcs_test_remove_marker_none_1d
+  "${PYTHON_EXECUTABLE}"
+  ${cdat_SOURCE_DIR}/testing/vcs/test_remove_marker_none_1d.py
+  "${BASELINE_DIR}/test_remove_marker_none_1d.png"
+  )
 cdat_add_test(vcs_test_draw_logo_on
   "${PYTHON_EXECUTABLE}"
   ${cdat_SOURCE_DIR}/testing/vcs/test_draw_logo_on.py

testing/vcs/test_remove_marker_none_1d.py

@@ -0,0 +1,32 @@
+# Test if the marker can be removed (marker=None) from a 1D plot
+# Works in 1.5.1, but fails in 2.1
+#
+# J-Y Peterschmitt - LSCE - 03/2015
+
+import vcs,numpy,cdms2,MV2,os,sys
+src=sys.argv[1]
+pth = os.path.join(os.path.dirname(__file__),"..")
+sys.path.append(pth)
+import checkimage
+
+dummy_data = numpy.arange(50, dtype=numpy.float32)
+
+x = vcs.init()
+x.drawlogooff()
+x.setbgoutputdimensions(1200,1091,units="pixels")
+
+gm = x.createyxvsx('test_yxvsx')
+
+
+# Remove the marker
+gm.marker = None
+
+x.plot(gm, dummy_data,bg=1)
+
+fnm = "test_remove_marker_none_1d.png"
+x.png(fnm)
+print "fnm:",fnm
+print "src:",src
+ret = checkimage.check_result_image(fnm,src,checkimage.defaultThreshold)
+sys.exit(ret)
+# The end