#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

[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 afdaf48a362a2193d29e9a0c78824d6288be27da..4156a3d54492d2c5cb7394dd916002e6892a752f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -54,9 +54,18 @@ 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
+
+
 }
 
 //---------------------------------------------------------------------------
@@ -79,7 +88,7 @@ void FillFilter::Run() // virtual
                memset(pImage, 0, _maxX * _maxY * _maxZ);
 
                FillToolRecursive(_px, _py, _pz);
-               printf("--\n");
+//             printf("--\n");
 
                int ii, jj, kk;
                while (_countRecursiveFillProblem != 0) {
@@ -97,7 +106,7 @@ void FillFilter::Run() // virtual
                                        } // for kk
                                } // for jj
                        } //for ii
-                       printf("-\n");
+//                     printf("-\n");
                } // while
 
        } //if _minX _maxX _minY _maxY _minZ _maxZ