3219 creaMaracasVisu Feature New Normal - vtk8itk4wx3-mingw64

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / FillFilter.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index 3f9c7ad0fb9ad34e7e8cc6537c75d52c2e529e73..e2ea0232c6d32dee6a2ab282706ce8d8da9b5f2c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "FillFilter.h"
+#include "creaVtk_MACROS.h"
 
 FillFilter::FillFilter() 
 {
@@ -48,7 +49,9 @@ FillFilter::~FillFilter()
 //---------------------------------------------------------------------------
 void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
 {
-       baseFilterManualPaint::SetImages(image,image2);
+       
+       
+               baseFilterManualPaint::SetImages(image,image2);
        
        if ((_maxX!=_maxXback) || (_maxY!=_maxYback) || (_maxZ!=_maxZback)) 
        {
@@ -60,15 +63,20 @@ void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
                _auxImageFill->SetDimensions(_maxX + 1, _maxY + 1, _maxZ + 1);
                _auxImageFill->SetOrigin(0, 0, 0);
                _auxImageFill->SetExtent(0, _maxX, 0, _maxY, 0, _maxZ);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _auxImageFill->SetWholeExtent(0, _maxX, 0, _maxY, 0, _maxZ);
                _auxImageFill->SetScalarTypeToUnsignedChar();
                _auxImageFill->AllocateScalars();
+#else
+               _auxImageFill->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
                _ptrAuxImageFill = (unsigned char       *)_auxImageFill->GetScalarPointer();
                memset(_ptrAuxImageFill, 0, (_maxX+1) * (_maxY+1) * (_maxZ+1) );
        }
        _maxXback=_maxX;
        _maxYback=_maxY;
-       _maxYback=_maxZ;
+       _maxYback=_maxZ;        
 }
 
 
@@ -125,8 +133,8 @@ void FillFilter::Run() // virtual
 //---------------------------------------------------------------------------
 void FillFilter::FillToolRecursive(int px, int py, int pz,long int ivi) 
 {
-DEFINEPOINTERIMAGE_MANUALPAINT(v_image,ss_image,p_image,st_image,_image)               
-DEFINEPOINTERIMAGE_MANUALPAINT(v_image2,ss_image2,p_image2,st_image2,_image2)          
+DEF_POINTER_IMAGE_VTK_CREA(v_image,ss_image,p_image,st_image,_image)           
+DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)              
 
        _countRecursiveFill++;
        _countProgressingFill++;
@@ -158,13 +166,13 @@ DEFINEPOINTERIMAGE_MANUALPAINT(v_image2,ss_image2,p_image2,st_image2,_image2)
 
 //EED01 
 //             _tmpiglfill     = _image->GetScalarComponentAsDouble(px, py, pz, 0);
-GETVALUE2_MANUALPAINT(_tmpiglfill,p_image,st_image,ivi)        
+GETVALUE2_VTK_CREA(_tmpiglfill,p_image,st_image,ivi)   
 
                if (_image2!=NULL)
                {
 //EED01
 //                     _tmpiglfill2    =       _image2->GetScalarComponentAsDouble(px, py, pz, 0);
-GETVALUE2_MANUALPAINT(_tmpiglfill2,p_image2,st_image2,ivi)     
+GETVALUE2_VTK_CREA(_tmpiglfill2,p_image2,st_image2,ivi)        
                } else {
                        _tmpiglfill2    =       _tmpiglfill;
                }
@@ -214,11 +222,11 @@ GETVALUE2_MANUALPAINT(_tmpiglfill2,p_image2,st_image2,ivi)
                        {
 //EED01
 //                             _image2->SetScalarComponentFromFloat(px, py, pz, 0,(float) _graylevel);
-SETVALUE2_MANUALPAINT(_graylevel,p_image2,st_image2,ivi)
+SETVALUE2_VTK_CREA(_graylevel,p_image2,st_image2,ivi)
                        } else {
 //EED01
 //                             _image->SetScalarComponentFromFloat(px, py, pz, 0,(float) _graylevel);
-SETVALUE2_MANUALPAINT(_graylevel,p_image,st_image,ivi)
+SETVALUE2_VTK_CREA(_graylevel,p_image,st_image,ivi)
                        }
 
                        if (_countRecursiveFill < _limitRecursionFill)