Skip to content

5.9.0 dev #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2025
Merged

5.9.0 dev #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02f763
Pre-release 5.9.0. Improvements to the vtkViewCubeActor class: a seco…
Apr 11, 2025
08d5130
Pre-release 5.9.0. Improvements to the vtkViewCubeActor class: a seco…
Apr 11, 2025
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
2 changes: 1 addition & 1 deletion cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

set (VTK_CONTRIB_MAJOR_VERSION "5")
set (VTK_CONTRIB_MINOR_VERSION "8")
set (VTK_CONTRIB_MINOR_VERSION "9")
set (VTK_CONTRIB_RELEASE_VERSION "0")
set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})

Expand Down
28 changes: 20 additions & 8 deletions src/VtkContrib/public/VtkContrib/vtkViewCubeActor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <vtkPropAssembly.h>
#include <vtkActor.h>
#include <vtkDoubleArray.h>
#include <vtkPolyData.h>
#include <vtkPolyDataMapper.h>
#include <vtkCellPicker.h>
Expand Down Expand Up @@ -87,6 +88,11 @@ class vtkViewCubeActor : public vtkPropAssembly
*/
virtual void PickCallback (int x, int y);

/**
* Regarde si une face du cube est pointée aux coordonnées transmises et, le cas échéant, met cette face en surbrillance. Annule ue éventuelle surbrillance antérieure d'une autre face.
*/
virtual void HighlightCallback (int x, int y);


protected:

Expand All @@ -107,22 +113,28 @@ class vtkViewCubeActor : public vtkPropAssembly
vtkViewCubeActor (const vtkViewCubeActor&);
vtkViewCubeActor& operator = (const vtkViewCubeActor&);

vtkRenderer *Renderer, *DrivenRenderer;
vtkRenderer *Renderer, *DrivenRenderer;

/** Le "cube". */
vtkSmartPointer<vtkPolyData> CubePolyData;
vtkSmartPointer<vtkActor> CubeActor;
vtkSmartPointer<vtkPolyDataMapper> CubePolyDataMapper;
vtkSmartPointer<vtkPolyData> CubePolyData, HighlightPolyData;
vtkSmartPointer<vtkActor> CubeActor, HighlightActor;
vtkSmartPointer<vtkPolyDataMapper> CubePolyDataMapper, HighlightPolyDataMapper;

/** Le picking sur les faces du ViewCube. */
vtkSmartPointer<vtkCellPicker> CellPicker;
vtkSmartPointer<vtkCellPicker> CellPicker;

/** La dernière face pickée, éventuelle face en cours de surbrillance. */
unsigned char LastPickedFace, HighlightedFace;

/** Les labels. */
vtkSmartPointer<vtkVectorText> XPlusVectorText, XMinusVectorText, YPlusVectorText, YMinusVectorText, ZPlusVectorText, ZMinusVectorText;
vtkSmartPointer<vtkActor> XPlusActor, XMinusActor, YPlusActor, YMinusActor, ZPlusActor, ZMinusActor;
vtkSmartPointer<vtkVectorText> XPlusVectorText, XMinusVectorText, YPlusVectorText, YMinusVectorText, ZPlusVectorText, ZMinusVectorText;
vtkSmartPointer<vtkActor> XPlusActor, XMinusActor, YPlusActor, YMinusActor, ZPlusActor, ZMinusActor;

/** Les vecteurs "orientation vers le haut". */
vtkSmartPointer<vtkDoubleArray> ViewUpVectors;

/** L'éventuelle transformation utilisateur. */
vtkTransform *Transform;
vtkTransform *Transform;
}; // class vtkViewCubeActor


Expand Down
Loading