X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint_Model.h;h=d5cc1d44565041a74f53d591732506ac4a172ad2;hb=4b2a99534d79424c7892e09160a1488604741064;hp=f9e5a4c0f7bff9b6955a106d127802aec5a58956;hpb=7d08401d8ffee17aaf47ff6ee83161cbaa1f10b9;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
index f9e5a4c..d5cc1d4 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
@@ -32,14 +32,17 @@ class bbcreaMaracasVisu_EXPORT ManualPaint_Model
   BBTK_DECLARE_INPUT(ToleranceFill,double);
   BBTK_DECLARE_INPUT(DistanceFill,int);
   BBTK_DECLARE_INPUT(Point,std::vector<int>);
+  BBTK_DECLARE_INPUT(ByImagePoints,vtkImageData*);
+  BBTK_DECLARE_INPUT(ByLstPointsX,std::vector<int>);
+  BBTK_DECLARE_INPUT(ByLstPointsY,std::vector<int>);
+  BBTK_DECLARE_INPUT(ByLstPointsZ,std::vector<int>);
   BBTK_DECLARE_INPUT(Range,std::vector<double>);
-
-
-//  BBTK_DECLARE_OUTPUT(Out,double);
+  BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
+  BBTK_DECLARE_OUTPUT(Manualpaintmodel,ManualPaintModel*);
   BBTK_PROCESS(Process);
   void Process();
 
-
+  void LstPointOMPAnalice();
   ManualPaintModel *manualpaintmodel;
 
 //===== 
@@ -59,16 +62,19 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ManualPaint_Model,bbtk::AtomicBlackBox);
   BBTK_INPUT(ManualPaint_Model,Image,"Image input / image result",vtkImageData*,"");
   BBTK_INPUT(ManualPaint_Model,Image2,"Image result",vtkImageData*,"");
   BBTK_INPUT(ManualPaint_Model,GrayLevel,"Fill gray level (100 default)",double,"");
-  BBTK_INPUT(ManualPaint_Model,Direction,"Used in the 2D mode.   0=YZ , 1=XY , 2=XY(default) ",int,"");
+  BBTK_INPUT(ManualPaint_Model,Direction,"Used in the 2D mode.   0=YZ , 1=XZ , 2=XY(default) ",int,"");
   BBTK_INPUT(ManualPaint_Model,BrushSize,"default 3",int,"");
   BBTK_INPUT(ManualPaint_Model,BrushForm,"1 default   A) 2D 0=rect,1=circle    B) 3D 0=cube,1=sphere",int,"");
   BBTK_INPUT(ManualPaint_Model,ToleranceFill,"default 50",double,"");
   BBTK_INPUT(ManualPaint_Model,DistanceFill,"25 (default)",int,"");
-  BBTK_INPUT(ManualPaint_Model,Point,"[0,0,0] (default)",std::vector<int>,"");
+  BBTK_INPUT(ManualPaint_Model,Point,"[] (default)",std::vector<int>,"");
+  BBTK_INPUT(ManualPaint_Model,ByImagePoints,"Use image with values > 0 to run the ManualPaint",vtkImageData*,"");
+  BBTK_INPUT(ManualPaint_Model,ByLstPointsX,"X Lst of points to run the Manual Paint",std::vector<int>,"");
+  BBTK_INPUT(ManualPaint_Model,ByLstPointsY,"Y Lst of points to run the Manual Paint",std::vector<int>,"");
+  BBTK_INPUT(ManualPaint_Model,ByLstPointsZ,"Z Lst of points to run the Manual Paint",std::vector<int>,"");
   BBTK_INPUT(ManualPaint_Model,Range,"min-max range [0 200] default",std::vector<double>,"");
-
-
-//  BBTK_OUTPUT(ManualPaint_Model,Out,"First output",double,"");
+  BBTK_OUTPUT(ManualPaint_Model,Out,"Output image. Is the same pointer of input Image or Image2 with the modifications",vtkImageData*,"");
+  BBTK_OUTPUT(ManualPaint_Model,Manualpaintmodel,"ManualPaintModel",ManualPaintModel*,"");
 
 BBTK_END_DESCRIBE_BLACK_BOX(ManualPaint_Model);
 //=====