BUG #190: When setting the initial size, we set bgX and bgY as well. (#191)

* BUG #190: When setting the initial size, we set bgX and bgY as well.

* make sure we get latest vtk-cdat

* autoindent ruined indentation

* Fix flake8 and default size for bg test.

* Default window size is based on the screen size.

Author: danlipsa

.travis.yml

@@ -11,7 +11,7 @@ before_install:
 - conda config --set always_yes yes --set changeps1 no
 - conda update -y -q conda
 script:
-- conda install -c uvcdat/label/nightly -c conda-forge -c uvcdat cdutil genutil dv3d-nox "mesalib>17" nose image-compare flake8 matplotlib
+- conda install -c uvcdat/label/nightly -c conda-forge -c uvcdat "vtk-cdat-nox >7.1.0.2.8" cdutil genutil dv3d-nox "mesalib>17" nose image-compare flake8 matplotlib
 - export UVCDAT_ANONYMOUS_LOG=False
 - echo $TRAVIS_BRANCH
 - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH

tests/test_vcs_background_mode_rotate.py

@@ -3,46 +3,47 @@
 import numpy
 
 class TestVCSBackgroundModeRotate(basevcstest.VCSBaseTest):
-	def testBackgroundModeRotate(self):
+    def testBackgroundModeRotate(self):
 
-		data = numpy.sin(numpy.arange(100))
-		data = numpy.reshape(data, (10, 10))
+        data = numpy.sin(numpy.arange(100))
+        data = numpy.reshape(data, (10, 10))
 
-		self.x = vcs.init()
-		self.x.plot(data, bg=self.bg)
-		self.assertEqual(self.x.orientation(), "landscape", "Default canvas orientation failed")
-		c = self.x.canvasinfo()
-		self.assertEqual(c['width'], 814, "Default canvas width failed")
-		self.assertEqual(c['height'], 606, "Default canvas height failed")
+        self.x = vcs.init()
+        self.x.plot(data, bg=self.bg)
+        self.assertEqual(self.x.orientation(), "landscape", "Default canvas orientation failed")
+        c = self.x.canvasinfo()
+        # default window size is based on the screen size
+        width = c['width']
+        height = c['height']
 
-		self.x.clear()
-		self.x.portrait()
-		self.x.plot(data, bg=self.bg)
-		self.assertEqual( self.x.orientation(), "portrait", "Portrait canvas orientation failed")
-		c = self.x.canvasinfo()
-		self.assertEqual( c['width'], 606, "Portrait canvas width failed")
-		self.assertEqual( c['height'], 814, "Portrait canvas height failed")
+        self.x.clear()
+        self.x.portrait()
+        self.x.plot(data, bg=self.bg)
+        self.assertEqual( self.x.orientation(), "portrait", "Portrait canvas orientation failed")
+        c = self.x.canvasinfo()
+        self.assertEqual( c['width'], height, "Portrait canvas width failed")
+        self.assertEqual( c['height'], width, "Portrait canvas height failed")
 
-		self.x.clear()
-		self.x.landscape()
-		self.x.plot(data, bg=self.bg)
-		self.assertEqual( self.x.orientation(), "landscape", "Landscape canvas orientation failed")
-		c = self.x.canvasinfo()
-		self.assertEqual( c['width'], 814, "Landscape canvas width failed")
-		self.assertEqual( c['height'], 606, "Landscape canvas height failed")
+        self.x.clear()
+        self.x.landscape()
+        self.x.plot(data, bg=self.bg)
+        self.assertEqual( self.x.orientation(), "landscape", "Landscape canvas orientation failed")
+        c = self.x.canvasinfo()
+        self.assertEqual( c['width'], width, "Landscape canvas width failed")
+        self.assertEqual( c['height'], height, "Landscape canvas height failed")
 
-		self.x.clear()
-		self.x.landscape()
-		self.x.plot(data, bg=self.bg)
-		self.assertEqual( self.x.orientation(), "landscape", "Landscape canvas orientation failed")
-		c = self.x.canvasinfo()
-		self.assertEqual( c['width'], 814, "Landscape canvas width failed")
-		self.assertEqual( c['height'], 606, "Landscape canvas height failed")
+        self.x.clear()
+        self.x.landscape()
+        self.x.plot(data, bg=self.bg)
+        self.assertEqual( self.x.orientation(), "landscape", "Landscape canvas orientation failed")
+        c = self.x.canvasinfo()
+        self.assertEqual( c['width'], width, "Landscape canvas width failed")
+        self.assertEqual( c['height'], height, "Landscape canvas height failed")
 
-		self.x.clear()
-		self.x.portrait()
-		self.x.plot(data, bg=self.bg)
-		self.assertEqual( self.x.orientation(), "portrait", "Portrait canvas orientation failed")
-		c = self.x.canvasinfo()
-		self.assertEqual( c['width'], 606, "Portrait canvas width failed")
-		self.assertEqual( c['height'], 814, "Portrait canvas height failed")
+        self.x.clear()
+        self.x.portrait()
+        self.x.plot(data, bg=self.bg)
+        self.assertEqual( self.x.orientation(), "portrait", "Portrait canvas orientation failed")
+        c = self.x.canvasinfo()
+        self.assertEqual( c['width'], height, "Portrait canvas width failed")
+        self.assertEqual( c['height'], width, "Portrait canvas height failed")

tests/test_vcs_init_size_keyword.py

@@ -5,14 +5,6 @@
 class TestVCSInit(unittest.TestCase):
     def testInitOpenSize(self):
 
-        x=vcs.init()
-        print x.size
-        x.open()
-        i = x.canvasinfo()
-        r = float(i["width"])/i["height"]
-        print "r is:",r,i
-        assert(numpy.allclose(r,1.29438202247,.001))
-
         x=vcs.init(size=4)
         x.open()
         i = x.canvasinfo()

vcs/VTKPlots.py

@@ -14,6 +14,12 @@
 import vcsvtk
 
 
+def _makeEven(val):
+    if (val & 0x1):
+        val -= 1
+    return val
+
+
 class VCSInteractorStyle(vtk.vtkInteractorStyleUser):
 
     def __init__(self, parent):
@@ -524,7 +530,12 @@ def initialSize(self, width=None, height=None):
         # Respect user chosen aspect ratio
         bgY = int(bgX / self.canvas.size)
         # Sets renWin dimensions
+        # make the dimensions even for Macs
+        bgX = _makeEven(bgX)
+        bgY = _makeEven(bgY)
         self.renWin.SetSize(bgX, bgY)
+        self.canvas.bgX = bgX
+        self.canvas.bgY = bgY
         self._lastSize = (bgX, bgY)
 
     def open(self, width=None, height=None, **kargs):