Changeset 5835 for vtkvis/trunk/DataSet.cpp

Timestamp:

Aug 21, 2015, 2:54:55 PM (9 years ago)

Author:

ldelgass

Message:

Require VTK >= 6.0.0

File:

• vtkvis/trunk/DataSet.cpp (modified) (5 diffs)

vtkvis/trunk/DataSet.cpp

@@ -88 +88 @@
 
     writer->SetFileName(filename);
-#ifdef USE_VTK6
     writer->SetInputData(_dataSet);
-#else
-    writer->SetInput(_dataSet);
-#endif
     writer->Write();
 }
@@ -148 +144 @@
 /**
  * \brief Read dataset using supplied reader
- *
- * Pipeline information is removed from the resulting 
- * vtkDataSet, so that the reader and its data can be 
- * released
  */
 bool DataSet::setData(vtkDataSetReader *reader)
@@ -166 +158 @@
     if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL && !isCloud()) {
         vtkSmartPointer<vtkExtractUnstructuredGrid> filter = vtkSmartPointer<vtkExtractUnstructuredGrid>::New();
-#ifdef USE_VTK6
         filter->SetInputData(_dataSet);
-#else
-        filter->SetInput(_dataSet);
-#endif
         filter->MergingOn();
         filter->ReleaseDataFlagOn();
@@ -177 +165 @@
     }
 
-#ifndef USE_VTK6
-    _dataSet->SetPipelineInformation(NULL);
-#endif
     if (_dataSet->GetPointData() != NULL &&
         _dataSet->GetPointData()->GetScalars() != NULL &&
@@ -197 +182 @@
 /**
  * \brief Set DataSet from existing vtkDataSet object
- *
- * Pipeline information is removed from the supplied vtkDataSet
  */
 bool DataSet::setData(vtkDataSet *ds)
 {
     _dataSet = ds;
-#ifndef USE_VTK6
-    _dataSet->SetPipelineInformation(NULL);
-#endif
 
     if (_dataSet->GetPointData() != NULL &&