X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_ExternalObjectsMgr.cpp;h=d2df7c96db9bc2c761e8249b0bb72736a6c45a6c;hb=4d28b860188b4ad9550d6ccbd3fbf9f9f6c1d5ff;hp=b12f92b5f05e11978614f49697962480d3637b15;hpb=4d76048c10932d7f0332ac1819e020ce88838f5a;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_ExternalObjectsMgr.cpp b/src/PartSet/PartSet_ExternalObjectsMgr.cpp old mode 100644 new mode 100755 index b12f92b5f..d2df7c96d --- a/src/PartSet/PartSet_ExternalObjectsMgr.cpp +++ b/src/PartSet/PartSet_ExternalObjectsMgr.cpp @@ -1,123 +1,175 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_ExternalObjectsMgr.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_ExternalObjectsMgr.h" + +#include "PartSet_CenterPrs.h" #include "PartSet_Tools.h" #include +#include + +#include +#include + +#include #include -PartSet_ExternalObjectsMgr::PartSet_ExternalObjectsMgr(const std::string& theExternal, const bool theDefaultValue) -: myUseExternal(theDefaultValue) +PartSet_ExternalObjectsMgr::PartSet_ExternalObjectsMgr(const std::string& theExternal, + const std::string& theCanCreateExternal, + const bool theDefaultValue) +: myUseExternal(theDefaultValue), myCanCreateExternal(true) { QString aIsExternal(theExternal.c_str()); if (!aIsExternal.isEmpty()) { QString aStr = aIsExternal.toUpper(); - myUseExternal = (aStr == "TRUE") || (aStr == "YES"); + myUseExternal = (aStr == "TRUE") || (aStr == "YES"); + } + + QString aCanCreateExternal(theCanCreateExternal.c_str()); + if (!aCanCreateExternal.isEmpty()) { + QString aStr = aCanCreateExternal.toUpper(); + myCanCreateExternal = (aStr == "TRUE") || (aStr == "YES"); } } +bool PartSet_ExternalObjectsMgr::isValidObject(const ObjectPtr& theObject) +{ + bool aValid = true; + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + // Do check using of external feature + std::shared_ptr aSPFeature = + std::dynamic_pointer_cast(aFeature); + + // Do check that we can use external feature + if (aSPFeature.get() != NULL && aSPFeature->isExternal() && !useExternal()) { + aValid = false; + } + + return aValid; +} + ObjectPtr PartSet_ExternalObjectsMgr::externalObject(const ObjectPtr& theSelectedObject, const GeomShapePtr& theShape, - const CompositeFeaturePtr& theSketch) + const CompositeFeaturePtr& theSketch, + const bool theTemporary) { - ObjectPtr aSelectedObject = PartSet_Tools::findFixedObjectByExternal(theShape->impl(), - theSelectedObject, theSketch); + ObjectPtr aSelectedObject = PartSet_Tools::findFixedObjectByExternal( + theShape->impl(), theSelectedObject, theSketch); if (!aSelectedObject.get()) { // Processing of external (non-sketch) object - aSelectedObject = PartSet_Tools::createFixedObjectByExternal(theShape->impl(), - theSelectedObject, theSketch); - if (aSelectedObject.get()) - myExternalObjects.append(aSelectedObject); + FeaturePtr aCreatedFeature; + aSelectedObject = PartSet_Tools::createFixedObjectByExternal(theShape, + theSelectedObject, theSketch, theTemporary, aCreatedFeature); + if (aCreatedFeature.get() && theTemporary) + myExternalObjectValidated = aCreatedFeature; } return aSelectedObject; } -//******************************************************************** -ObjectPtr PartSet_ExternalObjectsMgr::externalObjectValidated(const ObjectPtr& theSelectedObject, - const GeomShapePtr& theShape, - const CompositeFeaturePtr& theSketch) +ObjectPtr PartSet_ExternalObjectsMgr::externalCenterObject(const ModuleBase_ViewerPrsPtr& thePrs, + const CompositeFeaturePtr& theSketch, + const bool theTemporary) { - // TODO(nds): unite with externalObject() - ObjectPtr aSelectedObject = PartSet_Tools::findFixedObjectByExternal(theShape->impl(), - theSelectedObject, theSketch); - if (!aSelectedObject.get()) { - // Processing of external (non-sketch) object - aSelectedObject = PartSet_Tools::createFixedObjectByExternal(theShape->impl(), - theSelectedObject, theSketch); - if (aSelectedObject.get()) - myExternalObjectValidated = aSelectedObject; + if (!thePrs.get() || thePrs->interactive().IsNull()) + return ObjectPtr(); + + Handle(PartSet_CenterPrs) aAIS = Handle(PartSet_CenterPrs)::DownCast(thePrs->interactive()); + if (aAIS.IsNull()) + return ObjectPtr(); + + gp_Pnt aPntComp = aAIS->Component()->Pnt(); + GeomVertexPtr aVertPtr(new GeomAPI_Vertex(aPntComp.X(), aPntComp.Y(), aPntComp.Z())); + TopoDS_Shape aShape = aVertPtr->impl(); + + ResultPtr aSelectedObject = + PartSet_Tools::findFixedObjectByExternal(aShape, aAIS->object(), theSketch); + if (!aSelectedObject.get()) + { + FeaturePtr aCreatedFeature; + aSelectedObject = PartSet_Tools::createFixedByExternalCenter(aAIS->object(), aAIS->edge(), + aAIS->centerType(), theSketch, theTemporary, aCreatedFeature); + if (aCreatedFeature.get() && theTemporary) + myExternalObjectValidated = aCreatedFeature; } return aSelectedObject; } -//******************************************************************** -void PartSet_ExternalObjectsMgr::removeExternal(const CompositeFeaturePtr& theSketch, - const FeaturePtr& theFeature) +void PartSet_ExternalObjectsMgr::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, + ObjectPtr& theObject, + GeomShapePtr& theShape, + ModuleBase_IWorkshop* theWorkshop, + const CompositeFeaturePtr& theSketch, + const bool isInValidate) { - QObjectPtrList::const_iterator anIt = myExternalObjects.begin(), aLast = myExternalObjects.end(); - for (; anIt != aLast; anIt++) { - ObjectPtr anObject = *anIt; - if (anObject.get()) { - DocumentPtr aDoc = anObject->document(); - FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); - if (aFeature.get() != NULL) { - QObjectPtrList anObjects; - anObjects.append(aFeature); - // the external feature should be removed with all references, sketch feature should be ignored - std::set anIgnoredFeatures; - anIgnoredFeatures.insert(theSketch); - // the current feature should be ignored, because it can use the external feature in the - // attributes and, therefore have a references to it. So, the delete functionality tries - // to delete this feature. Test case is creation of a constraint on external point, - // use in this control after an external point, the point of the sketch. - anIgnoredFeatures.insert(theFeature); - XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures); + 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) { + ObjectPtr anExternalObject = ObjectPtr(); + GeomShapePtr anExternalShape = GeomShapePtr(); + if (useExternal()) { + if (canCreateExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = theWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + anExternalObject = + externalObject(theObject, aShape, theSketch, isInValidate); + if (!anExternalObject.get()) { + anExternalObject = externalCenterObject(thePrs, theSketch, isInValidate); + } + } + else { /// use objects of found selection + anExternalObject = theObject; + anExternalShape = theShape; } } - //removeExternalObject(anObject, theSketch, theFeature); + /// 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; } - myExternalObjects.clear(); } //******************************************************************** -void PartSet_ExternalObjectsMgr::removeUnusedExternalObjects(const QObjectPtrList& theIgnoreObjects, - const CompositeFeaturePtr& theSketch, - const FeaturePtr& theFeature) -{ - /* - // TODO(nds): unite with removeExternal(), remove parameters - QObjectPtrList aUsedExternalObjects; - - QObjectPtrList::const_iterator anIt = myExternalObjects.begin(), aLast = myExternalObjects.end(); - for (; anIt != aLast; anIt++) { - ObjectPtr anObject = *anIt; - if (theIgnoreObjects.contains(anObject)) - aUsedExternalObjects.append(anObject); - else - removeExternalObject(anObject, theSketch, theFeature); - }*/ - myExternalObjects.clear(); - //if (!aUsedExternalObjects.empty()) - // myExternalObjects = aUsedExternalObjects; -} - -//******************************************************************** -void PartSet_ExternalObjectsMgr::removeExternalValidated(const CompositeFeaturePtr& theSketch, - const FeaturePtr& theFeature) +void PartSet_ExternalObjectsMgr::removeExternal(const CompositeFeaturePtr& theSketch, + const FeaturePtr& theFeature, + ModuleBase_IWorkshop* theWorkshop, + const bool theTemporary) { - // TODO(nds): unite with removeExternal(), remove parameters - removeExternalObject(myExternalObjectValidated, theSketch, theFeature); - myExternalObjectValidated = NULL; + if (theTemporary) + removeExternalObject(myExternalObjectValidated, theSketch, theFeature, theWorkshop); } void PartSet_ExternalObjectsMgr::removeExternalObject(const ObjectPtr& theObject, - const CompositeFeaturePtr& theSketch, - const FeaturePtr& theFeature) + const CompositeFeaturePtr& /*theSketch*/, + const FeaturePtr& theFeature, + ModuleBase_IWorkshop* theWorkshop) { if (theObject.get()) { DocumentPtr aDoc = theObject->document(); @@ -125,15 +177,15 @@ void PartSet_ExternalObjectsMgr::removeExternalObject(const ObjectPtr& theObject if (aFeature.get() != NULL) { QObjectPtrList anObjects; anObjects.append(aFeature); - // the external feature should be removed with all references, sketch feature should be ignored - std::set anIgnoredFeatures; - anIgnoredFeatures.insert(theSketch); - // the current feature should be ignored, because it can use the external feature in the - // attributes and, therefore have a references to it. So, the delete functionality tries - // to delete this feature. Test case is creation of a constraint on external point, - // use in this control after an external point, the point of the sketch. - anIgnoredFeatures.insert(theFeature); - XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures); + // the external feature should be removed with all references, + // composite sketch feature will be ignored + workshop(theWorkshop)->deleteFeatures(anObjects); } } } + +XGUI_Workshop* PartSet_ExternalObjectsMgr::workshop(ModuleBase_IWorkshop* theWorkshop) +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); + return aConnector->workshop(); +}