Changeset 3838

Timestamp:

Jul 25, 2013 12:06:50 PM (11 years ago)

Author:

ldelgass

Message:

Allow contour3d to generate line contours for polydata surfaces (this also
happens if the dataset is an unstructured grid with 2D cells). Turn off
new scalar bar by default for renderserver builds.

Location:

trunk/packages/vizservers/vtkvis

Files:

• Contour3D.cpp (modified) (1 diff)
• Makefile.in (modified) (1 diff)

trunk/packages/vizservers/vtkvis/Contour3D.cpp

@@ -151 +151 @@
 #endif
             _contourFilter->SetInputConnection(mesher->GetOutputPort());
-        } else if (vtkPolyData::SafeDownCast(ds) != NULL) {
-            // DataSet is a vtkPolyData with lines and/or polygons
-            ERROR("Not a 3D DataSet");
-            return;
         } else {
-            // DataSet is NOT a vtkPolyData
+            // DataSet is 3D with cells.  If DataSet is a surface
+            // (e.g. polydata or ugrid with 2D cells), we will 
+            // generate lines instead of surfaces
 #ifdef USE_VTK6
             _contourFilter->SetInputData(ds);

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -6 +6 @@
 USE_OFFSCREEN_RENDERING = #yes
 USE_THREADS             = yes
-NEW_SCALAR_BAR          = yes
+NEW_SCALAR_BAR          = #yes
 
 bindir          = @bindir@