OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0033513: Visualization - Integration of the ability to zoom with vertical mouse movements

Browse Source 
Added a new gesture for zooming after vertical mouse movement - AIS_MouseGesture_ZoomVertical
This commit is contained in:
carlosah 2023-10-24 15:20:10 +01:00 committed by dpasukhi
parent ca0c5a4074
commit 9fcfec881c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AIS/AIS_MouseGesture.hxx
View File

@ -29,6 +29,8 @@ enum AIS_MouseGesture
// //
AIS_MouseGesture_Zoom, //!< view zoom gesture; AIS_MouseGesture_Zoom, //!< view zoom gesture;
//! move mouse left to zoom-out, and to the right to zoom-in //! move mouse left to zoom-out, and to the right to zoom-in
AIS_MouseGesture_ZoomVertical, //!< view zoom gesture;
//! move mouse up to zoom-out, and to the down to zoom-in
AIS_MouseGesture_ZoomWindow, //!< view zoom by window gesture; AIS_MouseGesture_ZoomWindow, //!< view zoom by window gesture;
//! press button to start, move mouse to define rectangle, release to finish //! press button to start, move mouse to define rectangle, release to finish
AIS_MouseGesture_Pan, //!< view panning gesture AIS_MouseGesture_Pan, //!< view panning gesture

13
src/AIS/AIS_ViewController.cxx
View File

@ -843,6 +843,7 @@ bool AIS_ViewController::UpdateMouseButtons (const Graphic3d_Vec2i& thePoint,
} }
case AIS_MouseGesture_Zoom: case AIS_MouseGesture_Zoom:
case AIS_MouseGesture_ZoomWindow: case AIS_MouseGesture_ZoomWindow:
case AIS_MouseGesture_ZoomVertical:
{ {
if (!myToAllowZooming) if (!myToAllowZooming)
{ {
@ -1043,6 +1044,7 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
break; break;
} }
case AIS_MouseGesture_Zoom: case AIS_MouseGesture_Zoom:
case AIS_MouseGesture_ZoomVertical:
{ {
if (!myToAllowZooming) if (!myToAllowZooming)
{ {
@ -1051,15 +1053,20 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
const double aZoomTol = theIsEmulated const double aZoomTol = theIsEmulated
? double(myTouchToleranceScale) * myTouchZoomThresholdPx ? double(myTouchToleranceScale) * myTouchZoomThresholdPx
: 0.0; : 0.0;
if (double (Abs (aDelta.x())) > aZoomTol) const double aScrollDelta = myMouseActiveGesture == AIS_MouseGesture_Zoom
? aDelta.x()
: aDelta.y();
if (Abs (aScrollDelta) > aZoomTol)
{ {
UpdateZoom (Aspect_ScrollDelta (aDelta.x())); if (UpdateZoom (Aspect_ScrollDelta (aScrollDelta)))
{
toUpdateView = true;
}
myUI.Dragging.ToMove = true; myUI.Dragging.ToMove = true;
myUI.Dragging.PointTo = thePoint; myUI.Dragging.PointTo = thePoint;
myMouseProgressPoint = thePoint; myMouseProgressPoint = thePoint;
toUpdateView = true;
} }
break; break;
} }