#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
index 03ac7a3a7e6d0a193a1dca961bf03a748b10b6f4..0be4fd8d23cce53066303d8ab8a5ca96fdb19a1f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.h
@@ -34,11 +34,11 @@ public:
        FillFilter();
        virtual ~FillFilter();
     void                       Run();
-       void                    FillToolLoop(int px, int py, int pz,long int iviA) ;
+       void                    FillToolLoop(int px, int py, int pz);
     void                       SetToleranceFill(double tolerancefill);
     void                       SetDistanceFill(int distancefill);
     virtual void       SetImages(vtkImageData *image,vtkImageData *image2);
-       vtkImageData*   GetAuxImageFill();
+//     vtkImageData*   GetAuxImageFill();
 private:
     double          _tolerancefill;
     int             _distancefill;
@@ -46,21 +46,31 @@ private:
     double          _distbasefill;
     double          _tmpiglfill;
     double          _tmpiglfill2;
-    vtkImageData    *_auxImageFill;
     bool            _auxGrayLevelValidationFill;
-       int                     _maxXback;
-       int                     _maxYback;
-       int                     _maxZback;
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//   vtkImageData    *_auxImageFill;
+//     int                     _maxXback;
+//     int                     _maxYback;
+//     int                     _maxZback;
+
+vtkImageData* GenerateAuxImageFill(    long int &OneColumnAux, long int &OneLineAux , long int &OnePlaneAux, 
+                                                                       int px,int py,int pz, 
+                                                                       int &pxAux, int &pyAux, int &pzAux );
+
+
 protected:
 
-//DEF_POINTER_IMAGE_VTK_CREA_definition( v_image , ss_image , p_image , st_image )             
+
+//Change to local variables to use with openmp
+// DEF_POINTER_IMAGE_VTK_CREA_definition( v_image , ss_image , p_image , st_image )            
        double                  v_image;
        int                     ss_image;
        char                    *p_image;
        int                             st_image;
 
-//macro not working ???    
-//   DEF_POINTER_IMAGE_VTK_CREA_definition(v_image2,ss_image2,p_image2,st_image2)              
+// //macro not working ???    
+// DEF_POINTER_IMAGE_VTK_CREA_definition(v_image2,ss_image2,p_image2,st_image2)                
        double                  v_image2;
        int                     ss_image2;
        char                    *p_image2;