X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_WidgetMultiSelector.cpp;h=002f9ecccbc47093ddb7786c6704a6d6ba8b2e6c;hb=7b7572de9532f6f327bdc2a9517d7264500bc91e;hp=1c046be78d49a083c419f68ec88af9b030b9e1e6;hpb=2173385eb78bbf8d8c7041e59ec6eb40ef5e5c33;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp index 1c046be78..002f9eccc 100644 --- a/src/PartSet/PartSet_WidgetMultiSelector.cpp +++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp @@ -1,12 +1,27 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetMultiSelector.cpp -// Created: 15 Apr 2015 -// Author: Natalia Ermolaeva +// Copyright (C) 2014-2022 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 "PartSet_WidgetMultiSelector.h" #include +#include +#include #include #include @@ -14,9 +29,11 @@ #include #include #include +#include #include +#include #include #include #include @@ -29,11 +46,11 @@ PartSet_WidgetMultiSelector::PartSet_WidgetMultiSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, - const Config_WidgetAPI* theData, - const std::string& theParentId) -: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData, theParentId) + const Config_WidgetAPI* theData) +: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData) { - myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), false); + myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), + theData->getProperty("can_create_external"), false); } PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector() @@ -42,101 +59,65 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector() } //******************************************************************** -void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid) +bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid); - myExternalObjectMgr->removeExternal(sketch(), myFeature); + bool aValid = false; + if (thePrs.get() && thePrs->interactive().get() && + thePrs->interactive()->IsKind(STANDARD_TYPE(PartSet_CenterPrs))) + aValid = true; // we should not check acceptSubShape for such presentation + else + aValid = ModuleBase_WidgetMultiSelector::isValidSelectionCustom(thePrs); + + if (aValid) { + ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs); + aValid = myExternalObjectMgr->isValidObject(anObject); + } + return aValid; } //******************************************************************** -bool PartSet_WidgetMultiSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +void PartSet_WidgetMultiSelector::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) { - TopoDS_Shape aShape = thePrs.shape(); - if ((myTypeCombo->count() > 1) && (!aShape.IsNull())) { - TopAbs_ShapeEnum aType = ModuleBase_Tools::shapeType(myTypeCombo->currentText()); - if (aShape.ShapeType() != aType) - return false; - } - ResultPtr aResult; - if (!thePrs.owner().IsNull()) { - ObjectPtr anObject = myWorkshop->selection()->getSelectableObject(thePrs.owner()); - aResult = std::dynamic_pointer_cast(anObject); - } - else { - aResult = std::dynamic_pointer_cast(thePrs.object()); - } - - - if (myFeature) { - // We can not select a result of our feature - const std::list& aResList = myFeature->results(); - std::list::const_iterator aIt; - bool isSkipSelf = false; - for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) { - if ((*aIt) == aResult) { - isSkipSelf = true; - break; - } - } - if(isSkipSelf) - return false; - } + ModuleBase_WidgetMultiSelector::restoreAttributeValue(theAttribute, theValid); - GeomShapePtr aGShape = GeomShapePtr(); - const TopoDS_Shape& aTDSShape = thePrs.shape(); - // if only result is selected, an empty shape is set to the model - if (aTDSShape.IsNull()) { - //aSelectionListAttr->append(aResult, GeomShapePtr()); - } - else { - aGShape = std::shared_ptr(new GeomAPI_Shape()); - //GeomShapePtr aShape(new GeomAPI_Shape()); - aGShape->setImpl(new TopoDS_Shape(aTDSShape)); - // We can not select a result of our feature - if (aGShape->isEqual(aResult->shape())) { - //aSelectionListAttr->append(aResult, GeomShapePtr()); - aGShape = GeomShapePtr(); - } - else { - //aSelectionListAttr->append(aResult, aShape); - } - } - - setObject(aResult, aGShape); - return true; + myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true); } -//******************************************************************** -bool PartSet_WidgetMultiSelector::setObject(const ObjectPtr& theSelectedObject, - const GeomShapePtr& theShape) +void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, + ObjectPtr& theObject, + GeomShapePtr& theShape) { - ObjectPtr aSelectedObject = theSelectedObject; - GeomShapePtr aShape = theShape; + ModuleBase_WidgetMultiSelector::getGeomSelection(thePrs, theObject, theShape); - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject); - //if (aSelectedFeature == myFeature) // In order to avoid selection of the same object - // return false; - - // Do check using of external feature - std::shared_ptr aSPFeature = + FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject); + std::shared_ptr aSPFeature = std::dynamic_pointer_cast(aSelectedFeature); - - // Do check that we can use external feature - if ((aSPFeature.get() != NULL) && aSPFeature->isExternal() && (!myExternalObjectMgr->useExternal())) - return false; - - if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull() && myExternalObjectMgr->useExternal()) { - aSelectedObject = myExternalObjectMgr->externalObject(theSelectedObject, theShape, sketch()); + // there is no a sketch feature is selected, but the shape exists, try to create an exernal object + // TODO: unite with the same functionality in PartSet_WidgetShapeSelector + if (aSPFeature.get() == NULL) { + ObjectPtr anExternalObject = ObjectPtr(); + GeomShapePtr anExternalShape = GeomShapePtr(); + if (myExternalObjectMgr->useExternal()) { + if (myExternalObjectMgr->canCreateExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + anExternalObject = + myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); + } + else { + anExternalObject = theObject; + anExternalShape = theShape; + } + } + /// the object is null if the selected feature is "external"(not sketch entity feature of the + /// current sketch) and it is not created by object manager + theObject = anExternalObject; + theShape = anExternalShape; } - - - ResultPtr aResult = std::dynamic_pointer_cast(aSelectedObject); - - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - - aSelectionListAttr->append(aResult, aShape); - - return true; }