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

Fix sensitivity

Browse Source
This commit is contained in:
mzernova 2025-01-31 23:19:19 +00:00
parent b6b7767a4d
commit 706bd14880
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/AIS/AIS_Manipulator.cxx
View File

@ -646,6 +646,13 @@ Standard_Boolean AIS_Manipulator::ObjectTransformation(const Standard_Integer t
mySectorGroup->SetTransformation(aTrsf); mySectorGroup->SetTransformation(aTrsf);
} }
// Change value of an angle if it should have different sign.
if (anAngle * myPrevState < 0 && Abs(anAngle) < M_PI_2)
{
Standard_Real aSign = myPrevState > 0 ? -1.0 : 1.0;
anAngle = aSign * (M_PI * 2 - anAngle);
}
gp_Trsf aNewTrsf; gp_Trsf aNewTrsf;
aNewTrsf.SetRotation(aCurrAxis, anAngle); aNewTrsf.SetRotation(aCurrAxis, anAngle);
theTrsf *= aNewTrsf; theTrsf *= aNewTrsf;
@ -720,14 +727,14 @@ Standard_Boolean AIS_Manipulator::ProcessDragging(const Handle(AIS_InteractiveCo
return Standard_True; return Standard_True;
} }
case AIS_DragAction_Stop: { case AIS_DragAction_Stop: {
// at the end of transformation redisplay for updating sensitive areas
StopTransform(true); StopTransform(true);
if (mySkinMode == ManipulatorSkin_Flat) if (mySkinMode == ManipulatorSkin_Flat)
{ {
mySectorGroup->Clear(); mySectorGroup->Clear();
} }
if (aCtx->IsDisplayed(this)) else if (aCtx->IsDisplayed(this))
{ {
// at the end of transformation redisplay for updating sensitive areas
aCtx->Redisplay(this, true); aCtx->Redisplay(this, true);
} }
return Standard_True; return Standard_True;
@ -1504,7 +1511,7 @@ void AIS_Manipulator::ComputeSelection(const Handle(SelectMgr_Selection)& theSel
// define sensitivity by point // define sensitivity by point
Handle(Select3D_SensitivePoint) aPnt = Handle(Select3D_SensitivePoint) aPnt =
new Select3D_SensitivePoint(anOwner, myAxes[anIt].ScalerCubePosition()); new Select3D_SensitivePoint(anOwner, myAxes[anIt].ScalerCubePosition());
aPnt->SetSensitivityFactor(15); aPnt->SetSensitivityFactor(aHighSensitivity);
theSelection->Add(aPnt); theSelection->Add(aPnt);
} }
// enlarge sensitivity by triangulation // enlarge sensitivity by triangulation

5
src/AIS/AIS_Manipulator.hxx
View File

@ -688,10 +688,7 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
void SetIndent(const Standard_ShortReal theValue) { myIndent = theValue; } void SetIndent(const Standard_ShortReal theValue) { myIndent = theValue; }
Standard_ShortReal Size() const Standard_ShortReal Size() const { return myInnerRadius + myDiskThickness + myIndent * 2; }
{
return myLength + myBoxSize + myDiskThickness + myIndent * 2.0f;
}
Standard_ShortReal InnerRadius() const { return myInnerRadius + myIndent * 2.0f; } Standard_ShortReal InnerRadius() const { return myInnerRadius + myIndent * 2.0f; }

6
src/OpenGl/OpenGl_Structure.cxx
View File

@ -407,7 +407,10 @@ void OpenGl_Structure::renderGeometry(const Handle(OpenGl_Workspace)& theWorkspa
const OpenGl_Group* aGroup = aGroupIter.Value(); const OpenGl_Group* aGroup = aGroupIter.Value();
const gp_Trsf& aTrsf = aGroup->Transformation(); const gp_Trsf& aTrsf = aGroup->Transformation();
if (aTrsf.Form() != gp_Identity)
{
applyTransformation(aCtx, aTrsf, Standard_True); applyTransformation(aCtx, aTrsf, Standard_True);
}
const Handle(Graphic3d_TransformPers)& aTrsfPers = aGroup->TransformPersistence(); const Handle(Graphic3d_TransformPers)& aTrsfPers = aGroup->TransformPersistence();
if (!aTrsfPers.IsNull()) if (!aTrsfPers.IsNull())
@ -425,9 +428,12 @@ void OpenGl_Structure::renderGeometry(const Handle(OpenGl_Workspace)& theWorkspa
aCtx->ApplyModelViewMatrix(); aCtx->ApplyModelViewMatrix();
} }
if (aTrsf.Form() != gp_Identity)
{
applyTransformation(aCtx, aTrsf, Standard_False); applyTransformation(aCtx, aTrsf, Standard_False);
} }
} }
}
// ======================================================================= // =======================================================================
// function : applyTransformation // function : applyTransformation

4
tests/vselect/bugs/bug32750
View File

@ -18,8 +18,8 @@ vzoom 0.5
vmanipulator m -attach b vmanipulator m -attach b
#set mouse coordinates for actions #set mouse coordinates for actions
set mouse_pick {205 155} set mouse_pick {206 155}
set mouse_drag1 {205 55} set mouse_drag1 {206 55}
set mouse_pick2 {250 10} set mouse_pick2 {250 10}
set mouse_pick3 {250 200} set mouse_pick3 {250 200}