Changeset 2270 for trunk/packages/vizservers/vtkvis/RpContour2D.cpp

Timestamp:

Jun 5, 2011, 1:26:07 PM (13 years ago)

Author:

ldelgass

Message:

• Convert to newer VTK pipeline methods where applicable: i.e. use

InputConnection/OutputPort? instead of Input/Output?. The old, deprecated
methods may be removed in VTK 6.

• Disconnect vtkDataSet from reader pipeline after reading data. Allows reader

to be deleted ("garbage collected") after data is read. This also fixes a
potential read of freed memory (the memory allocated by the Tcl command
handler for the VTK data "file").

• Remove vtkWarpScalar filter from HeightMap? pipeline when the height scaling

is set to zero.

• Fix for removing clip planes when switching from image camera mode to

perspecive or ortho.

File:

• trunk/packages/vizservers/vtkvis/RpContour2D.cpp (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/RpContour2D.cpp

@@ -114 +114 @@
         _contourFilter = vtkSmartPointer<vtkContourFilter>::New();
     }
- 
-    vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
 
     if (ds->GetPointData() == NULL ||
         ds->GetPointData()->GetScalars() == NULL) {
-        ERROR("No scalar point data in dataset %s", _dataSet->getName().c_str());
+        WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
         if (ds->GetCellData() != NULL &&
             ds->GetCellData()->GetScalars() != NULL) {
+            vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
             cellToPtData = 
                 vtkSmartPointer<vtkCellDataToPointData>::New();
             cellToPtData->SetInput(ds);
+            //cellToPtData->PassCellDataOn();
+            cellToPtData->Update();
             ds = cellToPtData->GetOutput();
         } else {
@@ -141 +142 @@
                 vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
                 mesher->SetInput(pd);
-                pd = mesher->GetOutput();
-                assert(pd);
-                _contourFilter->SetInput(pd);
+                _contourFilter->SetInputConnection(mesher->GetOutputPort());
             } else {
                 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
                 mesher->SetInput(pd);
                 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
-                gf->SetInput(mesher->GetOutput());
-                gf->Update();
-                pd = gf->GetOutput();
-                assert(pd);
-                _contourFilter->SetInput(pd);
-             }
+                gf->SetInputConnection(mesher->GetOutputPort());
+                _contourFilter->SetInputConnection(gf->GetOutputPort());
+            }
         } else {
             // DataSet is a vtkPolyData with lines and/or polygons
@@ -163 +159 @@
         vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
         gf->SetInput(ds);
-        gf->Update();
-        pd = gf->GetOutput();
-        assert(pd);
-        _contourFilter->SetInput(pd);
+        _contourFilter->SetInputConnection(gf->GetOutputPort());
     }
 
@@ -193 +186 @@
         _contourMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
         _contourMapper->SetResolveCoincidentTopologyToPolygonOffset();
-        _contourMapper->SetInput(_contourFilter->GetOutput());
+        _contourMapper->SetInputConnection(_contourFilter->GetOutputPort());
         _contourActor->SetMapper(_contourMapper);
     }
+
+    _contourMapper->Update();
 }