Merge pull request #1735 from UV-CDAT/issue_1734_non_contiguous_levs

aashish24 · aashish24 · commit cd5cf9f275d5 · 2015-12-15T00:06:20.000-05:00
Issue 1734 non contiguous levs
diff --git a/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py b/Packages/vcs/Lib/vcsvtk/boxfillpipeline.py
@@ -40,7 +40,7 @@ def _updateContourLevelsAndColors(self):
         if self._gm.boxfill_type != "custom":
             self._updateContourLevelsAndColorsForBoxfill()
         else:
-            self._updateContourLevelsAndColorsForCustomBoxfill()
+            self._updateContourLevelsAndColorsGeneric()
 
         if isinstance(self._contourLevels, numpy.ndarray):
             self._contourLevels = self._contourLevels.tolist()
@@ -93,40 +93,6 @@ def _updateContourLevelsAndColorsForBoxfill(self):
         # Use consecutive colors:
         self._contourColors = range(self._gm.color_1, self._gm.color_2 + 1)
 
-    def _updateContourLevelsAndColorsForCustomBoxfill(self):
-        """Set contour information for a custom boxfill."""
-        self._contourLevels = self._gm.levels
-
-        if numpy.allclose(self._contourLevels[0], [0., 1.e20]) or \
-           numpy.allclose(self._contourLevels, 1.e20):
-            levs2 = vcs.mkscale(self._scalarRange[0],
-                                self._scalarRange[1])
-            if len(levs2) == 1:  # constant value ?
-                levs2 = [levs2[0], levs2[0] + .00001]
-            self._contourLevels = []
-            if self._gm.ext_1:
-                # user wants arrow at the end
-                levs2[0] = -1.e20
-            if self._gm.ext_2:
-                # user wants arrow at the end
-                levs2[-1] = 1.e20
-            for i in range(len(levs2) - 1):
-                self._contourLevels.append([levs2[i], levs2[i + 1]])
-        else:
-            if not isinstance(self._gm.levels[0], (list, tuple)):
-                self._contourLevels = []
-                levs2 = self._gm.levels
-                if numpy.allclose(levs2[0], 1.e20):
-                    levs2[0] = 0
-                for i in range(len(levs2) - 1):
-                    self._contourLevels.append([levs2[i], levs2[i + 1]])
-
-        # Contour colors:
-        self._contourColors = self._gm.fillareacolors
-        if self._contourColors is None:
-            # TODO BUG levs2 may not be defined here...
-            self._contourColors = vcs.getcolors(levs2, split=0)
-
     def _createPolyDataFilter(self):
         """Overrides baseclass implementation."""
         self._vtkPolyDataFilter = vtk.vtkDataSetSurfaceFilter()
@@ -346,7 +312,6 @@ def _plotInternalCustomBoxfill(self):
         geos = []
         wholeDataMin, wholeDataMax = vcs.minmax(self._originalData1)
         _colorMap = self.getColorMap()
-        assert(style != 'solid' or len(tmpLevels) == 1)
         for i, l in enumerate(tmpLevels):
             # Ok here we are trying to group together levels can be, a join
             # will happen if: next set of levels continues where one left off
diff --git a/Packages/vcs/Lib/vcsvtk/isofillpipeline.py b/Packages/vcs/Lib/vcsvtk/isofillpipeline.py
@@ -31,43 +31,7 @@ def _updateVTKDataSet(self):
         self._vtkDataSet.GetPointData().SetScalars(data)
 
     def _updateContourLevelsAndColors(self):
-        """Overrides baseclass implementation."""
-        # Contour values:
-        self._contourLevels = self._gm.levels
-        if numpy.allclose(self._contourLevels[0], [0., 1.e20]) or \
-                numpy.allclose(self._contourLevels, 1.e20):
-            levs2 = vcs.mkscale(self._scalarRange[0],
-                                self._scalarRange[1])
-            if len(levs2) == 1:  # constant value ?
-                levs2 = [levs2[0], levs2[0] + .00001]
-            self._contourLevels = []
-            if self._gm.ext_1:
-                # user wants arrow at the end
-                levs2[0] = -1.e20
-            if self._gm.ext_2:
-                # user wants arrow at the end
-                levs2[-1] = 1.e20
-            for i in range(len(levs2) - 1):
-                self._contourLevels.append([levs2[i], levs2[i + 1]])
-        else:
-            if not isinstance(self._gm.levels[0], (list, tuple)):
-                self._contourLevels = []
-                levs2 = self._gm.levels
-                if numpy.allclose(levs2[0], 1.e20):
-                    levs2[0] = -1.e20
-                for i in range(len(levs2) - 1):
-                    self._contourLevels.append([levs2[i], levs2[i + 1]])
-
-        if isinstance(self._contourLevels, numpy.ndarray):
-            self._contourLevels = self._contourLevels.tolist()
-
-        # Figure out colors
-        self._contourColors = self._gm.fillareacolors
-        if self._contourColors == [1]:
-            # TODO BUG It's possible that levs2 may not exist here...
-            self._contourColors = vcs.getcolors(levs2, split=0)
-            if isinstance(self._contourColors, (int, float)):
-                self._contourColors = [self._contourColors]
+        self._updateContourLevelsAndColorsGeneric()
 
     def _createPolyDataFilter(self):
         """Overrides baseclass implementation."""
@@ -102,7 +66,6 @@ def _plotInternal(self):
         x1, x2, y1, y2 = vcs.utils.getworldcoordinates(self._gm,
                                                        self._data1.getAxis(-1),
                                                        self._data1.getAxis(-2))
-        assert(style != 'solid' or len(tmpLevels) == 1)
         for i, l in enumerate(tmpLevels):
             # Ok here we are trying to group together levels can be, a join
             # will happen if: next set of levels continues where one left off
diff --git a/Packages/vcs/Lib/vcsvtk/meshfillpipeline.py b/Packages/vcs/Lib/vcsvtk/meshfillpipeline.py
@@ -23,42 +23,7 @@ def _updateScalarData(self):
         self._data2 = self._originalData2
 
     def _updateContourLevelsAndColors(self):
-        """Overrides baseclass implementation."""
-        # Contour values:
-        self._contourLevels = self._gm.levels
-        if numpy.allclose(self._contourLevels[0], [0., 1.e20]) or \
-           numpy.allclose(self._contourLevels, 1.e20):
-            levs2 = vcs.mkscale(self._scalarRange[0], self._scalarRange[1])
-            if len(levs2) == 1:  # constant value ?
-                levs2 = [levs2[0], levs2[0] + .00001]
-            self._contourLevels = []
-            if self._gm.ext_1:
-                # user wants arrow at the end
-                levs2[0] = -1.e20
-            if self._gm.ext_2:
-                # user wants arrow at the end
-                levs2[-1] = 1.e20
-            for i in range(len(levs2) - 1):
-                self._contourLevels.append([levs2[i], levs2[i + 1]])
-        else:
-            if not isinstance(self._contourLevels[0], (list, tuple)):
-                self._contourLevels = []
-                levs2 = self._gm.levels
-                if numpy.allclose(levs2[0], 1.e20):
-                    levs2[0] = -1.e20
-                for i in range(len(levs2) - 1):
-                    self._contourLevels.append([levs2[i], levs2[i + 1]])
-
-        # Contour colors:
-        self._contourColors = self._gm.fillareacolors
-        if self._contourColors == [1]:
-            # TODO BUG levs2 may be uninitialized here
-            self._contourColors = vcs.getcolors(levs2, split=0)
-            if isinstance(self._contourColors, (int, float)):
-                self._contourColors = [self._contourColors]
-
-        if isinstance(self._contourLevels, numpy.ndarray):
-            self._contourLevels = self._contourLevels.tolist()
+        self._updateContourLevelsAndColorsGeneric()
 
     def _createPolyDataFilter(self):
         """Overrides baseclass implementation."""
@@ -94,7 +59,6 @@ def _plotInternal(self):
                                           self._vtkDataSetBounds[3])
         _colorMap = self.getColorMap()
         self._patternActors = []
-        assert(style != 'solid' or len(tmpLevels) == 1)
         for i, l in enumerate(tmpLevels):
             # Ok here we are trying to group together levels can be, a join
             # will happen if: next set of levels contnues where one left off
diff --git a/Packages/vcs/Lib/vcsvtk/pipeline2d.py b/Packages/vcs/Lib/vcsvtk/pipeline2d.py
@@ -92,6 +92,46 @@ def _updateFromGenGridDict(self, genGridDict):
         """
         raise NotImplementedError("Missing override.")
 
+    def _updateContourLevelsAndColorsGeneric(self):
+        # Contour values:
+        self._contourLevels = self._gm.levels
+        if numpy.allclose(self._contourLevels[0], [0., 1.e20]) or \
+                numpy.allclose(self._contourLevels, 1.e20):
+            levs2 = vcs.mkscale(self._scalarRange[0],
+                                self._scalarRange[1])
+            if len(levs2) == 1:  # constant value ?
+                levs2 = [levs2[0], levs2[0] + .00001]
+            self._contourLevels = []
+            if self._gm.ext_1:
+                # user wants arrow at the end
+                levs2[0] = -1.e20
+            if self._gm.ext_2:
+                # user wants arrow at the end
+                levs2[-1] = 1.e20
+            for i in range(len(levs2) - 1):
+                self._contourLevels.append([levs2[i], levs2[i + 1]])
+        else:
+            if not isinstance(self._gm.levels[0], (list, tuple)):
+                self._contourLevels = []
+                levs2 = self._gm.levels
+                if numpy.allclose(levs2[0], 1.e20):
+                    levs2[0] = -1.e20
+                for i in range(len(levs2) - 1):
+                    self._contourLevels.append([levs2[i], levs2[i + 1]])
+            else:
+                levs2 = self._gm.levels
+
+        if isinstance(self._contourLevels, numpy.ndarray):
+            self._contourLevels = self._contourLevels.tolist()
+
+        # Figure out colors
+        self._contourColors = self._gm.fillareacolors
+        if self._contourColors == [1] or self._contourColors is None:
+            # TODO BUG It's possible that levs2 may not exist here...
+            self._contourColors = vcs.getcolors(levs2, split=0)
+            if isinstance(self._contourColors, (int, float)):
+                self._contourColors = [self._contourColors]
+
     def _updateContourLevelsAndColors(self):
         """This method prepares the _contourLevels and _contourColors variables.
         """
@@ -201,8 +241,7 @@ def _prepContours(self):
                     tmpIndices.append(I)
                     tmpOpacities.append(O)
                     C = [self._contourColors[i]]
-#                    L = self._contourLevels[i]
-                    L = [L[-1], l[1]]
+                    L = self._contourLevels[i]
                     I = indices[i]
                     O = opacities[i]
         tmpLevels.append(L)
diff --git a/testing/vcs/CMakeLists.txt b/testing/vcs/CMakeLists.txt
@@ -703,6 +703,15 @@ cdat_add_test(vcs_test_taylor_2_quads
       )
     FOREACH(gm isofill boxfill meshfill)
       FOREACH(style solid pattern hatch)
+        cdat_add_test(vcs_test_${gm}_${style}_fill_non-contig
+          "${PYTHON_EXECUTABLE}"
+          "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
+          --gm_type=${gm}
+          --fill_style=${style}
+          --non-contiguous
+          "--source=${BASELINE_DIR}/test_vcs_${gm}_${style}_SH_-180_180_non-contig.png"
+          "--threshold=45"
+          )
         cdat_add_test(vcs_test_${gm}_${style}_fill
           "${PYTHON_EXECUTABLE}"
           "${cdat_SOURCE_DIR}/testing/vcs/test_vcs_gms_patterns_hatches.py"
diff --git a/testing/vcs/test_vcs_gms_patterns_hatches.py b/testing/vcs/test_vcs_gms_patterns_hatches.py
@@ -12,7 +12,7 @@
 
 p = argparse.ArgumentParser(description="Patterns/hatches testing code for vcs gms")
 p.add_argument("--source", dest="src", help="source image file")
-p.add_argument("--gm_type", dest="gm", help="gm to test")
+p.add_argument("--gm_type", dest="gm", help="gm to test", default="isofill")
 p.add_argument("--fill_style", dest="fill_style", help="Patterns/hatches fill style",
                default="pattern", type=str)
 p.add_argument("--show", dest="show", action="store_true", help="show plots on screen (no bg)", default=False)
@@ -23,7 +23,8 @@
 p.add_argument("--lon2", dest="lon2", default=180, type=float, help="Last Longitude")
 p.add_argument("--keep", dest="keep", action="store_true", help="Save image, even if baseline matches.")
 p.add_argument("--threshold", dest="threshold", type=int, default=checkimage.defaultThreshold,
-               help="Threshold value for image differnces")
+        help="Default threshold")
+p.add_argument("--non-contiguous", dest="contig", default=True, action="store_false", help="use non contiguous levels")
 
 args = p.parse_args(sys.argv[1:])
 
@@ -46,7 +47,11 @@
     p.type = ptype
     gm.projection = p
 
-gm.levels = [220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320]
+if args.contig:
+    gm.levels = [220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320]
+else:
+    gm.levels = [[230,235],[240,245],[250,255],[260,265],[270,275],
+                 [280,285],[290,295],[300,305],[310,315],[320,325]]
 gm.fillareastyle = args.fill_style
 gm.fillareacolors = [242, 244, 237, 248, 250, 252, 44, 243, 139, 247]
 if args.fill_style == "hatch":
@@ -75,6 +80,8 @@
 if args.lon1 != args.lon2:
     xtra["longitude"] = (args.lon1, args.lon2)
     nm_xtra += "_%i_%i" % (args.lon1, args.lon2)
+if not args.contig:
+    nm_xtra += "_non-contig"
 
 xtra["time"] = slice(0, 1)
 xtra["squeeze"] = 1
