X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetValidated.cpp;h=c9695948935874cd0a2828b200b479f90c1da630;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=e60685b0cc5e2758cfd8b573ef25502d3aa1dc81;hpb=bbef0297c85f81513744d7fa64a953cc223c8f4b;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp index e60685b0c..c96959489 100644 --- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp +++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -33,8 +32,8 @@ #include #include #include -#include #include +#include #include #include @@ -97,29 +96,105 @@ void ModuleBase_WidgetValidated::restoreAttributeValue(const AttributePtr& theAt myAttributeStore->restoreAttributeValue(theAttribute, myWorkshop); } + +//******************************************************************** +void ModuleBase_WidgetValidated::collectSubBodies(const ResultBodyPtr& theBody, + AIS_NListOfEntityOwner& theList) +{ + AISObjectPtr aIOPtr; + TopoDS_Shape aTDShape; + int aNb = theBody->numberOfSubs(); + for (int i = 0; i < aNb; i++) { + ResultBodyPtr aSub = theBody->subResult(i); + if (aSub->numberOfSubs() > 0) + collectSubBodies(aSub, theList); + else { + aTDShape = aSub->shape()->impl(); + aIOPtr = myWorkshop->findPresentation(aSub); + if (aIOPtr.get()) { + Handle(AIS_InteractiveObject) anIO = aIOPtr->impl(); + theList.Append(new StdSelect_BRepOwner(aTDShape, anIO)); + } + else + theList.Append(new StdSelect_BRepOwner(aTDShape)); + } + } +} + //******************************************************************** bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& thePrs) { bool aValid = true; - Handle(SelectMgr_EntityOwner) anOwner = thePrs->owner(); + AIS_NListOfEntityOwner aOwnersList; + if (!thePrs->owner().IsNull()) + aOwnersList.Append(thePrs->owner()); // if an owner is null, the selection happens in the Object browser. // creates a selection owner on the base of object shape and the object AIS object - if (anOwner.IsNull() && thePrs->owner().IsNull() && thePrs->object().get()) { + if ((aOwnersList.Size() == 0) && thePrs->object().get()) { ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); GeomShapePtr aShape = aResult.get() ? aResult->shape() : GeomShapePtr(); // some results have no shape, e.g. the parameter one. So, they should not be validated if (aShape.get()) { const TopoDS_Shape aTDShape = aShape->impl(); Handle(AIS_InteractiveObject) anIO = myWorkshop->selection()->getIO(thePrs); - anOwner = new StdSelect_BRepOwner(aTDShape, anIO); + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape, anIO)); myPresentedObject = aResult; } - else - aValid = false; // only results with a shape can be filtered + else { + //FeaturePtr aFeature = ModelAPI_Feature::feature(thePrs->object()); + FeaturePtr aFeature = std::dynamic_pointer_cast(thePrs->object()); + if (aFeature.get()) { + // Use feature as a reference to all its results + myPresentedObject = aFeature; + AttributePtr anAttr = attribute(); + std::string aType = anAttr->attributeType(); + + // Check that results of Feature is acceptable by filters for selection attribute + if (aType == ModelAPI_AttributeSelection::typeId()) { + AttributeSelectionPtr aSelectAttr = + std::dynamic_pointer_cast(anAttr); + aSelectAttr->setValue(myPresentedObject, GeomShapePtr(), true); + GeomShapePtr aShapePtr = aSelectAttr->value(); + if (!aShapePtr.get() && aSelectAttr->contextFeature().get() && + aSelectAttr->contextFeature()->firstResult().get()) { + aShapePtr = aSelectAttr->contextFeature()->firstResult()->shape(); + } + if (aShapePtr.get()) { + const TopoDS_Shape aTDShape = aShapePtr->impl(); + Handle(AIS_InteractiveObject) anIO = myWorkshop->selection()->getIO(thePrs); + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape, anIO)); + } + } + else { + ResultPtr aFirstRes = aFeature->firstResult(); + if (aFirstRes.get()) { + ResultBodyPtr aBody = std::dynamic_pointer_cast(aFirstRes); + if (aBody.get() && (aBody->numberOfSubs() > 0)) + collectSubBodies(aBody, aOwnersList); + else { + GeomShapePtr aShapePtr = ModelAPI_Tools::shape(aFirstRes); + if (aShapePtr.get()) { + TopoDS_Shape aTDShape = aShapePtr->impl(); + AISObjectPtr aIOPtr = myWorkshop->findPresentation(aFirstRes); + if (aIOPtr.get()) { + Handle(AIS_InteractiveObject) anIO = + aIOPtr->impl(); + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape, anIO)); + } + else + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape)); + } + } + } + } + } + } } + aValid = (aOwnersList.Size() > 0); // only results with a shape can be filtered + // checks the owner by the AIS context activated filters - if (!anOwner.IsNull()) { + if (aOwnersList.Size() > 0) { // the widget validator filter should be active, but during check by preselection // it is not yet activated, so we need to activate/deactivate it manually bool isActivated = isFilterActivated(); @@ -135,13 +210,19 @@ bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& if (!aContext.IsNull()) { const SelectMgr_ListOfFilter& aFilters = aContext->Filters(); SelectMgr_ListIteratorOfListOfFilter anIt(aFilters); + AIS_NListOfEntityOwner::Iterator aOIt; for (; anIt.More() && aValid; anIt.Next()) { Handle(SelectMgr_Filter) aFilter = anIt.Value(); - aValid = aFilter->IsOk(anOwner); + for (aOIt.Init(aOwnersList); aOIt.More(); aOIt.Next()) { + aValid = aFilter->IsOk(aOIt.Value()); + if (!aValid) + break; + } + if (!aValid) + break; } } - if (!isActivated) - { + if (!isActivated) { // reset filters set in activateSelectionFilters above myWorkshop->selectionActivate()->updateSelectionFilters(); clearValidatedCash(); @@ -149,10 +230,19 @@ bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& } // removes created owner - if (!anOwner.IsNull() && anOwner != thePrs->owner()) { - anOwner.Nullify(); + if (aOwnersList.Size() > 0 && thePrs->owner().IsNull()) { myPresentedObject = ObjectPtr(); } + if (!aValid) { + // Clear attribute if it still has selection + AttributePtr anAttr = attribute(); + std::string aType = anAttr->attributeType(); + if (aType == ModelAPI_AttributeSelection::typeId()) { + AttributeSelectionPtr aSelectAttr = + std::dynamic_pointer_cast(anAttr); + aSelectAttr->removeTemporaryValues(); + } + } return aValid; } @@ -238,8 +328,6 @@ bool ModuleBase_WidgetValidated::isValidAttribute(const AttributePtr& theAttribu //******************************************************************** bool ModuleBase_WidgetValidated::isFilterActivated() const { - bool isActivated = false; - Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter(); ModuleBase_IViewer* aViewer = myWorkshop->viewer(); @@ -399,12 +487,9 @@ QList ModuleBase_WidgetValidated::getFilteredSelected() void ModuleBase_WidgetValidated::filterPresentations(QList& theValues) { QList aValidatedValues; - - QList::const_iterator anIt = theValues.begin(), aLast = theValues.end(); - bool isDone = false; - for (; anIt != aLast; anIt++) { - if (isValidInFilters(*anIt)) - aValidatedValues.append(*anIt); + foreach(ModuleBase_ViewerPrsPtr aPrs, theValues) { + if (isValidInFilters(aPrs)) + aValidatedValues.append(aPrs); } if (aValidatedValues.size() != theValues.size()) { theValues.clear(); @@ -415,31 +500,42 @@ void ModuleBase_WidgetValidated::filterPresentations(QList& theValues) { - std::set aCompSolids; + std::set aFilterOut; // all objects that must be filtered out with their children QList aValidatedValues; // Collect compsolids. QList::const_iterator anIt = theValues.begin(), aLast = theValues.end(); - for (; anIt != aLast; anIt++) { + for(; anIt != aLast; anIt++) { const ModuleBase_ViewerPrsPtr& aViewerPrs = *anIt; ObjectPtr anObject = aViewerPrs->object(); - ResultCompSolidPtr aResultCompSolid = - std::dynamic_pointer_cast(anObject); - if(aResultCompSolid.get()) { - aCompSolids.insert(aResultCompSolid); + ResultBodyPtr aResultCompSolid = + std::dynamic_pointer_cast(anObject); + if (aResultCompSolid.get()) { + for(int aSubIndex = 0; aSubIndex < aResultCompSolid->numberOfSubs(); aSubIndex++) + aFilterOut.insert(aResultCompSolid->subResult(aSubIndex)); + } else { // it could be a whole feature selected, so, add all results of this feature + FeaturePtr aFeature = std::dynamic_pointer_cast(anObject); + if (aFeature.get()) { + std::list::const_iterator aRes = aFeature->results().cbegin(); + for(; aRes != aFeature->results().cend(); aRes++) + aFilterOut.insert(*aRes); + } } } // Filter sub-solids of compsolids. anIt = theValues.begin(); - for (; anIt != aLast; anIt++) { + for(; anIt != aLast; anIt++) { const ModuleBase_ViewerPrsPtr& aViewerPrs = *anIt; ObjectPtr anObject = aViewerPrs->object(); ResultPtr aResult = std::dynamic_pointer_cast(anObject); - ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aResult); - if(aResCompSolidPtr.get() && (aCompSolids.find(aResCompSolidPtr) != aCompSolids.end())) { - // Skip sub-solid of compsolid. - continue; + while(aResult.get()) { + if (aFilterOut.find(aResult) != aFilterOut.end()) // skip if parent is filtered out + break; + aResult = ModelAPI_Tools::bodyOwner(aResult); // iterate all parents + } + if (aResult.get()) { + continue; // skip } else { aValidatedValues.append(*anIt); }