OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0030484: Visualization, SelectMgr_ViewerSelector - Graphic3d_TMF_2d persistence sorting issues

Browse Source 
Added property to SelectableObject for selection focused on display priority.
Modified SelectMgr_ViewerSelector CompareResults based on the focus priority property.
Added display priority to the sorting criterion
Added tests for multiple types of sensitive entities.
Modified vpriority command to change an object's selection priority.
This commit is contained in:
drochalo
2024-01-17 10:36:42 +00:00
committed by dpasukhi
parent ad9840d4d4
commit fc51ce503e
7 changed files with 395 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -6390,6 +6390,79 @@ static Standard_Integer VSelect (Draw_Interpretor& ,
return 0;
}
//=======================================================================
//function : VSelectPriority
//purpose : Prints or sets the selection priority for an object
//=======================================================================
static Standard_Integer VSelectPriority (Draw_Interpretor& theDI,
Standard_Integer theNbArgs,
const char** theArgVec)
{
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
ViewerTest_AutoUpdater anUpdateTool (aContext, ViewerTest::CurrentView());
if (aContext.IsNull())
{
Message::SendFail("Error: no active viewer");
return 1;
}
TCollection_AsciiString aLastArg(theArgVec[theNbArgs - 1]);
Standard_Integer aPriority = -1;
Standard_Integer aNbArgs = theNbArgs;
if (aNbArgs < 2 || aNbArgs > 3)
{
Message::SendFail("Syntax error: wrong number of arguments! See usage:");
theDI.PrintHelp (theArgVec[0]);
return 1;
}
if (aLastArg.IsIntegerValue())
{
TCollection_AsciiString aFocusArg(theArgVec[1]);
aPriority = aLastArg.IntegerValue();
--aNbArgs;
if (aPriority < 0)
{
Message::SendFail() << "Syntax error: the specified selection priority value '" << aLastArg << "' is invalid ]";
return 1;
}
}
else
{
anUpdateTool.Invalidate();
}
for (Standard_Integer anArgIter = 1; anArgIter < aNbArgs; ++anArgIter)
{
TCollection_AsciiString aName(theArgVec[anArgIter]);
Handle(AIS_InteractiveObject) anIObj;
GetMapOfAIS().Find2 (aName, anIObj);
if (anIObj.IsNull())
{
Message::SendFail() << "Error: the object '" << theArgVec[1] << "' is not displayed";
return 1;
}
Handle(SelectMgr_EntityOwner) anOwner = anIObj->GlobalSelOwner();
if (!anOwner.IsNull())
{
if (aPriority == Graphic3d_DisplayPriority_INVALID)
{
theDI << anOwner->Priority() << " ";
}
else
{
anOwner->SetPriority (aPriority);
}
}
else
{
Message::SendFail() << "Error: the object '" << theArgVec[1] << "' is does not have a selection priority attached.";
return 1;
}
}
return 0;
}
//=======================================================================
//function : VMoveTo
//purpose : Emulates cursor movement to defined pixel position
@@ -14431,6 +14504,11 @@ Emulate different types of selection:
5) Selection scheme replace, replaceextra, xor, add or remove (replace by default).
)" /* [vselect] */);
addCmd("vselectpriority", VSelectPriority, /* [vselectpriority] */ R"(
vselectpriority name [value]
Prints or sets the selection priority for an object.
)" /* [vselectpriority] */);
addCmd ("vmoveto", VMoveTo, /* [vmoveto] */ R"(
vmoveto [x y] [-reset]
Emulate cursor movement to pixel position (x,y).