X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuTubeTreeFilter.h;h=02911c812a5cbd5cb9e8e50b0448ba3dd1bc5f0c;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=2d5ec1292f81742de12b1df9c7336b40dde1c028;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuTubeTreeFilter.h b/bbtk/src/bbcreaMaracasVisuTubeTreeFilter.h
index 2d5ec12..02911c8 100644
--- a/bbtk/src/bbcreaMaracasVisuTubeTreeFilter.h
+++ b/bbtk/src/bbcreaMaracasVisuTubeTreeFilter.h
@@ -110,6 +110,7 @@ class bbcreaMaracasVisu_EXPORT TubeTreeFilter
 	BBTK_DECLARE_INPUT(lstPointY    , std::vector<double>);
 	BBTK_DECLARE_INPUT(lstPointZ    , std::vector<double>);
 	BBTK_DECLARE_INPUT(lstRadio     , std::vector<double>);
+	BBTK_DECLARE_INPUT(lstRadioLaw  , int);
 	BBTK_DECLARE_INPUT(Colour       , std::vector<double>);
 	BBTK_DECLARE_INPUT(ColourLaw    , int);
 	BBTK_DECLARE_INPUT(Transform    , vtkLinearTransform *);
@@ -121,8 +122,11 @@ class bbcreaMaracasVisu_EXPORT TubeTreeFilter
 
   private:
 	std::vector<vtkActor*>		vecVtkActors;
+	std::vector< vtkDoubleArray* >  vecTubeRadiosArray;
+
 	void DrawOneTube(int iGeneral,int numPoints, int iTube);
 	void SetGraphicProperties();
+	void SetRadioTube(int iGeneral,int numPoints, int iTube);
     int oldLstSize;
 
 //=====
@@ -141,15 +145,15 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(TubeTreeFilter,bbtk::AtomicBlackBox);
 	BBTK_INPUT(TubeTreeFilter,lstPointX,"lstPointX",std::vector<double>,"");
 	BBTK_INPUT(TubeTreeFilter,lstPointY,"lstPointY",std::vector<double>,"");
 	BBTK_INPUT(TubeTreeFilter,lstPointZ,"lstPointZ",std::vector<double>,"");
-	BBTK_INPUT(TubeTreeFilter,lstRadio,"lstRadio",std::vector<double>,"");
+	BBTK_INPUT(TubeTreeFilter,lstRadio,"lstRadio (default 1) ",std::vector<double>,"");
+	BBTK_INPUT(TubeTreeFilter,lstRadioLaw,"0(default) radio for all, 1 radio by segment, 2 radio by point",int,"");
 	BBTK_INPUT(TubeTreeFilter,Colour,"Colour",std::vector<double>,"");
-    BBTK_INPUT(TubeTreeFilter,ColourLaw,"ColorLaw 1(default) solid color, 2 color by segment, 3 color for each point",int,"");
+    	BBTK_INPUT(TubeTreeFilter,ColourLaw,"ColorLaw 1(default) solid color, 2 color by segment, 3 color for each point",int,"");
 	BBTK_INPUT(TubeTreeFilter,Transform,"vtkTransform", vtkLinearTransform *,"");
 	BBTK_INPUT(TubeTreeFilter,iTube,"iTube",int,"");
 	BBTK_INPUT(TubeTreeFilter,Opacity,"Opacity",double,"");
-	BBTK_OUTPUT(TubeTreeFilter,OutTube,"Tube[iTube]",vtkProp3D *,"");
-
 
+	BBTK_OUTPUT(TubeTreeFilter,OutTube,"Tube[iTube]",vtkProp3D *,"");
 
 BBTK_END_DESCRIBE_BLACK_BOX(TubeTreeFilter);
 //=====