X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetValidated.cpp;h=bd9cdbd76b9a019995b20b451caf0bcbdcfa4767;hb=2e0f664e66dc2b46796df2953f52871b10799173;hp=b59050037e12cd38b8344f16cf1b79bc70aea87d;hpb=4f480152c47932671dec2ad9313c0ff9dc5d2c90;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp index b59050037..bd9cdbd76 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-2019 CEA/DEN, EDF R&D // // 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 @@ -102,48 +101,74 @@ void ModuleBase_WidgetValidated::restoreAttributeValue(const AttributePtr& theAt 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 { - FeaturePtr aFeature = ModelAPI_Feature::feature(thePrs->object()); + //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 aShape = aSelectAttr->value(); + if (!aShape.get() && aSelectAttr->contextFeature().get() && + aSelectAttr->contextFeature()->firstResult().get()) { + aShape = aSelectAttr->contextFeature()->firstResult()->shape(); + } 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)); + } + else + aValid = false; + //aSelectAttr->setValue(ObjectPtr(), GeomShapePtr(), true); + } + else { + ResultPtr aResult = aFeature->firstResult(); + if (aResult.get()) { + GeomShapePtr aShapePtr = ModelAPI_Tools::shape(aResult); + if (aShapePtr.get()) { + const TopoDS_Shape aTDShape = aShapePtr->impl(); + AISObjectPtr aIOPtr = myWorkshop->findPresentation(aResult); + if (aIOPtr.get()) { + Handle(AIS_InteractiveObject) anIO = aIOPtr->impl(); + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape, anIO)); + } + else { + aOwnersList.Append(new StdSelect_BRepOwner(aTDShape)); + } + } } - aSelectAttr->setValue(ObjectPtr(), GeomShapePtr(), true); + aValid = (aOwnersList.Size() > 0); // only results with a shape can be filtered } - else - aValid = false; // only results with a shape can be filtered } else aValid = false; // 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(); @@ -159,13 +184,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(); @@ -173,10 +204,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; } @@ -423,12 +463,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();