From d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 21 Jul 2017 18:05:21 +0200 Subject: [PATCH] #3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7 --- kernel/src/bbtkVtkBlackBoxMacros.h | 50 ++++++- .../bbgdcmvtkGetXCoherentInfoGdcmReader.cxx | 11 +- .../itkvtk/src/itkVTKImageToImageFilter.txx | 5 + packages/vtk/src/bbvtkAppendPolyData.xml | 12 ++ packages/vtk/src/bbvtkInversCrop.cxx | 21 ++- packages/vtk/src/bbvtkMIPCreator.cxx | 19 +++ packages/vtk/src/bbvtkMagnitud.cxx | 130 +++++++++++++++++- packages/vtk/src/bbvtkMaskPoint.cxx | 9 +- packages/vtk/src/bbvtkMetaImageWriter.xml | 13 ++ packages/vtk/src/bbvtkPlaneClipPolyData.cxx | 7 + packages/vtk/src/bbvtkPolyDataReaderPlus.cxx | 7 +- packages/vtk/src/bbvtkPolyDataToActor.cxx | 6 + packages/vtk/src/bbvtkPolyDataWriter.xml | 9 +- packages/vtk/src/bbvtkPolyDataWriterPlus.cxx | 28 ++++ packages/vtk/src/bbvtkProbeFilter.cxx | 11 +- .../vtk/src/bbvtkRescaleSlopeIntercept.cxx | 19 +++ .../vtk/src/bbvtkSegmentationConnectivity.cxx | 42 ++++-- packages/vtk/src/bbvtkSliceImage.cxx | 13 +- packages/vtk/src/bbvtkSphereList.cxx | 7 + .../vtk/src/bbvtkStructuredPointsReader.cxx | 5 + packages/vtk/src/bbvtkSurfaceTexture.cxx | 9 +- packages/vtk/src/bbvtkTemporalPicker.cxx | 7 + packages/vtk/src/bbvtkUnMosaic.cxx | 17 ++- packages/vtk/src/bbvtkUnaryOperations.cxx | 5 + .../vtk/src/bbvtkVecImageGaussianSmooth.cxx | 8 ++ .../vtk/src/bbvtkVecIsoSurfaceExtractor.cxx | 12 ++ packages/vtk/src/bbvtkVolumeRenderer.cxx | 6 + packages/wxvtk/src/bbwxvtkViewer2D.cxx | 22 ++- .../wxvtk/src/wxVTKRenderWindowInteractor.cxx | 10 +- .../wxvtk/src/wxVTKRenderWindowInteractor.h | 7 + packages/wxvtk/src/wxvtkImageViewer2.cxx | 55 ++++++++ packages/wxvtk/src/wxvtkImageViewer2.h | 7 + 32 files changed, 551 insertions(+), 38 deletions(-) diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h index 0bf9acc..615af26 100644 --- a/kernel/src/bbtkVtkBlackBoxMacros.h +++ b/kernel/src/bbtkVtkBlackBoxMacros.h @@ -93,14 +93,29 @@ */ +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + //=========================================================================== /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input -#define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE) \ - public: \ - TYPE bbGetInput##NAME () \ - { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \ - void bbSetInput##NAME (TYPE d) \ - { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); } + #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE) \ + public: \ + TYPE bbGetInput##NAME () \ + { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \ + void bbSetInput##NAME (TYPE d) \ + { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); } +#else +//=========================================================================== +/// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input + #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE) \ + public: \ + TYPE bbGetInput##NAME () \ + { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \ + void bbSetInput##NAME (TYPE d) \ + { if (mVtkObject) mVtkObject->SetInputData( (vtkDataObject*) d); } + +#endif + //=========================================================================== @@ -126,6 +141,11 @@ //=========================================================================== //=========================================================================== + +//EED 2017-01-01 Migration VTK7 + +#if (VTK_MAJOR_VERSION <= 5) + /// Declares a vtkAlgorithm-inherited AtomicBlackBox input #define BBTK_DECLARE_VTK_INPUT(NAME,TYPE) \ public: \ @@ -135,6 +155,24 @@ void bbSetInput##NAME (TYPE d) \ { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); } +#endif + + + +#if (VTK_MAJOR_VERSION >= 6) + +/// Declares a vtkAlgorithm-inherited AtomicBlackBox input +#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE) \ + public: \ + TYPE bbGetInput##NAME () \ + { if (mVtkObject) return dynamic_cast(mVtkObject->GetInput()); \ + return 0;} \ + void bbSetInput##NAME (TYPE d) \ + { if (mVtkObject) mVtkObject->SetInputData( (vtkDataObject*) d); } + +#endif + + //=========================================================================== //=========================================================================== diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 197ed03..9d945b1 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -59,14 +59,21 @@ vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage() sizeZ = 1; vtkImageData *newImage = vtkImageData::New(); newImage->Initialize(); - newImage->SetScalarTypeToUnsignedChar(); newImage->SetSpacing( 1,1,1 ); newImage->SetDimensions( sizeX,sizeY,sizeZ ); - newImage->SetWholeExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 ); newImage->SetExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 ); + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + newImage->SetWholeExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 ); + newImage->SetScalarTypeToUnsignedChar(); newImage->SetNumberOfScalarComponents(1); newImage->AllocateScalars(); newImage->Update(); +#else + newImage->AllocateScalars(VTK_UNSIGNED_CHAR,1); +#endif + memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 ); for (i=0; i ::SetInput( vtkImageData * inputImage ) { +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 m_Exporter->SetInput( inputImage ); +#else + m_Exporter->SetInputData( inputImage ); +#endif } diff --git a/packages/vtk/src/bbvtkAppendPolyData.xml b/packages/vtk/src/bbvtkAppendPolyData.xml index cb8dd86..5ff9389 100644 --- a/packages/vtk/src/bbvtkAppendPolyData.xml +++ b/packages/vtk/src/bbvtkAppendPolyData.xml @@ -19,11 +19,23 @@ 
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   bbGetVtkObject()->SetInput(bbGetInputIn1());
   bbGetVtkObject()->SetInput(bbGetInputIn2());
   bbGetVtkObject()->SetInput(bbGetInputIn3());
   bbGetVtkObject()->SetInput(bbGetInputIn4());
   bbGetVtkObject()->SetInput(bbGetInputIn5());
+#else
+  bbGetVtkObject()->SetInputData(bbGetInputIn1());
+  bbGetVtkObject()->SetInputData(bbGetInputIn2());
+  bbGetVtkObject()->SetInputData(bbGetInputIn3());
+  bbGetVtkObject()->SetInputData(bbGetInputIn4());
+  bbGetVtkObject()->SetInputData(bbGetInputIn5());
+#endif
+
    
   bbGetVtkObject()->Update();
diff --git a/packages/vtk/src/bbvtkInversCrop.cxx b/packages/vtk/src/bbvtkInversCrop.cxx index 97963bc..8581943 100644 --- a/packages/vtk/src/bbvtkInversCrop.cxx +++ b/packages/vtk/src/bbvtkInversCrop.cxx @@ -34,7 +34,13 @@ void InversCrop::Process() int dim[3]; int ext[6]; +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) bbGetInputImageFix()->GetWholeExtent(ext); +#endif +#if (VTK_MAJOR_VERSION >= 6) + bbGetInputImageFix()->GetExtent(ext); +#endif dim[0]= ext[1]-ext[0]+1; dim[1]= ext[3]-ext[2]+1; dim[2]= ext[5]-ext[4]+1; @@ -43,10 +49,16 @@ void InversCrop::Process() { _imageoutput = vtkImageData::New(); _imageoutput->Initialize(); - _imageoutput->SetScalarType( bbGetInputImageFix()->GetScalarType() ); _imageoutput->SetSpacing( bbGetInputImageFix()->GetSpacing() ); _imageoutput->SetDimensions( dim[0], dim[1], dim[2] ); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) + _imageoutput->SetScalarType( bbGetInputImageFix()->GetScalarType() ); _imageoutput->AllocateScalars(); +#endif +#if (VTK_MAJOR_VERSION >= 6) + _imageoutput->AllocateScalars(bbGetInputImageFix()->GetScalarType() , 1); +#endif } if (bbGetInputType()==1) { @@ -62,7 +74,14 @@ void InversCrop::Process() int j,k; int px,py,pz; +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) bbGetInputImageMove()->GetWholeExtent(ext); +#endif +#if (VTK_MAJOR_VERSION >= 6) + bbGetInputImageMove()->GetExtent(ext); +#endif + int dimMoveX = ext[1]-ext[0]+1; int dimMoveY = ext[3]-ext[2]+1; int dimMoveZ = ext[5]-ext[4]+1; diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index c1bf38d..c822385 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -125,12 +125,24 @@ namespace bbvtk double ranges[2]; vtkImageData *image = bbGetInputIn(); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) image->Update(); +#endif +#if (VTK_MAJOR_VERSION >= 6) + // .. +#endif image->GetScalarRange(ranges); scale = 255/(ranges[1]/100); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) mCast->SetInput( bbGetInputIn() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + mCast->SetInputData( bbGetInputIn() ); +#endif mCast->SetScale( scale / 100.0 ); //mCast->SetShift( -bbGetInputShift() ); @@ -212,7 +224,14 @@ namespace bbvtk mMapper = vtkVolumeRayCastMapper::New(); mMapper->SetVolumeRayCastFunction(mMIP); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) mMapper->SetInput(mCast->GetOutput()); // (smoother.GetOutput()) +#endif +#if (VTK_MAJOR_VERSION >= 6) + mMapper->SetInputData(mCast->GetOutput()); // (smoother.GetOutput()) +#endif mVolume = vtkVolume::New(); mVolume->SetMapper(mMapper); diff --git a/packages/vtk/src/bbvtkMagnitud.cxx b/packages/vtk/src/bbvtkMagnitud.cxx index db2fdec..c0e21ce 100644 --- a/packages/vtk/src/bbvtkMagnitud.cxx +++ b/packages/vtk/src/bbvtkMagnitud.cxx @@ -59,24 +59,54 @@ void Magnitud::Process() vGreenToRedLut->Build(); //Input Data +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vVecMagnitude->SetInput(bbGetInputIn()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vVecMagnitude->SetInputData(bbGetInputIn()); +#endif + vVecMagnitude->NormalizeOff(); vVecMagnitude->Update(); vVecMagnitude->GetOutput()->GetScalarRange( range1 ); vVecMagnitude->Update(); //Glyph +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vMaskPoint->SetInput(bbGetInputIn()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vMaskPoint->SetInputData(bbGetInputIn()); +#endif + vMaskPoint->SetOnRatio(100); vMaskPoint->Update(); vMaskPoint->RandomModeOn(); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vGlyph->SetInput(vMaskPoint->GetOutput()); vGlyph->SetSource(cone->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vGlyph->SetInputData(vMaskPoint->GetOutput()); + vGlyph->SetSourceData(cone->GetOutput()); +#endif + vGlyph->SetScaleModeToScaleByVector(); vGlyph->SetColorModeToColorByVector(); vGlyph->SetScaleFactor(0.20); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vGlyphMapper->SetInput( vGlyph->GetOutput() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vGlyphMapper->SetInputData( vGlyph->GetOutput() ); +#endif + step = (range1[1]-range1[0])/10; //Contour @@ -84,7 +114,13 @@ void Magnitud::Process() dRangeColorForMultipleContourVelocity[1]=1; dRangeColorForGlyphVelocity[0]=0; dRangeColorForGlyphVelocity[1]=1; +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vMultipleContourVelocity->SetInput((vtkDataSet *) vVecMagnitude->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vMultipleContourVelocity->SetInputData((vtkDataSet *) vVecMagnitude->GetOutput()); +#endif index = 0; double h; @@ -96,7 +132,14 @@ void Magnitud::Process() index+=1; } +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vMultipleContourMapper->SetInput( vMultipleContourVelocity->GetOutput() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vMultipleContourMapper->SetInputData( vMultipleContourVelocity->GetOutput() ); +#endif + vMultipleContourMapper->SetScalarRange( range1 ); vMultipleContourMapper->SetLookupTable( vGreenToRedLut ); vMultipleContourMapper->Update(); @@ -109,8 +152,16 @@ void Magnitud::Process() vGlyphMapper->ImmediateModeRenderingOn(); //Outline Grid +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vOutlineGrid->SetInput( bbGetInputIn() ); vOutlineMapper->SetInput(vOutlineGrid->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vOutlineGrid->SetInputData( bbGetInputIn() ); + vOutlineMapper->SetInputData(vOutlineGrid->GetOutput()); +#endif + //Outline Grid Actor vOutlineActor->SetMapper(vOutlineMapper); @@ -192,7 +243,13 @@ void Magnitud::Process() //End: Change values by the user /////////////////////////////////////////////////////////////////////////////////////////////////// //The Plane Widget +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vPlaneWidget->SetInput(bbGetInputIn()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vPlaneWidget->SetInputData(bbGetInputIn()); +#endif vPlaneWidget->NormalToXAxisOn(); vPlaneWidget->NormalToZAxisOn(); vPlaneWidget->SetResolution(1); @@ -203,7 +260,7 @@ void Magnitud::Process() vPlaneWidget->On(); vPlaneWidget->GetOrigin(p0); - vPlaneWidget->GetCenter(c); //These is from Execute Method + vPlaneWidget->GetCenter(c); //These is fromvtkImageMathematics Execute Method vPlaneWidget->GetNormal(n); vPlaneWidget->GetPoint1(p1); vPlaneWidget->GetPoint2(p2); @@ -228,7 +285,14 @@ void Magnitud::Process() vDiskSourceEED->SetCircumferentialResolution (20); //Stream Lines +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vPointWidget->SetInput( bbGetInputIn() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vPointWidget->SetInputData( bbGetInputIn() ); +#endif + vPointWidget->AllOff(); vPointWidget->PlaceWidget(); //vPointWidget->SetInteractor(vIren); @@ -246,8 +310,16 @@ void Magnitud::Process() source->SetCenter( c ); source->SetRadius(5.0); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) streamer->SetInput( bbGetInputIn() ); streamer->SetSource(source->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + streamer->SetInputData( bbGetInputIn() ); + streamer->SetSourceData(source->GetOutput()); +#endif + streamer->SetIntegratorTypeToRungeKutta45(); streamer->SetMaximumPropagation(500000); //EED streamer->SetMaximumPropagationUnitToTimeUnit (); @@ -257,13 +329,28 @@ void Magnitud::Process() //EED streamer->ComputeVorticityOn (); streamer->Update(); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) rf->SetInput(streamer->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + rf->SetInputData(streamer->GetOutput()); +#endif + rf->SetRadius(.5); rf->SetNumberOfSides(12); rf->SetVaryRadiusToVaryRadiusOff(); streamer->GetOutput()->GetScalarRange( range ); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) streamMapper2->SetInput(rf->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + streamMapper2->SetInputData(rf->GetOutput()); +#endif + streamMapper2->SetLookupTable(vGreenToRedLut); //vStreamlineActor2->SetMapper( streamMapper2 ); @@ -285,31 +372,62 @@ void Magnitud::Process() //End: Part of the Execute Method ////////////////////////////////////////////////////////////////////////////////////// - vtransformpolydatafilter->SetInput( vDiskSourceEED->GetOutput() ); vtransformpolydatafilter->SetTransform( transformEED ); - vtransformpolydatafilter->Update(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) + vtransformpolydatafilter->SetInput( vDiskSourceEED->GetOutput() ); vProbeslices->SetInput( ( vtkDataSet* )vtransformpolydatafilter->GetOutput()); vProbeslices->SetSource( bbGetInputIn() ); - vProbeslices->Update( ); - vGlyphFlowPlane->SetInput(vProbeslices->GetOutput()); vGlyphFlowPlane->SetSource(vArrowSource->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vtransformpolydatafilter->SetInputData( vDiskSourceEED->GetOutput() ); + vProbeslices->SetInputData( ( vtkDataSet* )vtransformpolydatafilter->GetOutput()); + vProbeslices->SetSourceData( bbGetInputIn() ); + vGlyphFlowPlane->SetInputData(vProbeslices->GetOutput()); + vGlyphFlowPlane->SetSourceData(vArrowSource->GetOutput()); +#endif + + vtransformpolydatafilter->Update(); + vProbeslices->Update( ); + + vGlyphFlowPlane->SetScaleModeToScaleByVector(); vGlyphFlowPlane->SetColorModeToColorByVector(); vGlyphFlowPlane->SetScaleFactor(0.2); vGlyphFlowPlane->Update(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vProbeslicesFlowWidget->SetInput( ( vtkDataSet* )vPlanSource->GetOutput()); vProbeslicesFlowWidget->SetSource( vVecMagnitude->GetOutput() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vProbeslicesFlowWidget->SetInputData( ( vtkDataSet* )vPlanSource->GetOutput()); + vProbeslicesFlowWidget->SetSourceData( vVecMagnitude->GetOutput() ); +#endif + vProbeslicesFlowWidget->Update( ); vVecMagnitude->GetOutput()->GetScalarRange( range ); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) vAppendDataForFlowWidgetVisualisation->AddInput(vGlyphFlowPlane->GetOutput()); vAppendDataForFlowWidgetVisualisation->AddInput(vProbeslicesFlowWidget->GetPolyDataOutput()); - vSliceMapper->SetInput( vAppendDataForFlowWidgetVisualisation->GetOutput()); +#endif +#if (VTK_MAJOR_VERSION >= 6) + vAppendDataForFlowWidgetVisualisation->AddInputData(vGlyphFlowPlane->GetOutput()); + vAppendDataForFlowWidgetVisualisation->AddInputData(vProbeslicesFlowWidget->GetPolyDataOutput()); + vSliceMapper->SetInputData( vAppendDataForFlowWidgetVisualisation->GetOutput()); +#endif + vSliceMapper->SetScalarRange( range ); vSliceMapper->SetLookupTable( vGreenToRedLut ); diff --git a/packages/vtk/src/bbvtkMaskPoint.cxx b/packages/vtk/src/bbvtkMaskPoint.cxx index c192648..58a2c73 100644 --- a/packages/vtk/src/bbvtkMaskPoint.cxx +++ b/packages/vtk/src/bbvtkMaskPoint.cxx @@ -26,14 +26,19 @@ void MaskPoint::Process() // * TYPE is the C++ type of the input/output // (the one provided in the attribute 'type' of the tag 'input') -printf("EED MaskPoint::Process Start\n"); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) maskpoints->SetInput( bbGetInputIn() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + maskpoints->SetInputData( bbGetInputIn() ); +#endif + maskpoints->SetOnRatio( bbGetInputRatio() ); maskpoints->RandomModeOn(); maskpoints->SetMaximumNumberOfPoints(5000); maskpoints->Update(); bbSetOutputOut( maskpoints->GetOutput() ); -printf("EED MaskPoint::Process End\n"); } //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) diff --git a/packages/vtk/src/bbvtkMetaImageWriter.xml b/packages/vtk/src/bbvtkMetaImageWriter.xml index 0a09e3c..21f22d7 100644 --- a/packages/vtk/src/bbvtkMetaImageWriter.xml +++ b/packages/vtk/src/bbvtkMetaImageWriter.xml @@ -16,7 +16,14 @@ 
    vtkMetaImageWriter* w = vtkMetaImageWriter::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    bbGetInputIn()->Update();
+#else
+	// ...
+#endif
 
 /*
    if (bbGetInputIn() == 0)
@@ -32,7 +39,13 @@
 
   if (bbGetInputIn()!=NULL)
   {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
      w->SetInput(bbGetInputIn());
+#else
+     w->SetInputData(bbGetInputIn());
+#endif
      w->SetCompression(bbGetInputCompression());  
      w->SetFileDimensionality(bbGetInputIn()->GetDataDimension()); // NTU
      std::string userGivenName = bbGetInputFilename();
diff --git a/packages/vtk/src/bbvtkPlaneClipPolyData.cxx b/packages/vtk/src/bbvtkPlaneClipPolyData.cxx
index e3432ee..9e63987 100644
--- a/packages/vtk/src/bbvtkPlaneClipPolyData.cxx
+++ b/packages/vtk/src/bbvtkPlaneClipPolyData.cxx
@@ -26,7 +26,14 @@ void PlaneClipPolyData::Process()
 	plane->SetNormal(normal[0],normal[1],normal[2]);
 
 	vtkClipPolyData* clipper = vtkClipPolyData::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	clipper->SetInputConnection(inPolyData->GetProducerPort());
+#else
+	clipper->SetInputData(inPolyData);
+#endif
+
 	clipper->SetClipFunction(plane);
 	clipper->Update();
 
diff --git a/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx b/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx
index e6bc5b6..2f7c44f 100644
--- a/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx
+++ b/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx
@@ -82,9 +82,14 @@ void PolyDataReaderPlus::Process()
 	vtkActor *actor = (vtkActor*)bbGetOutputOutActor();
 	vtkPolyDataMapper *mapper = vtkPolyDataMapper::New();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	mapper->SetInput(informacion);
-	actor->SetMapper(mapper);
+#else
+	mapper->SetInputData(informacion);
+#endif
 
+	actor->SetMapper(mapper);
 	bbSetOutputOutActor(actor);
 
 	if (bbGetInputInColor().size()  >= 3)
diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 58852e8..0a2fdfd 100644
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -110,7 +110,13 @@ namespace bbvtk
 
 		if (bbGetInputActive()==true)
 		{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			 polydatamapper->SetInput( bbGetInputIn() );
+#else
+			 polydatamapper->SetInputData( bbGetInputIn() );
+#endif
+
 			 vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
 			 vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
 			   
diff --git a/packages/vtk/src/bbvtkPolyDataWriter.xml b/packages/vtk/src/bbvtkPolyDataWriter.xml
index a2a583c..9fec3be 100644
--- a/packages/vtk/src/bbvtkPolyDataWriter.xml
+++ b/packages/vtk/src/bbvtkPolyDataWriter.xml
@@ -16,8 +16,6 @@
  
  
 
-     printf("EED PolyDataWriter::Process() %s\n", bbGetInputFilename().c_str());
-
    vtkPolyDataWriter* w = vtkPolyDataWriter::New();
    if (bbGetInputFileType()==0) 
 	{
@@ -25,8 +23,15 @@
 	} else {
 		w->SetFileTypeToBinary();
 	}
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    bbGetInputIn()->Update();
    w->SetInput(bbGetInputIn());
+#else
+   w->SetInputData(bbGetInputIn());
+#endif
+
    w->SetFileName(bbGetInputFilename().c_str());
    w->Update();   
    w->Write();
diff --git a/packages/vtk/src/bbvtkPolyDataWriterPlus.cxx b/packages/vtk/src/bbvtkPolyDataWriterPlus.cxx
index bca2a1c..0c9de87 100755
--- a/packages/vtk/src/bbvtkPolyDataWriterPlus.cxx
+++ b/packages/vtk/src/bbvtkPolyDataWriterPlus.cxx
@@ -87,7 +87,14 @@ void PolyDataWriterPlus::Process()
 
 
 	vtkDataSetSurfaceFilter* surfaceFilter = vtkDataSetSurfaceFilter::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	surfaceFilter->SetInput(entrada);
+#else
+	surfaceFilter->SetInputData(entrada);
+#endif
+
 	surfaceFilter->Update();
 	//vtkPolyData* polydata = surfaceFilter->GetOutput();
 	entrada = surfaceFilter->GetOutput();
@@ -95,7 +102,14 @@ void PolyDataWriterPlus::Process()
 	if (extension.compare("vtk") == 0)
 	{
 		vtkPolyDataWriter* writer = vtkPolyDataWriter::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		writer->SetInput(entrada);
+#else
+		writer->SetInputData(entrada);
+#endif
+
 		writer->SetFileName(nuevo_nombre.data());
 		writer->Write();
 		writer->Delete();
@@ -105,7 +119,14 @@ void PolyDataWriterPlus::Process()
 	{
 		vtkXMLPolyDataWriter* writer = vtkXMLPolyDataWriter::New();
 		writer->SetFileName ( nuevo_nombre.data() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		writer->SetInput ( entrada );
+#else
+		writer->SetInputData ( entrada );
+#endif
+
 		writer->Write();
 		writer->Delete();
 	}
@@ -114,7 +135,14 @@ void PolyDataWriterPlus::Process()
 	{
 		vtkSTLWriter* writer = vtkSTLWriter::New();
 		writer->SetFileName ( nuevo_nombre.data() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		writer->SetInput ( entrada );
+#else
+		writer->SetInputData ( entrada );
+#endif
+
 		writer->Write();
 		writer->Print(std::cout);
 		writer->Delete();
diff --git a/packages/vtk/src/bbvtkProbeFilter.cxx b/packages/vtk/src/bbvtkProbeFilter.cxx
index 4007cfb..6dc66a9 100644
--- a/packages/vtk/src/bbvtkProbeFilter.cxx
+++ b/packages/vtk/src/bbvtkProbeFilter.cxx
@@ -26,16 +26,19 @@ void ProbeFilter::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-printf("EED ProbeFilter::Process() Start\n");
-
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
       _probefilter->SetSource( bbGetInputSource() ); 
       _probefilter->SetInput( bbGetInputInput() ); 
+#else
+      _probefilter->SetSourceData( bbGetInputSource() ); 
+      _probefilter->SetInputData( bbGetInputInput() ); 
+#endif
+
       _probefilter->Update();
       bbSetOutputOut( _probefilter->GetOutput() );
 
-printf("EED ProbeFilter::Process() End\n");
-
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index 117b979..9262c50 100644
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
@@ -110,17 +110,36 @@ void RescaleSlopeIntercept::Process()
 			shift= A + (range[1]*newdifrange/difrange);
 		} // if type 3
 		
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		filter1->SetInput( bbGetInputIn() );
+#else
+		filter1->SetInputData( bbGetInputIn() );
+#endif
+
 		filter1->SetOutputScalarType( VTK_DOUBLE );
 		filter1->SetShift( 0 );
 		filter1->SetScale( scale );
 		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		filter2->SetInput( filter1->GetOutput() );
+#else
+		filter2->SetInputData( filter1->GetOutput() );
+#endif
+
 		filter2->SetOutputScalarType( outputformat );
 		filter2->SetShift( shift );
 		filter2->SetScale( 1 );
 		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		mchange->SetInput( filter2->GetOutput() );
+#else
+		mchange->SetInputData( filter2->GetOutput() );
+#endif
+
 		mchange->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
 		mchange->SetOutputSpacing (spc);
 		mchange->Update();    //important
diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index 3b28389..a04f6bd 100644
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -84,15 +84,27 @@ namespace bbvtk
 	{
 
 		thresh2 = vtkImageThreshold::New();
-			thresh2->SetInValue(255);
-			thresh2->SetOutputScalarTypeToUnsignedChar();
+		thresh2->SetInValue(255);
+		thresh2->SetOutputScalarTypeToUnsignedChar();
 		connect2 = vtkImageSeedConnectivity::New();
-			connect2->SetInput(thresh2->GetOutput());
-			connect2->SetInputConnectValue(255);
-			connect2->SetOutputConnectedValue( 255 );
-			connect2->SetOutputUnconnectedValue(0);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		connect2->SetInput(thresh2->GetOutput());
+#else
+		connect2->SetInputData(thresh2->GetOutput());
+#endif
+
+		connect2->SetInputConnectValue(255);
+		connect2->SetOutputConnectedValue( 255 );
+		connect2->SetOutputUnconnectedValue(0);
 		cast4 = vtkImageCast::New();
-			cast4->SetInput(connect2->GetOutput());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		cast4->SetInput(connect2->GetOutput());
+#else
+		cast4->SetInputData(connect2->GetOutput());
+#endif
 
 // EED 2016 06 15
 
@@ -157,18 +169,32 @@ namespace bbvtk
 	{
 		int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
 		vtkImageData *imagedata = bbGetInputIn();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imagedata->UpdateInformation();
 		imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
 		imagedata->Update();
-		thresh2->ThresholdBetween(3000, 3001);
 		thresh2->SetInput(imagedata);
+#else
+		imagedata->SetExtent(imagedata->GetExtent());
+		thresh2->SetInputData(imagedata);
+#endif
+
+		thresh2->ThresholdBetween(3000, 3001);
 		thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
 		thresh2->Modified();
 		thresh2->Update();
 		connect2->RemoveAllSeeds ();
 
 		int ext[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imagedata->GetWholeExtent(ext);
+#else
+		imagedata->GetExtent(ext);
+#endif
+
 		int maxX = ext[1]-ext[0]+1;
 		int maxY = ext[3]-ext[2]+1;
 		int maxZ = ext[5]-ext[4]+1;
diff --git a/packages/vtk/src/bbvtkSliceImage.cxx b/packages/vtk/src/bbvtkSliceImage.cxx
index 2088b48..4e82b55 100755
--- a/packages/vtk/src/bbvtkSliceImage.cxx
+++ b/packages/vtk/src/bbvtkSliceImage.cxx
@@ -67,10 +67,15 @@ void SliceImage::Process()
 		final = vtkImageData::New();
 		final->SetSpacing(space);
 		final->SetDimensions(newDim);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		final->SetScalarType(scalar_type);
 		final->AllocateScalars();
 		final->Update();
-
+#else
+		final->AllocateScalars(scalar_type,1);
+#endif
 
 	}
 
@@ -140,7 +145,13 @@ void SliceImage::Process()
 	}
 
 	caster = vtkImageCast::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	caster->SetInput(final);
+#else
+	caster->SetInputData(final);
+#endif
+
 	caster->SetOutputScalarTypeToShort();
 	caster->Update();
 
diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 616f088..24538a7 100644
--- a/packages/vtk/src/bbvtkSphereList.cxx
+++ b/packages/vtk/src/bbvtkSphereList.cxx
@@ -135,7 +135,14 @@ void SphereList::Process()
 					newSphere -> SetPhiResolution(20);
 					newSphere -> SetRadius( 1 ); 
 					vtkPolyDataMapper * newMapper = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 					newMapper -> SetInput( newSphere -> GetOutput() );	
+#else
+					newMapper -> SetInputData( newSphere -> GetOutput() );	
+#endif
+
 					vtkActor * newActor = vtkActor::New();
 					sphereActor.push_back(newActor);
 					newActor -> SetMapper(newMapper);
diff --git a/packages/vtk/src/bbvtkStructuredPointsReader.cxx b/packages/vtk/src/bbvtkStructuredPointsReader.cxx
index 930eb90..4dd352b 100644
--- a/packages/vtk/src/bbvtkStructuredPointsReader.cxx
+++ b/packages/vtk/src/bbvtkStructuredPointsReader.cxx
@@ -60,7 +60,12 @@ void StructuredPointsReader::Process()
 	{
 		spr -> SetFileName( bbGetInputIn().c_str() );
 		sp = spr->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		sp -> Update();
+#else
+		spr -> Update();
+#endif
 		bbSetOutputOut( sp );
 	} else {
 		bbSetOutputOut( NULL );
diff --git a/packages/vtk/src/bbvtkSurfaceTexture.cxx b/packages/vtk/src/bbvtkSurfaceTexture.cxx
index 3e0f81a..119e612 100644
--- a/packages/vtk/src/bbvtkSurfaceTexture.cxx
+++ b/packages/vtk/src/bbvtkSurfaceTexture.cxx
@@ -33,7 +33,6 @@ void SurfaceTexture::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <GetSpacing(spc);
 	bbGetInputImage()->GetScalarRange(range);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	bbGetInputImage()->GetWholeExtent(ext);
+#else
+	bbGetInputImage()->GetExtent(ext);
+#endif
+
 	int maxX = ext[1]-ext[0]+1;
 	int maxY = ext[3]-ext[2]+1;
 	int maxZ = ext[5]-ext[4]+1;
diff --git a/packages/vtk/src/bbvtkTemporalPicker.cxx b/packages/vtk/src/bbvtkTemporalPicker.cxx
index db9240b..de51251 100644
--- a/packages/vtk/src/bbvtkTemporalPicker.cxx
+++ b/packages/vtk/src/bbvtkTemporalPicker.cxx
@@ -59,7 +59,14 @@ void TemporalPicker::Process()
 	{
 		int ext[6];
 		int sizeX,sizeY,sizeZ;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		bbGetInputIn()->GetWholeExtent(ext);
+#else
+		bbGetInputIn()->GetExtent(ext);
+#endif
+
 		sizeX=ext[1]-ext[0]+1;
 		sizeY=ext[3]-ext[2]+1;
 		sizeZ=ext[5]-ext[4]+1;
diff --git a/packages/vtk/src/bbvtkUnMosaic.cxx b/packages/vtk/src/bbvtkUnMosaic.cxx
index 49c617e..5e2209f 100644
--- a/packages/vtk/src/bbvtkUnMosaic.cxx
+++ b/packages/vtk/src/bbvtkUnMosaic.cxx
@@ -113,7 +113,13 @@ vtkImageData * UnMosaic::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int
    int outputdims[3];
    imageIn->GetDimensions (inputdims);
    unsigned short *input = (unsigned short *)(imageIn->GetScalarPointer());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    imageIn->Update();
+#else
+	// .. 
+#endif
      
    unsigned int div = (unsigned int)ceil(sqrt( (double)numberOfImagesInMosaic ) );
    outputdims[0] = inputdims[0] / div;
@@ -124,12 +130,21 @@ vtkImageData * UnMosaic::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int
     vtkImageOut = vtkImageData::New();
     vtkImageOut->SetDimensions( outputdims );
     vtkImageOut->SetExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
-    vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
+ 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+   vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
     vtkImageOut->SetNumberOfScalarComponents(1);
 //vtkImageOut->SetSpacing( blabla );
     vtkImageOut->SetScalarType( VTK_UNSIGNED_SHORT );
     vtkImageOut->AllocateScalars();
     vtkImageOut->Update();
+#else
+    vtkImageOut->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
+
+
+
     
     unsigned short *output =(unsigned short *)(vtkImageOut->GetScalarPointer());
 
diff --git a/packages/vtk/src/bbvtkUnaryOperations.cxx b/packages/vtk/src/bbvtkUnaryOperations.cxx
index 706949f..f2db953 100644
--- a/packages/vtk/src/bbvtkUnaryOperations.cxx
+++ b/packages/vtk/src/bbvtkUnaryOperations.cxx
@@ -54,7 +54,12 @@ void UnaryOperations::Process()
 		return;
 	}
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	ope->SetInput1((vtkDataObject*)bbGetInputIn1());
+#else
+	ope->SetInput1Data((vtkDataObject*)bbGetInputIn1());
+#endif
 
 
 	switch (bbGetInputOperation())
diff --git a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx
index 33af404..689b9b1 100644
--- a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx
+++ b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx
@@ -82,7 +82,15 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecImageGaussianSmooth,bbtk::AtomicBlackBox);
 		for (i=0 ;  iSetInput( bbGetInputIn()[i] );
+#else
+			vtkimagegaussiansmooth->SetInputData( bbGetInputIn()[i] );
+#endif
+
 			vtkimagegaussiansmooth->SetStandardDeviation( stdvX,stdvY, stdvZ ); 
 			vtkimagegaussiansmooth->Modified();
 			vtkimagegaussiansmooth->Update();
diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
index b3b39fb..2e25383 100644
--- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
+++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
@@ -134,7 +134,13 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
 			polydatamapper = vtkPolyDataMapper::New();
 			vtkactor       = vtkActor::New();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			polydatamapper->SetInput(marchingcubes->GetOutput());
+#else
+			polydatamapper->SetInputData(marchingcubes->GetOutput());
+#endif
+
 			vtkactor->SetMapper(polydatamapper);
 
 			polydatamapper->ScalarVisibilityOff();
@@ -150,7 +156,13 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
 			marchingcubes=VecMarchingcubes[i];
 			vtkactor=(vtkActor*)VecVtkactor[i];
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			marchingcubes->SetInput( bbGetInputIn()[i] );
+#else
+			marchingcubes->SetInputData( bbGetInputIn()[i] );
+#endif
+
 			marchingcubes->SetValue(0, bbGetInputIsovalue() );
 			marchingcubes->Update();
 			 
diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index a804e15..a3b39a5 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -126,7 +126,13 @@ void VolumeRenderer::Process()
     bool changed = false;
     if ( bbGetInputStatus("In") != bbtk::UPTODATE )
 	{
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		mMapper->SetInput( bbGetInputIn() );
+#else
+		mMapper->SetInputData( bbGetInputIn() );
+#endif
 	 	changed = true;
     }
 
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 731d497..0ab9c25 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -99,10 +99,16 @@ namespace bbwxvtk
     mDefaultImage->SetDimensions ( dim );
     mDefaultImage->SetSpacing(1,1,1);
     mDefaultImage->SetExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
-    mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+    mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
     mDefaultImage->SetScalarTypeToUnsignedChar();
-    mDefaultImage->AllocateScalars();    
+    mDefaultImage->AllocateScalars();   
+#else
+    mDefaultImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);   
+#endif
+ 
     for (int i=0;ibbGetInputIn()) // Don't update if just Slice changed
 	  {
 	  backImageData = mBox->bbGetInputIn();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	  backImageData->Update();
+#else
+	// ..
+#endif
 	  imageViewer->SetInput( backImageData );
 	  mUpdateCamera = true;
 	  }
@@ -272,7 +283,14 @@ namespace bbwxvtk
     {
 		int z = mBox->bbGetInputSlice();
 		int ext[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		backImageData->GetWholeExtent(ext);
+#else
+		backImageData->GetExtent(ext);
+#endif
+
 		/*
 		std::cout << "ext = "<GetInput();
   if (input)
     {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     input->UpdateInformation();
     int *w_ext = input->GetWholeExtent();
+#else
+    int *w_ext = input->GetExtent();
+#endif
+
     min = w_ext[this->SliceOrientation * 2];
     max = w_ext[this->SliceOrientation * 2 + 1];
     }
@@ -235,8 +248,15 @@ int* wxvtkImageViewer2::GetSliceRange()
   vtkImageData *input = this->GetInput();
   if (input)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     input->UpdateInformation();
+printf("EED Warning wxvtkImageViewer2::GetSliceRange  GetWholeExtent()[2] ??? /n");
     return input->GetWholeExtent() + this->SliceOrientation * 2;
+#else
+printf("EED Warning wxvtkImageViewer2::GetSliceRange  GetExtent()[2] ??? /n");
+    return input->GetExtent() + this->SliceOrientation * 2;
+#endif
     }
   return NULL;
 }
@@ -398,8 +418,13 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
     }
 
   //  std::cout << "--- wxvtkImageViewer2::UpdateDisplayExtent()"<UpdateInformation();
   int *w_ext = input->GetWholeExtent();
+#else
+  int *w_ext = input->GetExtent();
+#endif
 
   // 	std::cout << "ext = "
   //	<IV->GetInput()->UpdateInformation();
         this->IV->GetInput()->SetUpdateExtent
           (this->IV->GetInput()->GetWholeExtent());
         this->IV->GetInput()->Update();
+#else
+  //...
+#endif
+
         double *range = this->IV->GetInput()->GetScalarRange();
         this->IV->SetColorWindow(range[1] - range[0]);
         this->IV->SetColorLevel(0.5 * (range[1] + range[0]));
@@ -668,7 +700,12 @@ void wxvtkImageViewer2::InstallPipeline()
 
   if (this->ImageActor && this->WindowLevel)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     this->ImageActor->SetInput(this->WindowLevel->GetOutput());
+#else
+    this->ImageActor->SetInputData(this->WindowLevel->GetOutput());
+#endif
     }
 }
 
@@ -677,7 +714,12 @@ void wxvtkImageViewer2::UnInstallPipeline()
 {
   if (this->ImageActor)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     this->ImageActor->SetInput(NULL);
+#else
+    this->ImageActor->SetInputData(NULL);
+#endif
     }
 
   if (this->Renderer && this->ImageActor)
@@ -709,8 +751,15 @@ void wxvtkImageViewer2::Render()
 	input)
       {
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
       input->UpdateInformation();
       int *w_ext = input->GetWholeExtent();
+#else
+      int *w_ext = input->GetExtent();
+#endif
+
       int xs = 0, ys = 0;
 
       //	std::cout << "wxvtkImageViewer2::Render ext = "
@@ -784,7 +833,13 @@ int wxvtkImageViewer2::GetOffScreenRendering()
 void wxvtkImageViewer2::SetInput(vtkImageData *in)
 {
   //  std::cout << "### wxvtkImageViewer2::SetInput"<WindowLevel->SetInput(in);
+#else
+  this->WindowLevel->SetInputData(in);
+#endif
+
   this->UpdateDisplayExtent();
   // LG 03/12/08
   //  FirstRender = 1;
diff --git a/packages/wxvtk/src/wxvtkImageViewer2.h b/packages/wxvtk/src/wxvtkImageViewer2.h
index ff097bd..8592ee3 100644
--- a/packages/wxvtk/src/wxvtkImageViewer2.h
+++ b/packages/wxvtk/src/wxvtkImageViewer2.h
@@ -96,7 +96,14 @@ class /*VTK_RENDERING_EXPORT*/ wxvtkImageViewer2 : public vtkObject
 {
 public:
   static wxvtkImageViewer2 *New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   vtkTypeRevisionMacro(wxvtkImageViewer2,vtkObject);
+#else
+  vtkTypeMacro(wxvtkImageViewer2,vtkObject);
+#endif
+
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
-- 
2.45.0