Changeset 5836 for vtkvis/branches/1.8/LIC.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)
• LIC.cpp (modified) (7 diffs)

vtkvis/branches/1.8/LIC.cpp

@@ -78 +78 @@
              cellToPtData = 
                  vtkSmartPointer<vtkCellDataToPointData>::New();
-#ifdef USE_VTK6
              cellToPtData->SetInputData(ds);
-#else
-             cellToPtData->SetInput(ds);
-#endif
              //cellToPtData->PassCellDataOn();
              cellToPtData->Update();
@@ -105 +101 @@
             imageData->GetDimensions(dims);
             TRACE("Image data dimensions: %d %d %d", dims[0], dims[1], dims[2]);
-#ifdef USE_VTK6
             _volumeSlicer->SetInputData(ds);
-#else
-            _volumeSlicer->SetInput(ds);
-#endif
             _volumeSlicer->SetVOI(0, dims[0]-1, 0, dims[1]-1, (dims[2]-1)/2, (dims[2]-1)/2);
             _volumeSlicer->SetSampleRate(1, 1, 1);
@@ -115 +107 @@
         } else {
             // 2D image/uniform grid
-#ifdef USE_VTK6
             _lic->SetInputData(ds);
-#else
-            _lic->SetInput(ds);
-#endif
         }
         if (_mapper == NULL) {
@@ -175 +163 @@
                 // 3D cloud -- Need to mesh it before we can resample
                 vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
-#ifdef USE_VTK6
                 mesher->SetInputData(ds);
-#else
-                mesher->SetInput(ds);
-#endif
                 cutter->SetInputConnection(mesher->GetOutputPort());
             } else {
-#ifdef USE_VTK6
                 cutter->SetInputData(ds);
-#else
-                cutter->SetInput(ds);
-#endif
             }
             cutter->SetCutFunction(_cutPlane);
@@ -214 +194 @@
                     mesher->SetTransform(trans);
                 }
-#ifdef USE_VTK6
                 mesher->SetInputData(ds);
-#else
-                mesher->SetInput(ds);
-#endif
                 _probeFilter->SetSourceConnection(mesher->GetOutputPort());
             } else {
-#ifdef USE_VTK6
                 _probeFilter->SetSourceData(ds);
-#else
-                _probeFilter->SetSource(ds);
-#endif
             }
         }
@@ -270 +242 @@
         imageData->SetOrigin(origin);
         imageData->SetSpacing(spacing);
-#ifdef USE_VTK6
         _probeFilter->SetInputData(imageData);
-#else
-        _probeFilter->SetInput(imageData);
-#endif
         _lic->SetInputConnection(_probeFilter->GetOutputPort());
 
@@ -316 +284 @@
          }
         ppdmapper->SetPainter(_painter);
-#ifdef USE_VTK6
         ppdmapper->SetInputData(pd);
-#else
-        ppdmapper->SetInput(pd);
-#endif
     }