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=0ca0de29abf6a7a94ab9f68fbfb2d25b696f9970;hpb=2ee213ddb39ae803798099822478e210a6bf0d57;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 0ca0de2..c7f0ad4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -37,17 +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;
 }
@@ -58,38 +62,43 @@ baseFilterManualPaint::~baseFilterManualPaint() // virtual
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::Run() // virtual
+void baseFilterManualPaint::Run(int px, int py, int pz) // virtual
 {
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetGrayLevel(double graylevel) {
+void baseFilterManualPaint::SetGrayLevel(double graylevel) 
+{
 	_graylevel = graylevel;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::Set2D3D(int dim2D3D) {
+void baseFilterManualPaint::Set2D3D(int dim2D3D) 
+{
 	_2D3D = dim2D3D;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::SetDirection(int direction) {
+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) {
+void baseFilterManualPaint::SetPoint(int px, int py, int pz) 
+{
 	_px = px;
 	_py = py;
 	_pz = pz;
 }
-
+*/
+ 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2) 
 {
 	_image 	= image;
 	_image2 = image2;
-
 	int ext[6];
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
@@ -100,7 +109,6 @@ void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2)
 	_minX = 0;
 	_minY = 0;
 	_minZ = 0;
-
 	if (_image2!=NULL)
 	{
 		int extB[6];
@@ -112,19 +120,27 @@ 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	= _dimX;
+	_OnePlane	= _dimX*_dimY;
 }
 
 
+
+/*//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::ResetGeneralMinMax() {
+void baseFilterManualPaint::ResetGeneralMinMax() 
+{
 	_pMinX = 10000;
 	_pMinY = 10000;
 	_pMinZ = 10000;
@@ -135,51 +151,36 @@ void baseFilterManualPaint::ResetGeneralMinMax() {
 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
-		int maxY, int minZ, int maxZ) {
-	if (_pMinX > minX) {
-		_pMinX = minX;
-	}
-
-	if (_pMinY > minY) {
-		_pMinY = minY;
-	}
-
-	if (_pMinZ > minZ) {
-		_pMinZ = minZ;
-	}
-
-	if (_pMaxX < maxX) {
-		_pMaxX = maxX;
-	}
-
-	if (_pMaxY < maxY) {
-		_pMaxY = maxY;
-	}
-
-	if (_pMaxZ < maxZ) {
-		_pMaxZ = maxZ;
-	}
-
+		int maxY, int minZ, int maxZ) 
+{
+	if (_pMinX > minX) { _pMinX = minX; }
+	if (_pMinY > minY) { _pMinY = minY; }
+	if (_pMinZ > minZ) { _pMinZ = minZ; }
+	if (_pMaxX < maxX) { _pMaxX = maxX; }
+	if (_pMaxY < maxY) { _pMaxY = maxY; }
+	if (_pMaxZ < maxZ) { _pMaxZ = maxZ; }
 }
+*/
+
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::GetScalarRange(double * range) {
+void baseFilterManualPaint::GetScalarRange(double * range) 
+{
 	range = this->_image->GetScalarRange();
 }
 
 //---------------------------------------------------------------------------
-ImageMManager* baseFilterManualPaint::GetImageMManager() {
+ImageMManager* baseFilterManualPaint::GetImageMManager() 
+{
 	return (this->_IMManager);
 } //DFCH
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::CleanImageMManager() {
+void baseFilterManualPaint::CleanImageMManager() 
+{
 	this->_IMManager->CleanModifiedRegion();
 } //DFCH
 
-
-
-
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetRangeMin(int min) 
 {
@@ -204,6 +205,3 @@ int baseFilterManualPaint::GetRangeMax()
 	return _RangeMax;
 }
 
-
-
-