X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FbaseFilterManualPaint.h;h=35efd9f6c39085c221bb136e58e0d6003940ec45;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=f24066a9a84537871ad1a2add76bb5897749d22b;hpb=25e3adf442d6a8d357d52410267445c54426c525;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
index f24066a..35efd9f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.h
@@ -38,55 +38,59 @@ class baseFilterManualPaint {
 public:
 	baseFilterManualPaint();
 	virtual ~baseFilterManualPaint();
-
 	virtual void SetImages(vtkImageData *image,vtkImageData *image2);
 	void SetPoint(int px, int py, int pz);
 	void Set2D3D(int dim2D3D);
 	void SetGrayLevel(double graylevel);
 	void SetDirection(int direction);
-	void ResetGeneralMinMax();
-	void SetGeneralMinMax(int minX, int maxX, int minY, int maxY, int minZ, int maxZ);
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	void ResetGeneralMinMax();
+//	void SetGeneralMinMax(int minX, int maxX, int minY, int maxY, int minZ, int maxZ);
 	void GetScalarRange(double * range);
-
     void SetRangeMin( int min );//DFCH
     void SetRangeMax( int max );//DFCH
     int GetRangeMin( ); //DFCH
     int GetRangeMax( ); //DFCH
-
 	ImageMManager* GetImageMManager(); //DFCH
 	void CleanImageMManager(); //DFCH
-	virtual void Run();
-
+	virtual void Run(int px, int py, int pz);
 private:
-
 protected:
 	ImageMManager 	*_IMManager; //Saves the last modified region (MinX, MaxX, MinY, MaxY, MinZ, MaxZ).
 	vtkImageData 	*_image;
 	vtkImageData 	*_image2;
 	int 			_direction;
-	int 			_px; // start point of the brush
-	int 			_py;
-	int 			_pz;
-	int 			_pMinX; // General min max of many brush actions
-	int 			_pMinY;
-	int 			_pMinZ;
-	int 			_pMaxX;
-	int 			_pMaxY;
-	int 			_pMaxZ;
 	int 			_minX; // min max of the image
-	int 			_maxX;
 	int 			_minY;
-	int 			_maxY;
 	int 			_minZ;
-	int 			_maxZ;
-	long int		_OneColumn;
-	long int		_OneLine;
-	long int		_OnePlane;
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	int 			_px; // start point of the brush
+//	int 			_py;
+//	int 			_pz;
+//	int 			_maxX;
+//	int 			_maxY;
+//	int 			_maxZ;
+//	int 			_pMinX; // General min max of many brush actions
+//	int 			_pMinY;
+//	int 			_pMinZ;
+//	int 			_pMaxX;
+//	int 			_pMaxY;
+//	int 			_pMaxZ;
+
+	int 			_dimX;
+	int 			_dimY;
+	int 			_dimZ;
 	bool 			_2D3D;
 	double 			_graylevel;
     int    			_RangeMin;
     int    			_RangeMax;
 
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+	long int		_OneColumn;
+	long int		_OneLine;
+	long int		_OnePlane;
+
 
 };