X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=156a563b846ca3e0d6e120afb1a378ce06c78cbb;hb=8e2415b47898189e3450a92053b7fb6804e914fe;hp=0bbeb05e8480d3ddffc8532ae826a2ee2c458f9d;hpb=8f09d362a50ccbc085841c24af2e755121e458ba;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp old mode 100755 new mode 100644 index 0bbeb05e8..156a563b8 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -1,40 +1,56 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetShapeSelector.cpp -// Created: 27 Nov 2014 -// Author: Vitaly Smetannikov +// Copyright (C) 2014-2020 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_WidgetShapeSelector.h" +#include "PartSet_CenterPrs.h" +#include "PartSet_Module.h" +#include "PartSet_SketcherMgr.h" + #include #include #include #include +#include + #include -#include #include #include -#include - #include #include #include #include #include -#include -#include +#include PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, - const Config_WidgetAPI* theData, - const std::string& theParentId) -: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId) + const Config_WidgetAPI* theData) +: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData) { - myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), true); + myUseSketchPlane = theData->getBooleanAttribute("use_sketch_plane", true); + myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), + theData->getProperty("can_create_external"), true); } PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector() @@ -43,114 +59,49 @@ PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector() } //******************************************************************** -bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +void PartSet_WidgetShapeSelector::selectionFilters(QIntList& theModuleSelectionFilters, + SelectMgr_ListOfFilter& theSelectionFilters) { - bool aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs); - if (aValid) { - ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs); - aValid = myExternalObjectMgr->isValidObject(anObject); + ModuleBase_WidgetShapeSelector::selectionFilters(theModuleSelectionFilters, theSelectionFilters); + + if (!myUseSketchPlane) { + if (theModuleSelectionFilters.contains(SF_SketchPlaneFilter)) + theModuleSelectionFilters.removeAll(SF_SketchPlaneFilter); } - return aValid; } //******************************************************************** -void PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape) +bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject); - // Do check using of external feature - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aSelectedFeature); - // Processing of sketch object - if (aSPFeature.get() != NULL) { - GeomShapePtr aShape = theShape; - if (!aShape.get()) { - ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); - if (aResult.get()) { - aShape = aResult->shape(); - } - } - setPointAttribute(theSelectedObject, aShape); - } + 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 - ModuleBase_WidgetShapeSelector::setObject(theSelectedObject, theShape); + aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs); + + if (aValid) { + ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs); + aValid = myExternalObjectMgr->isValidObject(anObject); + } + return aValid; } -void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs, +void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, ObjectPtr& theObject, GeomShapePtr& theShape) { ModuleBase_WidgetShapeSelector::getGeomSelection(thePrs, theObject, theShape); - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject); - 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 - // TODO: unite with the same functionality in PartSet_WidgetShapeSelector - if (aSPFeature.get() == NULL && myExternalObjectMgr->useExternal()) { - GeomShapePtr aShape = theShape; - if (!aShape.get()) { - ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); - if (aResult.get()) - aShape = aResult->shape(); - } - if (aShape.get() != NULL && !aShape->isNull()) - theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); - } -} - -//******************************************************************** -GeomShapePtr PartSet_WidgetShapeSelector::getShape() const -{ - // an empty shape by default - DataPtr aData = myFeature->data(); - AttributePtr anAttribute = aData->attribute(attributeID()); - GeomShapePtr aShape = PartSet_Tools::findShapeBy2DPoint(anAttribute, myWorkshop); - - if (!aShape.get()) - aShape = ModuleBase_WidgetShapeSelector::getShape(); - return aShape; + myExternalObjectMgr->getGeomSelection(thePrs, theObject, theShape, + myWorkshop, sketch(), myIsInValidate); } //******************************************************************** -void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid) +void PartSet_WidgetShapeSelector::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) { - ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid); + ModuleBase_WidgetShapeSelector::restoreAttributeValue(theAttribute, theValid); myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true); } -//******************************************************************** -void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape) -{ - DataPtr aData = myFeature->data(); - AttributePtr aAttr = aData->attribute(attributeID()); - AttributeRefAttrPtr aRefAttr = - std::dynamic_pointer_cast(aAttr); - if (aRefAttr) { - // it is possible that the point feature is selected. It should be used itself - // instead of searching an attribute for the shape - bool aShapeIsResult = false; - /*ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); - if (aResult.get() != NULL) { - GeomShapePtr aShapePtr = aResult->shape(); - // it is important to call isEqual of the shape of result. - // It is a GeomAPI_Vertex shape for the point. The shape of the parameter is - // GeomAPI_Shape. It is important to use the realization of the isEqual method from - // GeomAPI_Vertex class - aShapeIsResult = aShapePtr.get() != NULL && aShapePtr->isEqual(theShape); - }*/ - - AttributePtr aPntAttr; - if (!aShapeIsResult) { - TopoDS_Shape aTDSShape = theShape->impl(); - aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theSelectedObject, aTDSShape, mySketch); - } - // this is an alternative, whether the attribute should be set or object in the attribute - // the first check is the attribute because the object already exist - // the object is set only if there is no selected attribute - // test case is - preselection for distance operation, which contains two points selected on lines - if (aPntAttr) - aRefAttr->setAttr(aPntAttr); - else - aRefAttr->setObject(theSelectedObject); - } -}