kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19019 from hyarion/refactor/countObjectsOfType

Browse Source 
Refactor countObjectsOfType in selection and document
This commit is contained in:
Chris Hennes
2025-01-14 16:05:12 -06:00
committed by GitHub
parent 70423b7d59 ef27cc7d17
commit 115cd050bc
31 changed files with 194 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/Mod/Fem/Gui/Command.cpp
View File

@@ -223,8 +223,7 @@ bool CmdFemAddPart::isActive(void)
{
if (Gui::Control().activeDialog())
return false;
Base::Type type = Base::Type::fromName("Part::Feature");
return Gui::Selection().countObjectsOfType(type) > 0;
return Gui::Selection().countObjectsOfType<Part::Feature>(type) > 0;
}
*/
@@ -1165,7 +1164,7 @@ void CmdFemDefineNodesSet::activated(int)
bool CmdFemDefineNodesSet::isActive()
{
// Check for the selected mesh feature (all Mesh types)
if (getSelection().countObjectsOfType(Fem::FemMeshObject::getClassTypeId()) != 1) {
if (getSelection().countObjectsOfType<Fem::FemMeshObject>() != 1) {
return false;
}
@@ -1314,7 +1313,7 @@ void CmdFemDefineElementsSet::activated(int)
bool CmdFemDefineElementsSet::isActive()
{
// Check for the selected mesh feature (all Mesh types)
if (getSelection().countObjectsOfType(Fem::FemMeshObject::getClassTypeId()) != 1) {
if (getSelection().countObjectsOfType<Fem::FemMeshObject>() != 1) {
return false;
}
@@ -2028,25 +2027,25 @@ bool CmdFemPostClipFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostContoursFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostContoursFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;
@@ -2080,25 +2079,25 @@ bool CmdFemPostCutFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostContoursFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostContoursFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;
@@ -2132,22 +2131,22 @@ bool CmdFemPostDataAlongLineFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostContoursFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostContoursFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;
@@ -2182,22 +2181,22 @@ bool CmdFemPostDataAtPointFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;
@@ -2307,22 +2306,22 @@ bool CmdFemPostScalarClipFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible other filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostContoursFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostContoursFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;
@@ -2356,22 +2355,22 @@ bool CmdFemPostWarpVectorFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible other filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostContoursFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostContoursFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
return false;
@@ -2405,22 +2404,22 @@ bool CmdFemPostContoursFilter::isActive()
return false;
}
// only activate if a result is either a post pipeline or a possible other filter
if (getSelection().getObjectsOfType<Fem::FemPostPipeline>().size() == 1) {
if (getSelection().countObjectsOfType<Fem::FemPostPipeline>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostCutFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostCutFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostDataAlongLineFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostDataAlongLineFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostScalarClipFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostScalarClipFilter>() == 1) {
return true;
}
else if (getSelection().getObjectsOfType<Fem::FemPostWarpVectorFilter>().size() == 1) {
else if (getSelection().countObjectsOfType<Fem::FemPostWarpVectorFilter>() == 1) {
return true;
}
return false;