X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetMultiSelector.cpp;h=60d3d4a82baeadff22ad8ab7cfdbfdb9c301463e;hb=3ef3b583309df4b9d0593c7abd181ab9d6fed42e;hp=d6c0008974f044bc263b532811cd073b0dd897fc;hpb=5b0a1b660acf209c220744eb75c54652ee81efde;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp old mode 100644 new mode 100755 index d6c000897..60d3d4a82 --- a/src/PartSet/PartSet_WidgetMultiSelector.cpp +++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp @@ -1,12 +1,28 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetMultiSelector.cpp -// Created: 15 Apr 2015 -// Author: Natalia Ermolaeva +// 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 "PartSet_WidgetMultiSelector.h" #include +#include +#include #include #include @@ -14,9 +30,11 @@ #include #include #include +#include #include +#include #include #include #include @@ -29,11 +47,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() @@ -41,31 +59,16 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector() delete myExternalObjectMgr; } -bool PartSet_WidgetMultiSelector::setSelection(QList& theValues) -{ - bool aSucceed = ModuleBase_WidgetMultiSelector::setSelection(theValues); - if (aSucceed) { - // TODO(nds): unite with externalObject(), remove parameters - //myFeature->execute(); - - DataPtr aData = myFeature->data(); - AttributeSelectionListPtr aSelectionListAttr = - std::dynamic_pointer_cast(aData->attribute(attributeID())); - - QObjectPtrList aListOfAttributeObjects; - for (int i = 0; i < aSelectionListAttr->size(); i++) { - AttributeSelectionPtr anAttr = aSelectionListAttr->value(i); - aListOfAttributeObjects.append(anAttr->context()); - } - myExternalObjectMgr->removeUnusedExternalObjects(aListOfAttributeObjects, sketch(), myFeature); - } - return aSucceed; -} - //******************************************************************** -bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - bool aValid = ModuleBase_WidgetMultiSelector::isValidSelectionCustom(thePrs); + 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); @@ -74,36 +77,48 @@ bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_Viewer } //******************************************************************** -void PartSet_WidgetMultiSelector::storeAttributeValue() -{ - myIsInVaildate = true; - ModuleBase_WidgetMultiSelector::storeAttributeValue(); -} - -//******************************************************************** -void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid) +void PartSet_WidgetMultiSelector::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) { - myIsInVaildate = false; - ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid); + ModuleBase_WidgetMultiSelector::restoreAttributeValue(theAttribute, theValid); - myExternalObjectMgr->removeExternalValidated(sketch(), myFeature); + myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true); } -void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs, +void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, ObjectPtr& theObject, GeomShapePtr& theShape) { ModuleBase_WidgetMultiSelector::getGeomSelection(thePrs, theObject, theShape); FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject); - std::shared_ptr aSPFeature = + std::shared_ptr aSPFeature = std::dynamic_pointer_cast(aSelectedFeature); // there is no a sketch feature is selected, but the shape exists, try to create an exernal object - if (aSPFeature.get() == NULL && theShape.get() != NULL && !theShape->isNull() && - myExternalObjectMgr->useExternal()) { - if (myIsInVaildate) - theObject = myExternalObjectMgr->externalObjectValidated(theObject, theShape, sketch()); - else - theObject = myExternalObjectMgr->externalObject(theObject, theShape, sketch()); + // 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; } }