3263 creaMaracasVisu Feature New Normal - ViewerNV sync ParallelScale Camera

[creaMaracasVisu.git] / bbtk / src / bbcreaMaracasVisuManualPaint_Model.cxx

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index e31a64df99e6ab1b6b8a3e7b486148c8d1a3c0eb..e97b39033a1cbc0bca71a1c5829bbbdd25e8c775 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -34,8 +34,10 @@ void ManualPaint_Model::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
 
+
        if (bbGetInputImage()!=NULL)
        {  
+
                manualpaintmodel->SetActive( bbGetInputActive() );
                manualpaintmodel->SetTool( bbGetInputTool() );
                manualpaintmodel->Set2D3D( bbGetInput2D3D() );
@@ -48,11 +50,14 @@ void ManualPaint_Model::Process()
                manualpaintmodel->SetDistanceFill( bbGetInputDistanceFill() );          
                manualpaintmodel->SetRangeMin( bbGetInputRange()[0] );
                manualpaintmodel->SetRangeMax( bbGetInputRange()[1] );
+
                if (bbGetInputPoint().size()==3)
                {
                        manualpaintmodel->PaintImage( bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] );
                } // if Points
 
+
+
                if ( bbGetInputByLstPointsX().size()!=0 )
                {
                        int i,size = bbGetInputByLstPointsX().size();
@@ -67,7 +72,13 @@ void ManualPaint_Model::Process()
 //                     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;
@@ -105,9 +116,13 @@ void ManualPaint_Model::Process()
 
                        printf("ManualPaint_Model %d%\n", 100 );
                } // if ByImagePoints
+
+
+
         } else {
                printf("EED Warning: Image not set. Box creaMaracasVisu::ManualPaint_Model (BBTK) \n");
-       } // if 
+       } // if bbGetInputImage()
+
 
        if (bbGetInputImage2()!=NULL)
        { 
@@ -117,6 +132,7 @@ void ManualPaint_Model::Process()
        } else { 
                bbSetOutputOut( 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)