From: Esteban CORREA <correa@creatis.insa-lyon.fr>
Date: Mon, 13 May 2013 16:22:02 +0000 (+0200)
Subject: Axe opacity property added
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f828884b0ce84ed5d324a6b7533c7758e53eae91;p=creaMaracasVisu.git

Axe opacity property added
---

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index dbc6f4d..9d65ade 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -72,7 +72,10 @@ void DrawAxe3D::Process()
 	mvtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
 				bbGetInputColour()[1], 
 				bbGetInputColour()[2] );
-
+	//EC Axe Opacity property added
+	///Default Values
+	double opacity=bbGetInputOpacity();
+	mvtkactor->GetProperty()->SetOpacity( opacity );
 	if ( bbGetInputTransform()!=NULL )
 	{
 		mvtkactor->SetUserTransform( bbGetInputTransform() );
@@ -98,6 +101,7 @@ void DrawAxe3D::bbUserSetDefaultValues()
     colour.push_back(0.0);
     colour.push_back(0.0);
     bbSetInputColour(colour);
+    bbSetInputOpacity(1.0);
 }
 
 
diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h
index a18b956..62972a2 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h
@@ -47,6 +47,7 @@ class /*BBTK_EXPORT*/ DrawAxe3D
   BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
   BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
   BBTK_DECLARE_INPUT(Colour,std::vector<double>);
+  BBTK_DECLARE_INPUT(Opacity,double);
   BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *);
   BBTK_DECLARE_OUTPUT(Out,vtkProp3D *);
 
@@ -72,6 +73,7 @@ BBTK_CATEGORY("actor");
   BBTK_INPUT(DrawAxe3D,lstPointY,"list of point Y",std::vector<double>,"");
   BBTK_INPUT(DrawAxe3D,lstPointZ,"list of point Z",std::vector<double>,"");
   BBTK_INPUT(DrawAxe3D,Colour,"Color of the line R(0..1) G(0..1) B(0..1) ",std::vector<double>,"colour");
+  BBTK_INPUT(DrawAxe3D,Opacity,"Axe opacity property ",double,"intensity");
   BBTK_INPUT(DrawAxe3D,Transform,"vtkTransform", vtkLinearTransform *,"");
   BBTK_OUTPUT(DrawAxe3D,Out,"Actor",vtkProp3D*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(DrawAxe3D);