#include "bbcreaMaracasVisuManualPaint_Model.h"
#include "bbcreaMaracasVisuPackage.h"
+#include <omp.h>
+
namespace bbcreaMaracasVisu
{
//-- Alternativa con openmp --
void ManualPaint_Model::LstPointOMPAnalice()
{
+
+printf("EED ManualPaint_Model::LstPointOMPAnalice\n" );
+printf("EED FillFilter::Run ojo toca limpiar bien el codigo _px px ...... \n");
+printf("EED FillFilter::Run ojo toca limpiar bien el codigo _px px ...... \n");
+printf("EED FillFilter::Run ojo toca limpiar bien el codigo _px px ...... \n");
+printf("EED FillFilter::Run ojo toca limpiar bien el codigo _px px ...... \n");
+
+
+printf("EED ManualPaint_Model::LstPointOMPAnalice Start \n");
//-- Alternativa con openmp --
// A. Create copie of index original list => lst1
// B. if list1 es not empty do..
long int k4omp=(double)(size2-1)*0.6;
long int k5omp=(double)(size2-1)*0.8;
long int k6omp=(double)(size2-1)*1.0;
-printf("EED ManualPaint_Model::LstPointOMPAnalice (with openmp) size=%ld\n",size2);
+printf("EED ManualPaint_Model::LstPointOMPAnalice (with openmp) size=%d\n",size2);
#pragma omp parallel for
for (i2=0;i2<size2;i2++)
{
-if ( (k1omp==i2) || (k2omp==i2) || (k3omp==i2) ||
- (k4omp==i2) || (k5omp==i2) || (k6omp==i2) )
-{
- if (size2==1)
- {
- printf(" 100% (just one element)\n");
- } else {
- printf(" %d%\n", (int)(((double)i2/(double)(size2-1))*100 ));
- }
-}// if K#omp
+ if ( (k1omp==i2) || (k2omp==i2) || (k3omp==i2) ||
+ (k4omp==i2) || (k5omp==i2) || (k6omp==i2) )
+ {
+ if (size2==1)
+ {
+ printf(" 100% (just one element)\n");
+ } else {
+ printf(" %d% \n", (int)(((double)i2/(double)(size2-1))*100 ));
+ }
+ }// if K#omp
manualpaintmodel->PaintImage( bbGetInputByLstPointsX()[ lst2[i2] ] ,
bbGetInputByLstPointsY()[ lst2[i2] ] ,
bbGetInputByLstPointsZ()[ lst2[i2] ] );
} // for i2
} // while
+printf("EED ManualPaint_Model::LstPointOMPAnalice End\n");
}
void ManualPaint_Model::Process()
{
-
/* Notas
0. Quitar comentarion ByLstPoints openmp
1. Falta openmp ByImagePoints
{
manualpaintmodel->PaintImage( bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] );
manualpaintmodel->SetUndoImage();
+ manualpaintmodel->Copy_GeneralAuxFill_to_Results();
} // if Points
if ( bbGetInputByLstPointsX().size()!=0 )
{
//-- Alternativa con openmp --
- LstPointOMPAnalice();
+// LstPointOMPAnalice();
- /* -- Original ByLstPoints sin openmp --
+// /* -- Original ByLstPoints sin openmp --
int i,size = bbGetInputByLstPointsX().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 list of points (with openmp) size=%d\n",size);
+#pragma omp parallel for
for (i=0;i<size;i++)
{
+ if ( (k1omp==i) || (k2omp==i) || (k3omp==i) ||
+ (k4omp==i) || (k5omp==i) || (k6omp==i) )
+ {
+ if (size==1)
+ {
+ printf(" 100% (just one element)\n");
+ } else {
+ printf(" %d% \n", (int)(((double)i/(double)(size-1))*100 ));
+ }
+ }// if K#omp
manualpaintmodel->PaintImage( bbGetInputByLstPointsX()[i] ,
bbGetInputByLstPointsY()[i] ,
bbGetInputByLstPointsZ()[i] );
//_manualPaintModel->SetUndoImage(); // Probably needed. Here is ok.
} // for
- -- Original ByLstPoints sin openmp --*/
+// -- Original ByLstPoints sin openmp --*/
+
+ manualpaintmodel->Copy_GeneralAuxFill_to_Results();
}// if ByLstPointsX
if ((bbGetInputByImagePoints()!=NULL) && (bbGetInputImage2()!=NULL) )
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());
+
+ 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 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;
+// 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;
+ 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(i,j,k);
+// manualpaintmodel->SetUndoImage(); // Probably needed. Here is ok.
+ } // vI2
+ } // vBIP
+ } // for index END openmp
+ manualpaintmodel->Copy_GeneralAuxFill_to_Results();
+*/
+
+/*
int i,j,k;
//#pragma omp parallel for
for (k=0;k<dimZ;k++)
{
- if (k%50==0)
- {
- printf("ManualPaint_Model %d%\n", (int)(k*100.0/dimZ) );
- }
for (j=0;j<dimY;j++)
{
for (i=0;i<dimX;i++)
}// for i
}// for j
}// for k
- printf("ManualPaint_Model %d%\n", 100 );
//------- Original ByImagePoints sin openmp-------- */
+
+
} // if ByImagePoints
} else {
bbSetInputToleranceFill(50);
bbSetInputDistanceFill(25);
std::vector<int> point;
- point.push_back(0);
- point.push_back(0);
- point.push_back(0);
- bbSetInputPoint(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);
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff