Changeset 5822

Timestamp:

Aug 20, 2015, 3:27:14 PM (9 years ago)

Author:

ldelgass

Message:

merge r5819 from vtkvis release branch

Location:

vtkvis/trunk

Files:

• . (modified) (1 prop)
• Contour2D.cpp (modified) (5 diffs)
• Contour3D.cpp (modified) (5 diffs)

vtkvis/trunk/Contour2D.cpp

@@ -12 +12 @@
 #include <vtkPointData.h>
 #include <vtkCellData.h>
+#include <vtkTrivialProducer.h>
 #include <vtkCellDataToPointData.h>
 #include <vtkContourFilter.h>
@@ -124 +125 @@
 
     if (!_pipelineInitialized) {
+        vtkAlgorithmOutput *dsOutput = NULL;
         vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
+        vtkSmartPointer<vtkTrivialProducer> prod;
 
         if (ds->GetPointData() == NULL ||
@@ -139 +142 @@
 #endif
                 cellToPtData->PassCellDataOn();
-                cellToPtData->Update();
-                ds = cellToPtData->GetOutput();
+                dsOutput = cellToPtData->GetOutputPort();
             } else {
                 USER_ERROR("No scalar field was found in the data set");
             }
+        } else {
+            prod = vtkSmartPointer<vtkTrivialProducer>::New();
+            prod->SetOutput(ds);
+            dsOutput = prod->GetOutputPort();
         }
 
@@ -172 +178 @@
                     mesher->SetTransform(trans);
                 }
-#ifdef USE_VTK6
-                mesher->SetInputData(ds);
-#else
-                mesher->SetInput(ds);
-#endif
+                mesher->SetInputConnection(dsOutput);
                 _contourFilter->SetInputConnection(mesher->GetOutputPort());
             } else {
                 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
-#ifdef USE_VTK6
-                mesher->SetInputData(ds);
-#else
-                mesher->SetInput(ds);
-#endif
+                mesher->SetInputConnection(dsOutput);
                 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
                 gf->SetInputConnection(mesher->GetOutputPort());
@@ -191 +189 @@
         } else if (vtkPolyData::SafeDownCast(ds) != NULL) {
             // DataSet is a vtkPolyData with lines and/or polygons
-#ifdef USE_VTK6
-            _contourFilter->SetInputData(ds);
-#else
-            _contourFilter->SetInput(ds);
-#endif
+            _contourFilter->SetInputConnection(dsOutput);
         } else {
             TRACE("Generating surface for data set");
             // DataSet is NOT a vtkPolyData
             vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
-#ifdef USE_VTK6
-            gf->SetInputData(ds);
-#else
-            gf->SetInput(ds);
-#endif
+            gf->SetInputConnection(dsOutput);
             _contourFilter->SetInputConnection(gf->GetOutputPort());
         }

vtkvis/trunk/Contour3D.cpp

@@ -12 +12 @@
 #include <vtkPointData.h>
 #include <vtkCellData.h>
+#include <vtkTrivialProducer.h>
 #include <vtkCellDataToPointData.h>
 #include <vtkContourFilter.h>
@@ -119 +120 @@
 
     if (!_pipelineInitialized) {
+        vtkAlgorithmOutput *dsOutput = NULL;
         vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
+        vtkSmartPointer<vtkTrivialProducer> prod;
 
         if (ds->GetPointData() == NULL ||
@@ -134 +137 @@
 #endif
                 cellToPtData->PassCellDataOn();
-                cellToPtData->Update();
-                ds = cellToPtData->GetOutput();
+                dsOutput = cellToPtData->GetOutputPort();
             } else {
                 USER_ERROR("No scalar field was found in the data set.");
             }
+        } else {
+            prod = vtkSmartPointer<vtkTrivialProducer>::New();
+            prod->SetOutput(ds);
+            dsOutput = prod->GetOutputPort();
         }
 
@@ -145 +151 @@
             // Generate a 3D unstructured grid
             vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
-#ifdef USE_VTK6
-            mesher->SetInputData(ds);
-#else
-            mesher->SetInput(ds);
-#endif
+            mesher->SetInputConnection(dsOutput);
             _contourFilter->SetInputConnection(mesher->GetOutputPort());
         } else {
@@ -155 +157 @@
             // (e.g. polydata or ugrid with 2D cells), we will 
             // generate lines instead of surfaces
-#ifdef USE_VTK6
-            _contourFilter->SetInputData(ds);
-#else
-            _contourFilter->SetInput(ds);
-#endif
+            _contourFilter->SetInputConnection(dsOutput);
         }
     }