*** empty log message ***

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 0ee60277cf703f9f0850ad3000737a0ea354df33..61c3ade4fa0a0607c11780d931eccec525ac42da 100644 (file)
--- 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 01998b445d16187533b4b93745372d6ff68429d1..aca4d451b96876ebabee6e841b849984ffcc702d 100644 (file)
--- 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 4c80882c463d011ece282b76e2c942879f823ca8..fbd94b1e77708c0481b24b765aae3ff061c79dc1 100644 (file)
--- 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 65080c13f43a2b2d0b208391e6c1ead6b4357c3a..7913a94d34fba027c235ff46286840d9981c0ecd 100644 (file)
--- 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 1c36af9c7f3cdd28984bd4f7b7943ae8a561350e..39a8307811756cd7b5a40fb30cedd4e9366d04e1 100644 (file)
--- 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 )