OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

0032116: Visualization - AIS_Manipulator is unusable when attaching to objects with Graphic3d_TMF_ZoomPers

Browse Source 
Recalculation of manipulator position if attached object has zooom transform persistence as well as set its anchor point in Transformation.
This commit is contained in:
drochalo
2023-10-04 17:01:46 +01:00
parent 38581280d0
commit 61230dff7d
1 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/AIS/AIS_Manipulator.cxx
View File

@@ -398,17 +398,25 @@ void AIS_Manipulator::Attach (const Handle(AIS_ManipulatorObjectSequence)& theOb
const Handle(AIS_InteractiveContext)& aContext = Object()->GetContext();
if (!aContext.IsNull())
{
if (!aContext->IsDisplayed (this))
if (!aCurObject.IsNull())
{
aContext->Display (this, Standard_False);
Handle(Graphic3d_TransformPers) aTransPers = aCurObject->TransformPersistence();
if (!aTransPers.IsNull())
{
aCurObject->TransformPersistence()->SetAnchorPoint(myPosition.Location());
}
}
if (!aContext->IsDisplayed(this))
{
aContext->Display(this, Standard_False);
}
else
{
aContext->Update (this, Standard_False);
aContext->RecomputeSelectionOnly (this);
aContext->Update(this, Standard_False);
aContext->RecomputeSelectionOnly(this);
}
aContext->Load (this);
aContext->Load(this);
}
if (theOptions.EnableModes)
@@ -750,6 +758,11 @@ void AIS_Manipulator::Transform (const gp_Trsf& theTrsf)
{
anObj->SetLocalTransformation (theTrsf * anOldTrsf);
}
Handle(Graphic3d_TransformPers) aTransPers = anObj->TransformPersistence();
if (!aTransPers.IsNull())
{
anObj->TransformPersistence()->SetAnchorPoint(myPosition.Location());
}
}
}
@@ -806,15 +819,32 @@ void AIS_Manipulator::updateTransformation()
{
gp_Trsf aTrsf;
if (!myIsZoomPersistentMode)
Handle(AIS_ManipulatorObjectSequence) anObjects = Objects();
Handle(AIS_InteractiveObject) anObj = Object();
for (AIS_ManipulatorObjectSequence::Iterator anObjIter(*anObjects); anObjIter.More(); anObjIter.Next())
{
aTrsf.SetTransformation (myPosition, gp::XOY());
anObj = anObjIter.Value();
}
else
if (!anObj.IsNull())
{
const gp_Dir& aVDir = myPosition.Direction();
const gp_Dir& aXDir = myPosition.XDirection();
aTrsf.SetTransformation (gp_Ax2 (gp::Origin(), aVDir, aXDir), gp::XOY());
Handle(Graphic3d_TransformPers) aTransPers = anObj->TransformPersistence();
if (!aTransPers.IsNull())
{
aTrsf.SetTransformation(myPosition, gp::XOY());
}
else
{
if (!myIsZoomPersistentMode)
{
aTrsf.SetTransformation(myPosition, gp::XOY());
}
else
{
const gp_Dir& aVDir = myPosition.Direction();
const gp_Dir& aXDir = myPosition.XDirection();
aTrsf.SetTransformation(gp_Ax2(gp::Origin(), aVDir, aXDir), gp::XOY());
}
}
}
Handle(TopLoc_Datum3D) aGeomTrsf = new TopLoc_Datum3D (aTrsf);