X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint_Model.cxx;h=856a509587e02650d95d5e00199a78336d7c5807;hb=2a1cde86bf45b8f9b11514a9b04d5834b10af209;hp=e31a64df99e6ab1b6b8a3e7b486148c8d1a3c0eb;hpb=228dd2fe51b414e56427b93a1d99a35e568c7033;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index e31a64d..856a509 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -52,7 +52,6 @@ void ManualPaint_Model::Process()
 		{
 			manualpaintmodel->PaintImage( bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] );
 		} // if Points
-
 		if ( bbGetInputByLstPointsX().size()!=0 )
 		{
 			int i,size = bbGetInputByLstPointsX().size();
@@ -61,22 +60,23 @@ void ManualPaint_Model::Process()
 				manualpaintmodel->PaintImage( bbGetInputByLstPointsX()[i] , bbGetInputByLstPointsY()[i] , bbGetInputByLstPointsZ()[i] );
 			} // for
 		}// if ByLstPointsX
-		
-		if (bbGetInputByImagePoints()!=NULL)
+		if ((bbGetInputByImagePoints()!=NULL) && (bbGetInputImage2()!=NULL) )
 		{
 //			int ia,ja,ka;
 //			int ii,jj,kk;
 			int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			bbGetInputByImagePoints()->GetWholeExtent(ext);
+#else
+			bbGetInputByImagePoints()->GetExtent(ext);
+#endif
 			int dimX=ext[1]-ext[0]+1;
 			int dimY=ext[3]-ext[2]+1;
 			int dimZ=ext[5]-ext[4]+1;
-
 			DEF_POINTER_IMAGE_VTK_CREA(vBIP,sSBIP,pBIP,sTBIP,bbGetInputByImagePoints());
 			DEF_POINTER_IMAGE_VTK_CREA(vI2,sSI2,pI2,sTI2,bbGetInputImage2());
-
 //#pragma omp parallel for
-
 			int i,j,k;
 			for (k=0;k<dimZ;k++) 
 			{
@@ -102,12 +102,11 @@ void ManualPaint_Model::Process()
 					}// for i
 				}// for j
 			}// for k
-
 			printf("ManualPaint_Model %d%\n", 100 );
 		} // if ByImagePoints
 	 } else {
-		printf("EED Warning: Image not set. Box creaMaracasVisu::ManualPaint_Model (BBTK) \n");
-	} // if 
+		printf("EED Warning: ByImagePoints or Image2 not set.  Box creaMaracasVisu::ManualPaint_Model (BBTK) \n");
+	} // if ((bbGetInputByImagePoints()!=NULL) && (bbGetInputImage2()!=NULL) )
 
 	if (bbGetInputImage2()!=NULL)
 	{ 
@@ -128,30 +127,26 @@ void ManualPaint_Model::bbUserSetDefaultValues()
 //    Here we initialize the input 'In' to 0
 
 	bbSetInputActive(true);
-	bbSetInputTool(1);  // Paint
-	bbSetInput2D3D(1);  // 3D
+	bbSetInputTool(1);  		// Paint
+	bbSetInput2D3D(1);  		// 3D
 	bbSetInputImage(NULL);
 	bbSetInputImage2(NULL);
 	bbSetInputGrayLevel(100);
-	bbSetInputDirection(2); // XY
+	bbSetInputDirection(2); 	// XY
 	bbSetInputBrushSize(3);
-	bbSetInputBrushForm(1); // sphere
+	bbSetInputBrushForm(1); 	// sphere
 	bbSetInputToleranceFill(50);
 	bbSetInputDistanceFill(25);
-
 	std::vector<int> point;
 	point.push_back(0);
 	point.push_back(0);
 	point.push_back(0);
 	bbSetInputPoint(point);
-
 	std::vector<double> range;
 	range.push_back(0);
 	range.push_back(200);
 	bbSetInputRange(range);
-
 	bbSetInputByImagePoints(NULL);
-  
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)