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

0031221: Visualization - selection filter in context

Browse Source 
- Added the new filter SelectMgr_AndOrFilter which allows to define the context filter. By default OR selection filter is used
 - Added the enumeration SelectMgr_FilterType provides filter types
 - To define behavior SelectMgr_AndOrFilter use  SetFilterType in AIS_InteractiveContext
 - Added the test
 - SelectMgr_OrFilter don't store the disabled objects, it's stored in SelectMgr_AndOrFilter
This commit is contained in:
sshutina
2020-09-11 12:14:58 +03:00
committed by abv
parent b95caec47d
commit 897aeb207f
11 changed files with 271 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ViewerTest/ViewerTest.cxx
View File

@@ -5815,6 +5815,24 @@ static int VSelFilter(Draw_Interpretor& , Standard_Integer theArgc,
{
aContext->RemoveFilters();
}
else if (anArg == "-contextfilter" && anArgIter + 1 < theArgc)
{
TCollection_AsciiString aVal (theArgv[++anArgIter]);
aVal.LowerCase();
if (aVal == "and")
{
aContext->SetFilterType (SelectMgr_FilterType_AND);
}
else if (aVal == "or")
{
aContext->SetFilterType (SelectMgr_FilterType_OR);
}
else
{
Message::SendFail() << "Syntax error: wrong command attribute value '" << aVal << "'";
return 1;
}
}
else if (anArg == "-type"
&& anArgIter + 1 < theArgc)
{
@@ -5837,6 +5855,28 @@ static int VSelFilter(Draw_Interpretor& , Standard_Integer theArgc,
}
aContext->AddFilter (aFilter);
}
else if (anArg == "-secondtype"
&& anArgIter + 1 < theArgc)
{
TCollection_AsciiString aVal (theArgv[++anArgIter]);
TopAbs_ShapeEnum aShapeType = TopAbs_COMPOUND;
if (!TopAbs::ShapeTypeFromString (aVal.ToCString(), aShapeType))
{
Message::SendFail() << "Syntax error: wrong command attribute value '" << aVal << "'";
return 1;
}
Handle(SelectMgr_Filter) aFilter;
if (aShapeType == TopAbs_SHAPE)
{
aFilter = new AIS_TypeFilter (AIS_KOI_Shape);
}
else
{
aFilter = new StdSelect_ShapeTypeFilter (aShapeType);
}
aContext->AddFilter (aFilter);
}
else
{
Message::SendFail() << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'";
@@ -6782,8 +6822,13 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
__FILE__,vr, group);
theCommands.Add("vselfilter",
"vselfilter [-type {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}] [-clear]"
"vselfilter [-contextfilter {AND|OR}]"
"\n [-type {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}]"
"\n [-secondtype {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}]"
"\n [-clear]"
"\nSets selection shape type filter in context or remove all filters."
"\n : Option -contextfilter : To define a selection filter for two or more types of entity,"
"\n use value AND (OR by default)."
"\n : Option -type set type of selection filter. Filters are applyed with Or combination."
"\n : Option -clear remove all filters in context",
__FILE__,VSelFilter,group);