Changeset 3305 for branches/nanovis2/packages/vizservers/vtkvis/RpContour3D.cpp

Timestamp:

Feb 18, 2013 2:32:14 PM (11 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RpContour3D.cpp (modified) (5 diffs)

branches/nanovis2/packages/vizservers/vtkvis/RpContour3D.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011, Purdue Research Foundation
+ * Copyright (C) 2004-2012  HUBzero Foundation, LLC
  *
  * Author: Leif Delgass <ldelgass@purdue.edu>
@@ -8 +8 @@
 #include <cassert>
 
+#include <vtkVersion.h>
+#if (VTK_MAJOR_VERSION >= 6)
+#define USE_VTK6
+#endif
 #include <vtkDataSet.h>
 #include <vtkPointData.h>
@@ -117 +121 @@
             cellToPtData = 
                 vtkSmartPointer<vtkCellDataToPointData>::New();
+#ifdef USE_VTK6
+            cellToPtData->SetInputData(ds);
+#else
             cellToPtData->SetInput(ds);
+#endif
             //cellToPtData->PassCellDataOn();
             cellToPtData->Update();
@@ -135 +143 @@
             // Generate a 3D unstructured grid
             vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
+#ifdef USE_VTK6
+            mesher->SetInputData(pd);
+#else
             mesher->SetInput(pd);
+#endif
             _contourFilter->SetInputConnection(mesher->GetOutputPort());
         } else {
@@ -144 +156 @@
     } else {
          // DataSet is NOT a vtkPolyData
+#ifdef USE_VTK6
+         _contourFilter->SetInputData(ds);
+#else
          _contourFilter->SetInput(ds);
+#endif
     }