X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FGEOM_VTKTrihedron.cxx;h=4c62e9f367190a66367698c817385d98f594a9bb;hb=8b1511ff6327ae63c450b10e49714d3c83577eda;hp=3e79afb81199d92cf0aa34aaedca51af742d154a;hpb=f505d638da4d75d3fe3daf6ce3bf7fab668bfad5;p=modules%2Fgeom.git

diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx
index 3e79afb81..4c62e9f36 100644
--- a/src/OBJECT/GEOM_VTKTrihedron.cxx
+++ b/src/OBJECT/GEOM_VTKTrihedron.cxx
@@ -1,64 +1,53 @@
-//  SALOME GEOM : 
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
 //
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SALOME GEOM : 
 //  File   : GEOM_VTKTrihedron.cxx
 //  Author : Sergey LITONIN
 //  Module : SALOME
 //  $Header:
-
+//
 #include "GEOM_VTKTrihedron.hxx"
-#include "utilities.h"
-#include "GEOM_OCCReader.h"
 
 #include <Geom_Axis2Placement.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Pnt.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
 
-#include <vtkMath.h>
 #include <vtkMapper.h>
-#include <vtkDataSet.h>
 #include <vtkRenderer.h>
-#include <vtkFollower.h>
-#include <vtkRenderWindow.h>
 #include <vtkObjectFactory.h>
-#include <vtkPolyData.h>
 #include <vtkActor.h>
+#include <vtkActorCollection.h>
 #include <vtkProperty.h>
 #include <vtkLineSource.h>
-#include <vtkConeSource.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkAppendPolyData.h>
 #include <vtkMatrix4x4.h>
 #include <vtkTransform.h>
-
-#include "VTKViewer_VectorText.h"
-
-
+#include <vtkVectorText.h>
+#include <vtkCoordinate.h>
+#include <vtkTextActor.h>
+#include <vtkTextMapper.h>
 
 /*
   Class       : GEOM_VTKTrihedron
@@ -78,15 +67,15 @@ public:
                                 vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis );
   static GEOM_VTKTrihedronAxis* New();
 
-  void                          SetAxis( const gp_Ax1& theAxis, const int theRot, float theColor[ 3 ] );
+  void                          SetAxis( const gp_Ax1& theAxis, const int theRot, vtkFloatingPointType theColor[ 3 ] );
   virtual void                  Render( vtkRenderer* theRenderer );
-  virtual void                  SetSize( float theSize );
+  virtual void                  SetSize( vtkFloatingPointType theSize );
   gp_Pnt                        GetOri() const;
-  void                          SetColor( const float theColor[ 3 ] );
+  void                          SetColor( const vtkFloatingPointType theColor[ 3 ] );
 
 private:
 
-  float                         myOri[ 3 ];
+  vtkFloatingPointType          myOri[ 3 ];
   vtkMatrix4x4*                 myMatrix;
   vtkTransform*                 myTrsf;
 };
@@ -95,10 +84,7 @@ vtkStandardNewMacro( GEOM_VTKTrihedronAxis );
 
 GEOM_VTKTrihedronAxis::GEOM_VTKTrihedronAxis()
 {
-  vtkProperty* aProperty = vtkProperty::New();
-  aProperty->SetColor( 0.0, 0.0, 1.0 );
-  SetProperty( aProperty );
-  aProperty->Delete();
+  VTKViewer_Axis::SetColor( 0.0, 0.0, 1.0 );
   myMatrix = vtkMatrix4x4::New();
   myTrsf = vtkTransform::New();
 }
@@ -109,11 +95,11 @@ GEOM_VTKTrihedronAxis::~GEOM_VTKTrihedronAxis()
   myTrsf->Delete();
 }
 
-void GEOM_VTKTrihedronAxis::SetSize( float theSize )
+void GEOM_VTKTrihedronAxis::SetSize( vtkFloatingPointType theSize )
 {
-  float aPosition[ 3 ] = { myOri[ 0 ] + myDir[ 0 ] * theSize,
-                           myOri[ 1 ] + myDir[ 1 ] * theSize,
-                           myOri[ 2 ] + myDir[ 2 ] * theSize };
+  vtkFloatingPointType aPosition[ 3 ] = { myOri[ 0 ] + myDir[ 0 ] * theSize,
+                                          myOri[ 1 ] + myDir[ 1 ] * theSize,
+                                          myOri[ 2 ] + myDir[ 2 ] * theSize };
                            
   myLineSource->SetPoint1( myOri[ 0 ], myOri[ 1 ], myOri[ 2 ] );
   myLineSource->SetPoint2( aPosition );
@@ -137,15 +123,22 @@ void GEOM_VTKTrihedronAxis::SetSize( float theSize )
   myArrowActor->SetUserMatrix( myMatrix );
   myArrowActor->SetPosition( aPosition );
     
+#ifdef IPAL21440
+  if( vtkCoordinate* aCoord = myLabelActor->GetPositionCoordinate()->GetReferenceCoordinate() )
+    aCoord->SetValue( aPosition );
+#else
   myLabelActor->SetPosition( 0, 0, 0 );
   myLabelActor->AddPosition( aPosition );
+#endif
 }
 
 void GEOM_VTKTrihedronAxis::Render(vtkRenderer* theRenderer)
 {
   myLineActor->Render( theRenderer );
   myArrowActor->Render( theRenderer );
+#ifndef IPAL21440
   myLabelActor->Render( theRenderer );
+#endif
 
   vtkCamera* aCamera = theRenderer->GetActiveCamera();
   SetCamera( aCamera );
@@ -158,7 +151,7 @@ gp_Pnt GEOM_VTKTrihedronAxis::GetOri() const
 
 void GEOM_VTKTrihedronAxis::SetAxis( const gp_Ax1& theAxis,
                                      const int     theRot,
-                                     float         theColor[ 3 ] )
+                                     vtkFloatingPointType theColor[ 3 ] )
 {
   gp_Pnt aLoc = theAxis.Location();
   gp_Dir aDir = theAxis.Direction();
@@ -171,27 +164,27 @@ void GEOM_VTKTrihedronAxis::SetAxis( const gp_Ax1& theAxis,
   myDir[ 1 ] = aDir.Y();
   myDir[ 2 ] = aDir.Z();
 
-  float aColor[ 3 ] = { 0, 0, 0 };
+  vtkFloatingPointType aColor[ 3 ] = { 0, 0, 0 };
   aColor[ theRot ] = 1;
-  vtkProperty* aProperty = vtkProperty::New();
   if ( theColor[ 0 ] == -1 )
-    aProperty->SetColor( aColor[ 0 ], aColor[ 1 ], aColor[ 2 ] );
+    VTKViewer_Axis::SetColor( aColor[ 0 ], aColor[ 1 ], aColor[ 2 ] );
   else
-    aProperty->SetColor( theColor[ 0 ], theColor[ 1 ], theColor[ 2 ] );
-  SetProperty( aProperty );
-  aProperty->Delete();
+    VTKViewer_Axis::SetColor( theColor[ 0 ], theColor[ 1 ], theColor[ 2 ] );
 
+#ifdef IPAL21440
+  if      ( theRot == 0 ) myTextMapper->SetInput( "X" );
+  else if ( theRot == 1 ) myTextMapper->SetInput( "Y" );
+  else if ( theRot == 2 ) myTextMapper->SetInput( "Z" );
+#else
   if      ( theRot == 0 ) myVectorText->SetText( "X" );
   else if ( theRot == 1 ) myVectorText->SetText( "Y" );
   else if ( theRot == 2 ) myVectorText->SetText( "Z" );
+#endif
 }
 
-void GEOM_VTKTrihedronAxis::SetColor( const float theColor[ 3 ] )
+void GEOM_VTKTrihedronAxis::SetColor( const vtkFloatingPointType theColor[ 3 ] )
 {
-  vtkProperty* aProperty = vtkProperty::New();
-  aProperty->SetColor( theColor[ 0 ], theColor[ 1 ], theColor[ 2 ] );
-  SetProperty( aProperty );
-  aProperty->Delete();
+  VTKViewer_Axis::SetColor( theColor[ 0 ], theColor[ 1 ], theColor[ 2 ] );
 }
 
 
@@ -208,9 +201,18 @@ GEOM_VTKTrihedron::GEOM_VTKTrihedron()
   myMapper = vtkPolyDataMapper::New();
   myAxis[ 0 ] = myAxis[ 1 ] = myAxis[ 2 ] = 0;
   mySize = 100;
-  SetInfinitive( true );
-  myColor[ 0 ] = myColor[ 1 ] = myColor[ 1 ] = -1;
-  SetInfinitive( true );
+
+  myColor[ 0 ] = myColor[ 1 ] = myColor[ 2 ] = -1;
+
+  myDefaultColor[ 0 ] = myDefaultColor[ 1 ] = myDefaultColor[ 2 ] = 1;
+
+  myPreHighlightColor[ 0 ] = 0;
+  myPreHighlightColor[ 1 ] = myPreHighlightColor[ 2 ] = 1;
+
+  myHighlightColor[ 0 ] = myHighlightColor[ 1 ] = myHighlightColor[ 2 ] = 1;
+
+  //SetInfinitive( true );
+  SetPickable( true );
 }
 
 GEOM_VTKTrihedron::~GEOM_VTKTrihedron()
@@ -222,7 +224,7 @@ GEOM_VTKTrihedron::~GEOM_VTKTrihedron()
     myMapper->Delete();
 }
 
-void GEOM_VTKTrihedron::SetSize( float theSize )
+void GEOM_VTKTrihedron::SetSize( vtkFloatingPointType theSize )
 {
   mySize = theSize;
   for ( int i = 0; i < 3; i++ )
@@ -262,6 +264,12 @@ void GEOM_VTKTrihedron::SetSize( float theSize )
   aRes->Delete();
 }
 
+void GEOM_VTKTrihedron::SetVisibility( int theVisibility )
+{
+  Superclass::SetVisibility( theVisibility );
+  SetVisibility( theVisibility == 1 ? VTKViewer_Trihedron::eOn : VTKViewer_Trihedron::eOff );
+}
+
 void GEOM_VTKTrihedron::SetVisibility( VTKViewer_Trihedron::TVisibility theVis )
 {
   for ( int i = 0; i < 3; i++ )
@@ -351,7 +359,7 @@ void GEOM_VTKTrihedron::Render(vtkRenderer* r, vtkMapper *)
   ( (GEOM_VTKTrihedronAxis*)myAxis[ 2 ] )->Render( r );
 }
 
-void GEOM_VTKTrihedron::SetColor( float r, float g, float b )
+void GEOM_VTKTrihedron::SetColor( vtkFloatingPointType r, vtkFloatingPointType g, vtkFloatingPointType b )
 {
   myColor[ 0 ] = r;
   myColor[ 1 ] = g;
@@ -362,7 +370,7 @@ void GEOM_VTKTrihedron::SetColor( float r, float g, float b )
   if ( myAxis[ 2 ] ) ( (GEOM_VTKTrihedronAxis*)myAxis[ 2 ] )->SetColor( myColor );
 }
 
-void GEOM_VTKTrihedron::GetColor( float& r, float& g, float& b )
+void GEOM_VTKTrihedron::GetColor( vtkFloatingPointType& r, vtkFloatingPointType& g, vtkFloatingPointType& b )
 {
   r = myColor[ 0 ];
   g = myColor[ 1 ];
@@ -376,21 +384,48 @@ bool GEOM_VTKTrihedron::IsSetCamera() const
 
 bool GEOM_VTKTrihedron::IsResizable() const
 {
-  return true;
+  return false;
 }
 
+void GEOM_VTKTrihedron::Highlight( bool theIsHighlight )
+{
+  if( theIsHighlight )
+    SetAxesColors( myHighlightColor );
+  else
+    ResetAxesColors();
 
+  Superclass::Highlight( theIsHighlight );
+}
 
+bool GEOM_VTKTrihedron::PreHighlight( vtkInteractorStyle *theInteractorStyle, 
+                                      SVTK_SelectionEvent* theSelectionEvent,
+                                      bool theIsHighlight )
+{
+  if ( !GetPickable() )
+    return false;  
 
+  if ( !isHighlighted() )
+  {
+    if( theIsHighlight )
+      SetAxesColors( myPreHighlightColor );
+    else
+      ResetAxesColors();
+  }
 
+  return Superclass::PreHighlight( theInteractorStyle, theSelectionEvent, theIsHighlight );
+}
 
+void GEOM_VTKTrihedron::ResetAxesColors()
+{
+  if( myColor[0] != -1 )
+    SetAxesColors( myColor );
+  else
+    SetAxesColors( myDefaultColor, true );
+}
 
-
-
-
-
-
-
-
-
-
+void GEOM_VTKTrihedron::SetAxesColors( vtkFloatingPointType theColor[3], bool theIsDiffuse )
+{
+  myAxis[ 0 ]->SetColor( theColor[0], theIsDiffuse ? 0.0 : theColor[1], theIsDiffuse ? 0.0 : theColor[2] );
+  myAxis[ 1 ]->SetColor( theIsDiffuse ? 0.0 : theColor[0], theColor[1], theIsDiffuse ? 0.0 : theColor[2] );
+  myAxis[ 2 ]->SetColor( theIsDiffuse ? 0.0 : theColor[0], theIsDiffuse ? 0.0 : theColor[1], theColor[2] );
+}