X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FbaseFilterManualPaint.cpp;h=c7f0ad4187f7f2d1498029312ef59970c62e202e;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=909db02c41aac42a13866dfa0ae4dc6c1570361c;hpb=e263b7ace0f53d647a731553a3f67700838ad146;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
index 909db02..c7f0ad4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -37,15 +37,21 @@ baseFilterManualPaint::baseFilterManualPaint()
 	_minX 		= 0;
 	_minY 		= 0;
 	_minZ 		= 0;
-	_maxX 		= 0;
-	_maxY 		= 0;
-	_maxZ 		= 0;
-	_pMinX 		= 0;
-	_pMinY 		= 0;
-	_pMinZ 		= 0;
-	_pMaxX 		= 0;
-	_pMaxY 		= 0;
-	_pMaxZ 		= 0;
+
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	_maxX 		= 0;
+//	_maxY 		= 0;
+//	_maxZ 		= 0;
+//	_pMinX 		= 0;
+//	_pMinY 		= 0;
+//	_pMinZ 		= 0;
+//	_pMaxX 		= 0;
+//	_pMaxY 		= 0;
+//	_pMaxZ 		= 0;
+
+	_dimX 		= 0;
+	_dimY 		= 0;
+	_dimZ 		= 0;
 	_RangeMin 	= 0;
 	_RangeMax	= 6000;
 }
@@ -56,7 +62,7 @@ baseFilterManualPaint::~baseFilterManualPaint() // virtual
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::Run() // virtual
+void baseFilterManualPaint::Run(int px, int py, int pz) // virtual
 {
 }
 
@@ -78,6 +84,7 @@ void baseFilterManualPaint::SetDirection(int direction)
 	_direction = direction;
 }
 
+/* //EED 2020-04-28  BORRAME Change to local variables to use with openmp
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetPoint(int px, int py, int pz) 
 {
@@ -85,7 +92,8 @@ void baseFilterManualPaint::SetPoint(int px, int py, int pz)
 	_py = py;
 	_pz = pz;
 }
-
+*/
+ 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2) 
 {
@@ -112,21 +120,24 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2)
 		_image2->GetExtent(extB);
 #endif
 
-		_maxX = std::min( ext[1]-ext[0] , extB[1]-extB[0] );
-		_maxY = std::min( ext[3]-ext[2] , extB[3]-extB[2] );
-		_maxZ = std::min( ext[5]-ext[4] , extB[5]-extB[4] );
+		_dimX = std::min( ext[1]-ext[0]+1 , extB[1]-extB[0]+1 );
+		_dimY = std::min( ext[3]-ext[2]+1 , extB[3]-extB[2]+1 );
+		_dimZ = std::min( ext[5]-ext[4]+1 , extB[5]-extB[4]+1 );
 	} else {
-		_maxX = ext[1]-ext[0];
-		_maxY = ext[3]-ext[2];
-		_maxZ = ext[5]-ext[4];
+		_dimX = ext[1]-ext[0]+1;
+		_dimY = ext[3]-ext[2]+1;
+		_dimZ = ext[5]-ext[4]+1;
 	} // if
 
 	_OneColumn	= 1;
-	_OneLine	= _maxX+1;
-	_OnePlane	= (_maxX+1)*(_maxY+1);
+	_OneLine	= _dimX;
+	_OnePlane	= _dimX*_dimY;
 }
 
 
+
+/*//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::ResetGeneralMinMax() 
 {
@@ -149,6 +160,8 @@ void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
 	if (_pMaxY < maxY) { _pMaxY = maxY; }
 	if (_pMaxZ < maxZ) { _pMaxZ = maxZ; }
 }
+*/
+
 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::GetScalarRange(double * range)