Merge pull request #2070 from UV-CDAT/system-dependent-outline

System dependent outline

Author: doutriaux1

Packages/vcs/vcs/VTKPlots.py

@@ -1382,7 +1382,10 @@ def fitToViewport(self, Actor, vp, wc=None, geoBounds=None, geo=None, priority=N
             yd = yScale * float(Yrg[1] - Yrg[0]) / 2.
             cam = Renderer.GetActiveCamera()
             cam.ParallelProjectionOn()
-            cam.SetParallelScale(yd)
+            # We increase the parallel projection parallelepiped with 1/1000 so that
+            # it does not overlap with the outline of the dataset. This resulted in
+            # system dependent display of the outline.
+            cam.SetParallelScale(yd * 1.001)
             cd = cam.GetDistance()
             cam.SetPosition(xc, yc, cd)
             cam.SetFocalPoint(xc, yc, 0.)

testing/vcs/test_vcs_boxfill_robinson_wrap.py

@@ -5,10 +5,10 @@
 cdmsfile = cdms2.open(os.path.join(vcs.sample_data, "clt.nc"))
 clt2 = cdmsfile('clt')
 clt3 = clt2(latitude=(-90.0, 90.0),squeeze=1,longitude=(-180, 200.0),time=('1979-01', '1988-12'),)
-canvas = vcs.init()
+canvas = regression.init()
 gmBoxfill = vcs.getboxfill('a_robinson_boxfill')
 kwargs = {}
 kwargs[ 'cdmsfile' ] = cdmsfile.id
 kwargs['bg'] = 1
 canvas.plot(clt3, gmBoxfill, **kwargs)
-regression.run(canvas, "test_vcs_robinson_wrap.png")
+regression.run(canvas, "test_vcs_boxfill_robinson_wrap.png")

testing/vcs/test_vcs_isofill_isoline_labels.py

@@ -23,4 +23,4 @@
 
 # Plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-regression.run(canvas, "test_isofill_isoline_labels.png")
+regression.run(canvas, "test_vcs_isofill_isoline_labels.png")

testing/vcs/test_vcs_isoline_labels.py

@@ -23,14 +23,14 @@
 
 baseline = os.path.splitext(sys.argv[1])
 baselineImage = "%s%s"%baseline
-ret = regression.run_wo_terminate(canvas, "test_isoline_labels.png", baselineImage)
+ret = regression.run_wo_terminate(canvas, "test_vcs_isoline_labels.png", baselineImage)
 
 # Now set isoline.linecolors and test again.
 canvas.clear()
 isoline.linecolors = colors
 canvas.plot(data, isoline, bg=1)
 baselineImage = "%s%d%s"%(baseline[0], 2, baseline[1])
-testImage = os.path.abspath("test_isoline_labels2.png")
+testImage = os.path.abspath("test_vcs_isoline_labels2.png")
 ret += regression.run_wo_terminate(canvas, testImage, baselineImage)
 
 # Now set isoline.textcolors and test again.
@@ -39,7 +39,7 @@
 canvas.plot(data, isoline, bg=1)
 
 baselineImage = "%s%d%s"%(baseline[0], 3, baseline[1])
-testImage = os.path.abspath("test_isoline_labels3.png")
+testImage = os.path.abspath("test_vcs_isoline_labels3.png")
 ret += regression.run_wo_terminate(canvas, testImage, baselineImage)
 
 sys.exit(ret)

testing/vcs/test_vcs_isoline_labelskipdistance.py

@@ -23,4 +23,4 @@
 
 # Next plot the isolines with labels
 canvas.plot(data, isoline, bg=1)
-regression.run(canvas, "test_isoline_labelskipdistance.png")
+regression.run(canvas, "test_vcs_isoline_labelskipdistance.png")