Merge pull request #1819 from UV-CDAT/taylor-cutoff

BUG #1812: Fix taylor cutoff.

Packages/vcs/Lib/taylor.py

@@ -922,15 +922,17 @@ def drawSkill(self, canvas, values, function=None):
         if function is None:
             return
         color = self.skillColor
-        a = MV2.ones((self.detail, self.detail), typecode=MV2.float)
+        a = MV2.ones((self.detail + 1, self.detail + 1), typecode=MV2.float)
         a = MV2.masked_equal(a, 1)
         v1 = []
         v2 = []
-        for i in range(self.detail):
+        # we generate data with range -self._stdmax, self._stdmax so
+        # we want i/self.detail to vary between [0, 1]
+        for i in range(self.detail + 1):
             x = float(i) / self.detail * self._stdmax * \
                 self.quadrans - self._stdmax * (self.quadrans - 1)
             v1.append(x)
-            for j in range(self.detail):
+            for j in range(self.detail + 1):
                 y = float(j) / self.detail * self._stdmax
                 if i == 0:
                     v2.append(y)
@@ -972,7 +974,7 @@ def drawSkill(self, canvas, values, function=None):
         tmpl.data.x2 = self.template.data.x2
         tmpl.data.y1 = self.template.data.y1
         tmpl.data.y2 = self.template.data.y2
-        self.displays.append(canvas.plot(a, iso, tmpl, bg=self.bg))
+        return canvas.plot(a, iso, tmpl, bg=self.bg)
 
     def list(self):
         print ' ----------Taylordiagram (Gtd) member (attribute) listings ----------'
@@ -1879,7 +1881,9 @@ def plot(self, data, template='deftaylor', skill=None, bg=0, canvas=None):
                 self.outtervalue = float(self.referencevalue * 1.2)
             resetoutter = 1
         wc = self.setWorldCoordinate(canvas)
-        self.drawSkill(canvas, values=self.skillValues, function=skill)
+        d = self.drawSkill(canvas, values=self.skillValues, function=skill)
+        if (d):
+            self.displays.append(d)
         if (len(self.displays) > 0):
             datasetBounds = self.displays[-1].backend['dataset_bounds']
             self.worldcoordinate = datasetBounds