X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FbaseFilterManualPaint.cpp;h=2db1c0f46a83c61182b34ad83b795b0c738e9232;hb=f9901e756bb82bd333310b47607875331616bb29;hp=f326ff525e2820fe53208d728d9111e392ad1b56;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;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 f326ff5..2db1c0f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -25,25 +25,35 @@
 
 #include "baseFilterManualPaint.h"
 
-baseFilterManualPaint::baseFilterManualPaint() {
+baseFilterManualPaint::baseFilterManualPaint() 
+{
 	_IMManager = new ImageMManager();
 	_IMManager->CleanModifiedRegion();
-	_graylevel = 0.0;
-	_2D3D = 1; // 0 2D             ,   1 true 3D
-	_direction = 0; // 1 XZ             ,   0 YZ            ,   2 XY
-	_minX = 0;
-	_minY = 0;
-	_minZ = 0;
-	_maxX = 0;
-	_maxY = 0;
-	_maxZ = 0;
-
-	_pMinX = 0;
-	_pMinY = 0;
-	_pMinZ = 0;
-	_pMaxX = 0;
-	_pMaxY = 0;
-	_pMaxZ = 0;
+	_graylevel 	= 0.0;
+	_2D3D 		= 1; // 0 2D             ,   1 true 3D
+	_direction 	= 0; // 1 XZ             ,   0 YZ            ,   2 XY
+	_image 		= NULL;
+	_image2 	= NULL;
+	_minX 		= 0;
+	_minY 		= 0;
+	_minZ 		= 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;
 }
 
 //---------------------------------------------------------------------------
@@ -57,42 +67,78 @@ void baseFilterManualPaint::Run() // 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;
 }
 
 //---------------------------------------------------------------------------
-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::SetImage(vtkImageData *image) {
+void baseFilterManualPaint::SetImages(vtkImageData *image, vtkImageData *image2) 
+{
+	_image 	= image;
+	_image2 = image2;
 	int ext[6];
-	_image = image;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_image->GetWholeExtent(ext);
+#else
+	_image->GetExtent(ext);
+#endif
 	_minX = 0;
 	_minY = 0;
 	_minZ = 0;
-	_maxX = ext[1] - ext[0];
-	_maxY = ext[3] - ext[2];
-	_maxZ = ext[5] - ext[4];
+	if (_image2!=NULL)
+	{
+		int extB[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_image2->GetWholeExtent(extB);
+#else
+		_image2->GetExtent(extB);
+#endif
+
+		_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 {
+		_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;
@@ -103,42 +149,57 @@ void baseFilterManualPaint::ResetGeneralMinMax() {
 
 //---------------------------------------------------------------------------
 void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
-		int maxY, int minZ, int maxZ) {
-	if (_pMinX > minX) {
-		_pMinX = minX;
-	}
+		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; }
+}
+*/
 
-	if (_pMinY > minY) {
-		_pMinY = minY;
-	}
 
-	if (_pMinZ > minZ) {
-		_pMinZ = minZ;
-	}
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::GetScalarRange(double * range) 
+{
+	range = this->_image->GetScalarRange();
+}
 
-	if (_pMaxX < maxX) {
-		_pMaxX = maxX;
-	}
+//---------------------------------------------------------------------------
+ImageMManager* baseFilterManualPaint::GetImageMManager() 
+{
+	return (this->_IMManager);
+} //DFCH
 
-	if (_pMaxY < maxY) {
-		_pMaxY = maxY;
-	}
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::CleanImageMManager() 
+{
+	this->_IMManager->CleanModifiedRegion();
+} //DFCH
 
-	if (_pMaxZ < maxZ) {
-		_pMaxZ = maxZ;
-	}
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::SetRangeMin(int min) 
+{
+	_RangeMin = min;
+}
 
+//---------------------------------------------------------------------------
+void baseFilterManualPaint::SetRangeMax(int max) 
+{
+	_RangeMax = max;
 }
 
 //---------------------------------------------------------------------------
-void baseFilterManualPaint::GetScalarRange(double * range) {
-	range = this->_image->GetScalarRange();
+int baseFilterManualPaint::GetRangeMin() 
+{
+	return _RangeMin;
 }
 
-ImageMManager* baseFilterManualPaint::GetImageMManager() {
-	return (this->_IMManager);
-} //DFCH
-void baseFilterManualPaint::CleanImageMManager() {
-	this->_IMManager->CleanModifiedRegion();
-} //DFCH
+//---------------------------------------------------------------------------
+int baseFilterManualPaint::GetRangeMax() 
+{
+	return _RangeMax;
+}