Skip to content

Version 5.7.1 #8

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
Jan 14, 2025
Merged

Version 5.7.1 #8

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
6c8114e
Version 5.7.1. Magix3D bug fix (issue#166) : in constrained selection…
Jan 14, 2025
f57fe1e
Version 5.7.1. Magix3D bug fix (issue#166) : in constrained selection…
Jan 14, 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 @@ -4,7 +4,7 @@

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


3 changes: 2 additions & 1 deletion src/VtkContrib/public/VtkContrib/vtkConstrainedPointWidget2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class vtkConstrainedPointWidget2 : public vtkHandleWidget

/**
* Constructeur. S'associe une instance de vtkConstrainedPointHandleRepresentation2 pour représenter le point et effectuer son positionnement.
* @warning Désactivation des évènements sur les boutons du milieu et droit.
*/
vtkConstrainedPointWidget2 ( );

Expand Down Expand Up @@ -100,7 +101,7 @@ class vtkConstrainedPointHandleRepresentation2 : public vtkSphereHandleRepresent
* Versions simplifiées de la gestion interactive de la saisie.
*/
virtual void WidgetInteraction (double eventPos [2]);

/**
* @param Nouvel axe de contrainte de déplacement (0 -> X, 1 -> Y, 2 -> Z, autre => déplacement dans le plan de l'écran).
*/
Expand Down
8 changes: 8 additions & 0 deletions src/VtkContrib/vtkConstrainedPointWidget2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <vtkRenderer.h>
#include <vtkRenderWindow.h>
#include <vtkRenderWindowInteractor.h>
#include <vtkWidgetEventTranslator.h>

#include <assert.h>
#include <iostream>
Expand All @@ -19,6 +20,13 @@ using namespace std;
vtkConstrainedPointWidget2::vtkConstrainedPointWidget2 ( )
: vtkHandleWidget ( )
{
if (0 != GetEventTranslator ( ))
{
GetEventTranslator ( )->RemoveTranslation (vtkCommand::MiddleButtonPressEvent);
GetEventTranslator ( )->RemoveTranslation (vtkCommand::MiddleButtonReleaseEvent);
GetEventTranslator ( )->RemoveTranslation (vtkCommand::RightButtonPressEvent);
GetEventTranslator ( )->RemoveTranslation (vtkCommand::RightButtonReleaseEvent);
} // if (0 != GetEventTranslator ( ))
} // vtkConstrainedPointWidget2::vtkConstrainedPointWidget2


Expand Down
Loading
Loading