X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxisTree3D.h;h=af211982f14d3156d72a507219eacdac85d2e74a;hb=12b981bff843fa03341334fe5b911a011afaadff;hp=4553148bc008744335f04329025365bd5c3785f5;hpb=de5cb63cdc23317a114c77f7b6184126d7988508;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
index 4553148..af21198 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
@@ -13,32 +13,24 @@
 #include "vtkCellArray.h"
 #include "vtkProperty.h"
 
-
-
 namespace bbcreaMaracasVisu
 {
 
 class /*BBTK_EXPORT*/ DrawAxisTree3D
- : 
+ :
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(DrawAxisTree3D,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
-  BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*);
-  BBTK_DECLARE_INPUT(lstIndexs,std::vector<int>);
-  BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstRadio ,std::vector<double>);
-  BBTK_DECLARE_INPUT(Colour   ,std::vector<double>);
-  BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *);
+  BBTK_DECLARE_INPUT(Renderer   , vtkRenderer*);
+  BBTK_DECLARE_INPUT(lstIndexs  , std::vector<int>);
+  BBTK_DECLARE_INPUT(lstPointX  , std::vector<double>);
+  BBTK_DECLARE_INPUT(lstPointY  , std::vector<double>);
+  BBTK_DECLARE_INPUT(lstPointZ  , std::vector<double>);
+  BBTK_DECLARE_INPUT(lstRadio   , std::vector<double>);
+  BBTK_DECLARE_INPUT(ColourLaw  , int );
+  BBTK_DECLARE_INPUT(Colour     , std::vector<double>);
+  BBTK_DECLARE_INPUT(Transform  , vtkLinearTransform *);
+  BBTK_DECLARE_INPUT(Opacity    , double);
   BBTK_DECLARE_INPUT(iAxis, int );
   BBTK_DECLARE_OUTPUT(OutAxis,vtkProp3D *);
   BBTK_PROCESS(Process);
@@ -46,9 +38,10 @@ virtual void bbUserDestructor();
 
 private:
 
-	std::vector<vtkPolyData*>		vecVtkPolyData;
+    int oldLstSize;
+	std::vector<vtkPolyData*>	vecVtkPolyData;
 	std::vector<vtkPolyDataMapper*>	vecVtkPolyDataMaper;
-	std::vector<vtkActor*>			vecVtkActors;
+	std::vector<vtkActor*>		vecVtkActors;
 
 	void DrawOneAxis(int iGeneral,int numPoints, int iAxis);
 };
@@ -57,17 +50,19 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(DrawAxisTree3D,bbtk::AtomicBlackBox);
 BBTK_NAME("DrawAxisTree3D");
 BBTK_AUTHOR("InfoTeam CREATIS-LRMN");
 BBTK_DESCRIPTION("Draw Axis Tree 3D");
-BBTK_CATEGORY("__CATEGORY__");
-BBTK_INPUT(DrawAxisTree3D,Renderer,"Renderer",vtkRenderer*,"");
-BBTK_INPUT(DrawAxisTree3D,lstIndexs,"Indexs",std::vector<int>,"");
-BBTK_INPUT(DrawAxisTree3D,lstPointX,"lstPointX",std::vector<double>,"");
-BBTK_INPUT(DrawAxisTree3D,lstPointY,"lstPointY",std::vector<double>,"");
-BBTK_INPUT(DrawAxisTree3D,lstPointZ,"lstPointZ",std::vector<double>,"");
-BBTK_INPUT(DrawAxisTree3D,lstRadio,"lstRadio",std::vector<double>,"");
-BBTK_INPUT(DrawAxisTree3D,Colour,"Colour",std::vector<double>,"");
-BBTK_INPUT(DrawAxisTree3D,Transform,"vtkTransform", vtkLinearTransform *,"");
-BBTK_INPUT(DrawAxisTree3D,iAxis,"iAxis",int,"");
-BBTK_OUTPUT(DrawAxisTree3D,OutAxis,"Axis[iAxis]",vtkProp3D *,"");
+BBTK_CATEGORY("actor");
+  BBTK_INPUT(DrawAxisTree3D,Renderer,"Renderer",vtkRenderer*,"");
+  BBTK_INPUT(DrawAxisTree3D,lstIndexs,"Indexs",std::vector<int>,"");
+  BBTK_INPUT(DrawAxisTree3D,lstPointX,"lstPointX",std::vector<double>,"");
+  BBTK_INPUT(DrawAxisTree3D,lstPointY,"lstPointY",std::vector<double>,"");
+  BBTK_INPUT(DrawAxisTree3D,lstPointZ,"lstPointZ",std::vector<double>,"");
+  BBTK_INPUT(DrawAxisTree3D,lstRadio,"lstRadio",std::vector<double>,"");
+  BBTK_INPUT(DrawAxisTree3D,Colour,"Colour",std::vector<double>,"");
+  BBTK_INPUT(DrawAxisTree3D,Opacity,"Opacity",double,"");
+  BBTK_INPUT(DrawAxisTree3D,ColourLaw,"ColorLaw 1(default) solid color, 2 color by segment, 3 color for each point",int,"");
+  BBTK_INPUT(DrawAxisTree3D,Transform,"vtkTransform", vtkLinearTransform *,"");
+  BBTK_INPUT(DrawAxisTree3D,iAxis,"iAxis",int,"");
+  BBTK_OUTPUT(DrawAxisTree3D,OutAxis,"Axis[iAxis]",vtkProp3D *,"");
 BBTK_END_DESCRIBE_BLACK_BOX(DrawAxisTree3D);
 }
 // EO namespace bbcreaMaracasVisu