Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#

set (VTK_CONTRIB_MAJOR_VERSION "5")
set (VTK_CONTRIB_MINOR_VERSION "13")
set (VTK_CONTRIB_RELEASE_VERSION "1")
set (VTK_CONTRIB_MINOR_VERSION "14")
set (VTK_CONTRIB_RELEASE_VERSION "0")
set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})


18 changes: 16 additions & 2 deletions src/VtkContrib/public/VtkContrib/vtkTrihedron.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ class vtkTrihedron : public vtkPropAssembly
* En mode <I>2D off</I>, les positions sont relatives, chaque
* axe mesurant 1.1, donc l'offset est à comparer à 1.
*/
virtual void SetLabelsOffsets (
double xOffset, double yOffset, double zOffset);
virtual void SetLabelsOffsets (double xOffset, double yOffset, double zOffset);

/**
* @param Redimensionne l'épaisseur des axes du facteur transmis en
Expand Down Expand Up @@ -101,6 +100,21 @@ class vtkTrihedron : public vtkPropAssembly
*/
virtual void SetElevationColor (double r, double g, double b);

/**
* Rend les axes sensibles aux éclairages (Off par défaut).
* @since 5.14.0
*/
virtual void LightingOn ( );
virtual void LightingOff ( );
virtual void SetLighting (int onOff);

/**
* @return 1 si les axes sont sensibles aux éclairages, 0 dans le cas contraire.
* @warning Seul l'axe des abscisses est évalué.
* @since 5.14.0
*/
virtual int GetLighting ( );

/**
* Affiche les libellés dans le plan de la vue <I>true</I> ou dans
* l'espace 3D <I>false</I>..
Expand Down
41 changes: 41 additions & 0 deletions src/VtkContrib/vtkTrihedron.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ vtkTrihedron::vtkTrihedron ( )
SetAbscissaColor (xColor [0], xColor [1], xColor [2]);
SetOrdinateColor (yColor [0], yColor [1], yColor [2]);
SetElevationColor (zColor [0], zColor [1], zColor [2]);

LightingOff ( ); // v 5.14.0
} // vtkTrihedron::vtkTrihedron


Expand Down Expand Up @@ -470,6 +472,45 @@ void vtkTrihedron::SetElevationColor (double r, double g, double b)
} // vtkTrihedron::SetElevationColor


void vtkTrihedron::LightingOn ( )
{
if (0 != GetXAxisArrowActor ( ).GetProperty ( ))
GetXAxisArrowActor ( ).GetProperty ( )->LightingOn ( );
if (0 != GetYAxisArrowActor ( ).GetProperty ( ))
GetYAxisArrowActor ( ).GetProperty ( )->LightingOn ( );
if (0 != GetZAxisArrowActor ( ).GetProperty ( ))
GetZAxisArrowActor ( ).GetProperty ( )->LightingOn ( );
} // vtkTrihedron::LightingOn


void vtkTrihedron::LightingOff ( )
{
if (0 != GetXAxisArrowActor ( ).GetProperty ( ))
GetXAxisArrowActor ( ).GetProperty ( )->LightingOff ( );
if (0 != GetYAxisArrowActor ( ).GetProperty ( ))
GetYAxisArrowActor ( ).GetProperty ( )->LightingOff ( );
if (0 != GetZAxisArrowActor ( ).GetProperty ( ))
GetZAxisArrowActor ( ).GetProperty ( )->LightingOff ( );
} // vtkTrihedron::LightingOff


void vtkTrihedron::SetLighting (int onOff)
{
if (0 != GetXAxisArrowActor ( ).GetProperty ( ))
GetXAxisArrowActor ( ).GetProperty ( )->SetLighting (onOff);
if (0 != GetYAxisArrowActor ( ).GetProperty ( ))
GetYAxisArrowActor ( ).GetProperty ( )->SetLighting (onOff);
if (0 != GetZAxisArrowActor ( ).GetProperty ( ))
GetZAxisArrowActor ( ).GetProperty ( )->SetLighting (onOff);
} // vtkTrihedron::SetLighting


int vtkTrihedron::GetLighting ( )
{
return 0 == GetXAxisArrowActor ( ).GetProperty ( ) ? 0 : GetXAxisArrowActor ( ).GetProperty ( )->GetLighting ( );
} // vtkTrihedron::GetLighting


void vtkTrihedron::SetLabel2D (bool on)
{
if (true == on)
Expand Down
7 changes: 7 additions & 0 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 5.14.0 : 04/11/25
================

Méthodes Set/GetLighting de vtkTrihedron. Objectif : rendre les axes insensibles à l'éclairage pour qu'ils soient
toujours de la même couleur.


Version 5.13.1 : 24/10/25
================

Expand Down