From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 3 Dec 2008 11:45:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~142
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a2002b519bbc151c24ea558cea99625c13ed392d;p=creaMaracasVisu.git

*** empty log message ***
---

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 0ee6027..61c3ade 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -52,6 +52,10 @@ void DrawAxe3D::Process()
 										bbGetInputColour()[1], 
 										bbGetInputColour()[2] );
 
+	if ( bbGetInputTransform()!=NULL )
+	{
+		mvtkactor->SetUserTransform( bbGetInputTransform() );
+	}
 
      // Interface Update
      if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h
index 01998b4..aca4d45 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h
@@ -29,6 +29,7 @@ virtual void bbUserDestructor();
   BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
   BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
   BBTK_DECLARE_INPUT(Colour,std::vector<double>);
+  BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *);
   BBTK_DECLARE_OUTPUT(Out,vtkProp3D *);
 
 //  BBTK_DECLARE_OUTPUT(Out,double);
@@ -52,6 +53,7 @@ BBTK_CATEGORY("__CATEGORY__");
   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,Transform,"vtkTransform", vtkLinearTransform *,"");
   BBTK_OUTPUT(DrawAxe3D,Out,"Actor",vtkProp3D*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(DrawAxe3D);
 }
diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index 4c80882..fbd94b1 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -66,6 +66,11 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis)
 	vtkactor->GetProperty()->SetColor( 1,0,0 );
 	vtkactor->GetProperty()->SetLineWidth( 3 );
 
+	if ( bbGetInputTransform()!=NULL )
+	{
+		vtkactor->SetUserTransform( bbGetInputTransform() );
+	}
+
      // Interface Update
      if  (bbGetInputRenderer()!=NULL )
      {
diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
index 65080c1..7913a94 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
@@ -38,6 +38,7 @@ virtual void bbUserDestructor();
   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(iAxis, int );
   BBTK_DECLARE_OUTPUT(OutAxis,vtkProp3D *);
   BBTK_PROCESS(Process);
@@ -64,6 +65,7 @@ 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_END_DESCRIBE_BLACK_BOX(DrawAxisTree3D);
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
index 1c36af9..39a8307 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
@@ -945,7 +945,7 @@ void mBarRange::OnMouseMove(wxMouseEvent& event )
 						//-------------------------------------------
 						createAndSendEvent( wxEVT_TSBAR_ACTUAL );	
 //						createAndSendEvent( 98765 );
-printf("EED mBarRange::OnMouseMove XXXXXXX \n");
+printf("EED creaMaracasVisu mBarRange::OnMouseMove XXXXXXX \n");
 
 					}
 					else if( validPos_ActualTri && _in_rangeProperty )