X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetValidated.cpp;h=308e14770edb8d0017fd96ef3200c0d52554cb87;hb=841cf9a52ac09e7adf22c187ffe6faed468e6626;hp=fd5e7e96a58bfbbb990489fd111b600ce8270e1d;hpb=df45eda3c5dc6ffbc8a964de309ca55533275d70;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp index fd5e7e96a..308e14770 100644 --- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp +++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp @@ -1,18 +1,41 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include -#include +#include #include +#include #include +#include #include #include +#include + #include #include #include #include -#include +#include #include +#include #include #include @@ -44,6 +67,12 @@ ObjectPtr ModuleBase_WidgetValidated::findPresentedObject(const AISObjectPtr& th return myPresentedObject; } +//******************************************************************** +void ModuleBase_WidgetValidated::deactivate() +{ + clearValidatedCash(); +} + //******************************************************************** void ModuleBase_WidgetValidated::clearValidatedCash() { @@ -87,16 +116,57 @@ bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& anOwner = 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()); + 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()) { + const TopoDS_Shape aTDShape = aShape->impl(); + Handle(AIS_InteractiveObject) anIO = myWorkshop->selection()->getIO(thePrs); + anOwner = 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(); + Handle(AIS_InteractiveObject) anIO = myWorkshop->selection()->getIO(thePrs); + anOwner = new StdSelect_BRepOwner(aTDShape, anIO); + } + } + aValid = !anOwner.IsNull(); // 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()) { // 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(); - if (!isActivated) - activateFilters(true); + if (!isActivated) { + QIntList aModuleSelectionFilters = myWorkshop->module()->selectionFilters(); + SelectMgr_ListOfFilter aSelectionFilters; + selectionFilters(aModuleSelectionFilters, aSelectionFilters); + /// after validation, the selection filters should be restored + myWorkshop->selectionActivate()->activateSelectionFilters(aSelectionFilters); + } Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if (!aContext.IsNull()) { @@ -108,7 +178,11 @@ bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr& } } if (!isActivated) - activateFilters(false); + { + // reset filters set in activateSelectionFilters above + myWorkshop->selectionActivate()->updateSelectionFilters(); + clearValidatedCash(); + } } // removes created owner @@ -141,15 +215,17 @@ bool ModuleBase_WidgetValidated::isValidSelection(const ModuleBase_ViewerPrsPtr& } //******************************************************************** -bool ModuleBase_WidgetValidated::isValidSelectionForAttribute(const ModuleBase_ViewerPrsPtr& theValue, - const AttributePtr& theAttribute) +bool ModuleBase_WidgetValidated::isValidSelectionForAttribute( + const ModuleBase_ViewerPrsPtr& theValue, + const AttributePtr& theAttribute) { bool aValid = false; // stores the current values of the widget attribute - bool isFlushesActived, isAttributeSetInitializedBlocked; + bool isFlushesActived, isAttributeSetInitializedBlocked, isAttributeSendUpdatedBlocked; - blockAttribute(theAttribute, true, isFlushesActived, isAttributeSetInitializedBlocked); + blockAttribute(theAttribute, true, isFlushesActived, isAttributeSetInitializedBlocked, + isAttributeSendUpdatedBlocked); storeAttributeValue(theAttribute); @@ -162,7 +238,8 @@ bool ModuleBase_WidgetValidated::isValidSelectionForAttribute(const ModuleBase_V // restores the current values of the widget attribute restoreAttributeValue(theAttribute, aValid); - blockAttribute(theAttribute, false, isFlushesActived, isAttributeSetInitializedBlocked); + blockAttribute(theAttribute, false, isFlushesActived, isAttributeSetInitializedBlocked, + isAttributeSendUpdatedBlocked); /// NDS: The following rows are commented for issue #1452 (to be removed after debug) /// This is not correct to perform it here because it might cause update selection and /// the selection mechanizm will be circled: use the scenario of the bug with preselected point. @@ -186,14 +263,16 @@ bool ModuleBase_WidgetValidated::isValidSelectionCustom(const ModuleBase_ViewerP } //******************************************************************** -bool ModuleBase_WidgetValidated::isValidAttribute(const AttributePtr& theAttribute) const +bool ModuleBase_WidgetValidated::isValidAttribute(const AttributePtr& theAttribute) { SessionPtr aMgr = ModelAPI_Session::get(); ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - std::string aValidatorID, anError; + std::string aValidatorID; + Events_InfoMessage anError; return aFactory->validate(theAttribute, aValidatorID, anError); } +//******************************************************************** bool ModuleBase_WidgetValidated::isFilterActivated() const { bool isActivated = false; @@ -204,48 +283,52 @@ bool ModuleBase_WidgetValidated::isFilterActivated() const return aViewer->hasSelectionFilter(aSelFilter); } -bool ModuleBase_WidgetValidated::activateFilters(const bool toActivate) +//******************************************************************** +void ModuleBase_WidgetValidated::selectionFilters(QIntList& theModuleSelectionFilters, + SelectMgr_ListOfFilter& theSelectionFilters) { - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); - - Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter(); - bool aHasSelectionFilter = aViewer->hasSelectionFilter(aSelFilter); - - if (toActivate) - aViewer->addSelectionFilter(aSelFilter); - else { - aViewer->removeSelectionFilter(aSelFilter); - clearValidatedCash(); - } - - return aHasSelectionFilter; + theSelectionFilters.Append(myWorkshop->validatorFilter()); } //******************************************************************** void ModuleBase_WidgetValidated::blockAttribute(const AttributePtr& theAttribute, const bool& theToBlock, bool& isFlushesActived, - bool& isAttributeSetInitializedBlocked) + bool& isAttributeSetInitializedBlocked, + bool& isAttributeSendUpdatedBlocked) +{ + blockFeatureAttribute(theAttribute, myFeature, theToBlock, isFlushesActived, + isAttributeSetInitializedBlocked, isAttributeSendUpdatedBlocked); +} + +//******************************************************************** +void ModuleBase_WidgetValidated::blockFeatureAttribute(const AttributePtr& theAttribute, + const FeaturePtr& theFeature, + const bool& theToBlock, + bool& isFlushesActived, + bool& isAttributeSetInitializedBlocked, + bool& isAttributeSendUpdatedBlocked) { Events_Loop* aLoop = Events_Loop::loop(); - DataPtr aData = myFeature->data(); + DataPtr aData = theFeature->data(); if (theToBlock) { // blocks the flush signals to avoid the temporary objects visualization in the viewer // they should not be shown in order to do not lose highlight by erasing them isFlushesActived = aLoop->activateFlushes(false); - aData->blockSendAttributeUpdated(true); + isAttributeSendUpdatedBlocked = aData->blockSendAttributeUpdated(true); isAttributeSetInitializedBlocked = theAttribute->blockSetInitialized(true); } else { - aData->blockSendAttributeUpdated(false, false); + aData->blockSendAttributeUpdated(isAttributeSendUpdatedBlocked, false); theAttribute->blockSetInitialized(isAttributeSetInitializedBlocked); aLoop->activateFlushes(isFlushesActived); } } //******************************************************************** -void ModuleBase_WidgetValidated::storeValidState(const ModuleBase_ViewerPrsPtr& theValue, const bool theValid) +void ModuleBase_WidgetValidated::storeValidState(const ModuleBase_ViewerPrsPtr& theValue, + const bool theValid) { GeomShapePtr aShape = theValue.get() ? theValue->shape() : GeomShapePtr(); if (aShape.get()) { @@ -283,13 +366,15 @@ void ModuleBase_WidgetValidated::storeValidState(const ModuleBase_ViewerPrsPtr& } } #ifdef DEBUG_VALID_STATE - qDebug(QString("storeValidState: myValidPrs.size() = %1, myInvalidPrs.size() = %2").arg(myValidPrs.count()) + qDebug(QString("storeValidState: myValidPrs.size() = %1, myInvalidPrs.size() = %2") + .arg(myValidPrs.count()) .arg(myInvalidPrs.count()).toStdString().c_str()); #endif } //******************************************************************** -bool ModuleBase_WidgetValidated::getValidState(const ModuleBase_ViewerPrsPtr& theValue, bool& theValid) +bool ModuleBase_WidgetValidated::getValidState(const ModuleBase_ViewerPrsPtr& theValue, + bool& theValid) { if (!theValue.get()) return false; @@ -367,30 +452,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); }