X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint_Model.cxx;h=b9c230335036086654d0138b978f45afeffcc977;hb=cf87bb498ccc24b1fb1aa2104957e0cb1afad2f2;hp=19945fbdfae42f69833c6d9afb40ba3f5623b452;hpb=bbb7a9df62685dc80edc2ddf3074e9321cd479bf;p=creaMaracasVisu.git diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx index 19945fb..b9c2303 100644 --- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx +++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx @@ -131,7 +131,6 @@ printf("EED ManualPaint_Model::LstPointOMPAnalice End\n"); void ManualPaint_Model::Process() { -printf("EED ManualPaint_Model::Process Start\n"); /* Notas 0. Quitar comentarion ByLstPoints openmp 1. Falta openmp ByImagePoints @@ -145,16 +144,12 @@ printf("EED ManualPaint_Model::Process Start\n"); */ if (bbGetInputActive()==true) { -printf("EED ManualPaint_Model::Process 1\n"); if (bbGetInputImage()!=NULL) { -printf("EED ManualPaint_Model::Process 2\n"); manualpaintmodel->SetActive( bbGetInputActive() ); manualpaintmodel->SetTool( bbGetInputTool() ); manualpaintmodel->Set2D3D( bbGetInput2D3D() ); -printf("EED ManualPaint_Model::Process 2.1\n"); manualpaintmodel->SetImages( bbGetInputImage(),bbGetInputImage2() ); -printf("EED ManualPaint_Model::Process 2.2\n"); manualpaintmodel->SetGrayLevel( bbGetInputGrayLevel() ); manualpaintmodel->SetDirection( bbGetInputDirection() ); manualpaintmodel->SetBrushSize( bbGetInputBrushSize() ); @@ -165,13 +160,12 @@ printf("EED ManualPaint_Model::Process 2.2\n"); manualpaintmodel->SetRangeMax( bbGetInputRange()[1] ); if (bbGetInputPoint().size()==3) { -printf("EED ManualPaint_Model::Process 3\n"); manualpaintmodel->PaintImage( bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] ); manualpaintmodel->SetUndoImage(); + manualpaintmodel->Copy_GeneralAuxFill_to_Results(); } // if Points if ( bbGetInputByLstPointsX().size()!=0 ) { -printf("EED ManualPaint_Model::Process 4\n"); //-- Alternativa con openmp -- // LstPointOMPAnalice(); @@ -239,7 +233,7 @@ long int k3omp=(double)(size-1)*0.4; long int k4omp=(double)(size-1)*0.6; long int k5omp=(double)(size-1)*0.8; long int k6omp=(double)(size-1)*1.0; -printf("EED ManualPaint_Model::Process ByImagePoints (with openmp) size=%d\n",size); +printf("EED ManualPaint_Model::Process ByImagePoints (with openmp) size=%d GrayLevel=%f\n",size,(double)bbGetInputGrayLevel()); #pragma omp parallel for for (index=0; index