#

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

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index 19945fbdfae42f69833c6d9afb40ba3f5623b452..aba4fc8bf54805e111a86d1bf00efdab3750eba9 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -6,6 +6,8 @@
 #include "bbcreaMaracasVisuManualPaint_Model.h"
 #include "bbcreaMaracasVisuPackage.h"
 
+#include <omp.h>
+
 
 namespace bbcreaMaracasVisu
 {
@@ -131,7 +133,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 +146,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 +162,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();
 
@@ -233,14 +229,42 @@ printf("EED ManualPaint_Model::Process  list of points (with openmp)  size=%d\n"
 
                                long int index, size=dimX*dimY*dimZ;
 
+printf("EED ManualPaint_Model::Process A.start\n");
+std::vector<int> lstX;
+std::vector<int> lstY;
+std::vector<int> lstZ;
+                               int i,j,k;
+                               double value1;
+                               double value2;
+                               for (index=0; index<size; index++)
+                               {
+                                       GETVALUE2_VTK_CREA(value1,pBIP,sTBIP,index)
+                                       if (value1>0)
+                                       {
+                                               GETVALUE2_VTK_CREA(value2,pI2,sTI2,index)
+                                               if (value2==0)
+                                               {
+                                                       i = index % dimX;
+                                                       j = (index % (dimX*dimY)) / dimX;
+                                                       k = index / (dimX*dimY);
+                                                       lstX.push_back(i);
+                                                       lstY.push_back(j);
+                                                       lstZ.push_back(k);
+                                               } // if value2
+                                       } // if value1
+                               } // for 
+printf("EED ManualPaint_Model::Process B.end\n");
+
+size=lstX.size();
 long int k1omp=(double)(size-1)*0.0;
 long int k2omp=(double)(size-1)*0.2;
 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);
-#pragma omp parallel for
+printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d    GrayLevel=%f this=%p\n",size,(double)bbGetInputGrayLevel(),this);
+//omp_set_num_threads( omp_get_max_threads()-1 );
+#pragma omp parallel for 
                                for (index=0; index<size; index++)
                                {
                                        if ( (k1omp==index) || (k2omp==index) || (k3omp==index) || 
@@ -250,7 +274,53 @@ printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d\n",
                                                { 
                                                        printf("  100% (just one element)\n"); 
                                                } else {
-                                                       printf("  %d% \n", (int)(((double)index/(double)(size-1))*100 )); 
+                                                       printf("  %d%%  omp_get_num_threads=%d\n", (int)(((double)index/(double)(size-1))*100 ),  omp_get_num_threads() ); 
+                                               } 
+                                       }// if K#omp
+//                                     double value1;
+//                                     GETVALUE2_VTK_CREA(value1,pBIP,sTBIP,index)
+//                                     if (value1>0)
+//                                     {
+//                                             double value2;
+//                                             GETVALUE2_VTK_CREA(value2,pI2,sTI2,index)
+//                                             if (value2==0)
+//                                             {
+//                                                     int i = index % dimX;
+//                                                     int j = (index % (dimX*dimY)) / dimX;
+//                                                     int k = index / (dimX*dimY);
+                                                       manualpaintmodel->PaintImage(lstX[index],lstY[index],lstZ[index]);
+// //                                                          manualpaintmodel->SetUndoImage();     // Probably needed.   Here is ok.
+//                                             } // vI2                
+//                                     } // vBIP 
+                               } // for index    END openmp
+                               manualpaintmodel->Copy_GeneralAuxFill_to_Results();
+
+
+
+
+
+
+
+/* openmp
+long int k1omp=(double)(size-1)*0.0;
+long int k2omp=(double)(size-1)*0.2;
+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    GrayLevel=%f this=%p\n",size,(double)bbGetInputGrayLevel(),this);
+omp_set_num_threads( omp_get_max_threads()-1 );
+#pragma omp parallel for 
+                               for (index=0; index<size; index++)
+                               {
+                                       if ( (k1omp==index) || (k2omp==index) || (k3omp==index) || 
+                                                (k4omp==index) || (k5omp==index) || (k6omp==index) ) 
+                                       { 
+                                               if (size==1) 
+                                               { 
+                                                       printf("  100% (just one element)\n"); 
+                                               } else {
+                                                       printf("  %d%%  omp_get_num_threads=%d\n", (int)(((double)index/(double)(size-1))*100 ),  omp_get_num_threads() ); 
                                                } 
                                        }// if K#omp
                                        double value1;
@@ -268,8 +338,9 @@ printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d\n",
 //                                                             manualpaintmodel->SetUndoImage();     // Probably needed.   Here is ok.
                                                } // vI2                
                                        } // vBIP 
-                               } // for index
+                               } // for index    END openmp
                                manualpaintmodel->Copy_GeneralAuxFill_to_Results();
+*/
 
 /*
                                int i,j,k;
@@ -314,8 +385,6 @@ printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d\n",
                bbSetOutputOut( NULL );
        } 
        bbSetOutputManualpaintmodel( manualpaintmodel );
-
-printf("EED ManualPaint_Model::Process End\n");
 }
 //===== 
 // 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)