Changeset 5836 for vtkvis/branches/1.8/PolyData.cpp

Timestamp:

Aug 22, 2015 2:18:27 PM (9 years ago)

Author:

ldelgass

Message:

merge r5835 from vtkvis trunk (remove support for VTK 5)

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• PolyData.cpp (modified) (7 diffs)

vtkvis/branches/1.8/PolyData.cpp

@@ -129 +129 @@
             _dataSet->numDimensions() < 2 || ds->GetNumberOfPoints() < 3) { // 0D or 1D or not enough points to mesh
             vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New();
-#ifdef USE_VTK6
             vgf->SetInputData(ds);
-#else
-            vgf->SetInput(ds);
-#endif
             _mapper->SetInputConnection(vgf->GetOutputPort());
         } else if (_dataSet->is2D(&plane, &offset)) {
@@ -157 +153 @@
                 mesher->SetTransform(trans);
             }
-#ifdef USE_VTK6
             mesher->SetInputData(ds);
-#else
-            mesher->SetInput(ds);
-#endif
             mesher->ReleaseDataFlagOn();
             mesher->Update();
@@ -173 +165 @@
                 WARN("Delaunay2D mesher failed");
                 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New();
-#ifdef USE_VTK6
                 vgf->SetInputData(ds);
-#else
-                vgf->SetInput(ds);
-#endif
                 _mapper->SetInputConnection(vgf->GetOutputPort());
             } else {
@@ -186 +174 @@
         } else {
             vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
-#ifdef USE_VTK6
             mesher->SetInputData(ds);
-#else
-            mesher->SetInput(ds);
-#endif
             mesher->ReleaseDataFlagOn();
             mesher->Update();
@@ -199 +183 @@
                 WARN("Delaunay3D mesher failed");
                 vtkSmartPointer<vtkVertexGlyphFilter> vgf = vtkSmartPointer<vtkVertexGlyphFilter>::New();
-#ifdef USE_VTK6
                 vgf->SetInputData(ds);
-#else
-                vgf->SetInput(ds);
-#endif
                 _mapper->SetInputConnection(vgf->GetOutputPort());
             } else {
@@ -221 +201 @@
         // DataSet is a vtkPolyData with cells
         if (hasNormals) {
-#ifdef USE_VTK6
             _mapper->SetInputData(pd);
-#else
-            _mapper->SetInput(pd);
-#endif
         } else {
             vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
-#ifdef USE_VTK6
             normalFilter->SetInputData(pd);
-#else
-            normalFilter->SetInput(pd);
-#endif
             _mapper->SetInputConnection(normalFilter->GetOutputPort());
         }
@@ -241 +213 @@
         //gf->UseStripsOn();
         gf->ReleaseDataFlagOn();
-#ifdef USE_VTK6
         gf->SetInputData(ds);
-#else
-        gf->SetInput(ds);
-#endif
         vtkSmartPointer<vtkPolyDataNormals> normalFilter = vtkSmartPointer<vtkPolyDataNormals>::New();
         normalFilter->SetInputConnection(gf->GetOutputPort());