X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint_Model.h;h=a363219680aa92db596401ef78a71c74811b6e70;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=ed8279a29064ab9e37cff52037432b253c4d0575;hpb=439cc05f12e61d0ba090ec0c2ba8701d382238d7;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
index ed8279a..a363219 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.h
@@ -24,6 +24,7 @@ class bbcreaMaracasVisu_EXPORT ManualPaint_Model
   BBTK_DECLARE_INPUT(Tool,int);
   BBTK_DECLARE_INPUT(2D3D,int);
   BBTK_DECLARE_INPUT(Image,vtkImageData*);
+  BBTK_DECLARE_INPUT(Image2,vtkImageData*);
   BBTK_DECLARE_INPUT(GrayLevel,double);
   BBTK_DECLARE_INPUT(Direction,int);
   BBTK_DECLARE_INPUT(BrushSize,int);
@@ -31,10 +32,12 @@ 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_PROCESS(Process);
   void Process();
 
@@ -53,20 +56,23 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ManualPaint_Model,bbtk::AtomicBlackBox);
   BBTK_CATEGORY("empty");
 
   BBTK_INPUT(ManualPaint_Model,Active,"true (default) , false",bool,"");
-  BBTK_INPUT(ManualPaint_Model,Tool,"0=Brush, 1=Paint(default)",int,"");
+  BBTK_INPUT(ManualPaint_Model,Tool,"0=Brush, 1=Fill(default)",int,"");
   BBTK_INPUT(ManualPaint_Model,2D3D,"0=2D, 1=3D (default)",int,"");
-  BBTK_INPUT(ManualPaint_Model,Image,"Image input",vtkImageData*,"");
+  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,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_END_DESCRIBE_BLACK_BOX(ManualPaint_Model);
 //=====