X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Validators.cpp;h=76c8e61566cd287be78bc273012f5560eaae313a;hb=f14192492e36f4febc93b2ad7ab7f866cbbdf71b;hp=55e2eee2939b80ab1dc5e9c133460f0227cc35cd;hpb=9894d615f4020072dfa02f374d57c7711be22970;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp old mode 100755 new mode 100644 index 55e2eee29..76c8e6156 --- a/src/PartSet/PartSet_Validators.cpp +++ b/src/PartSet/PartSet_Validators.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_Validators.cpp -// Created: 09 July 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2019 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_Validators.h" @@ -19,6 +32,9 @@ #include #include +#include +#include + #include #include @@ -27,16 +43,18 @@ #include #include #include -#include +#include #include #include #include #include #include +#include #include #include +#include #ifdef _DEBUG #include #endif @@ -57,7 +75,9 @@ int shapesNbPoints(const ModuleBase_ISelection* theSelection) return aCount; } -int shapesNbLines(const ModuleBase_ISelection* theSelection) +typedef std::unordered_map ShapeQuantity; + +int shapesNbEdges(const ModuleBase_ISelection* theSelection, ShapeQuantity& theEdges) { QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); int aCount = 0; @@ -70,8 +90,8 @@ int shapesNbLines(const ModuleBase_ISelection* theSelection) Standard_Real aStart, aEnd; Handle(Geom_Curve) aCurve = BRep_Tool::Curve(aEdge, aStart, aEnd); GeomAdaptor_Curve aAdaptor(aCurve); - if (aAdaptor.GetType() == GeomAbs_Line) - aCount++; + theEdges[(int)aAdaptor.GetType()] += 1; + aCount++; } } } @@ -124,8 +144,11 @@ bool PartSet_DistanceSelection::isValid(const ModuleBase_ISelection* theSelectio if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbPoints(theSelection) + shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return (aNbPoints >= 0 && aNbPoints < 3) && + (aShapes[GeomAbs_Line] == aNbEdges && aNbEdges >= 0 && aNbEdges < 2); } } @@ -135,8 +158,10 @@ bool PartSet_LengthSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount == 1); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && (aShapes[GeomAbs_Line] == aNbEdges && aNbEdges == 1); } } @@ -146,8 +171,10 @@ bool PartSet_PerpendicularSelection::isValid(const ModuleBase_ISelection* theSel if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && aShapes[GeomAbs_Line] == aNbEdges && aNbEdges > 0 && aNbEdges < 3; } } @@ -157,8 +184,10 @@ bool PartSet_ParallelSelection::isValid(const ModuleBase_ISelection* theSelectio if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && aShapes[GeomAbs_Line] == aNbEdges && aNbEdges > 0 && aNbEdges < 3; } } @@ -168,24 +197,10 @@ bool PartSet_RadiusSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - QList aList = - theSelection->getSelected(ModuleBase_ISelection::Viewer); - int aCount = 0; - foreach (ModuleBase_ViewerPrsPtr aPrs, aList) { - const GeomShapePtr& aShape = aPrs->shape(); - if (aShape.get() && !aShape->isNull()) { - if (aShape->shapeType() == GeomAPI_Shape::EDGE) { - const TopoDS_Shape& aTDShape = aShape->impl(); - TopoDS_Edge aEdge = TopoDS::Edge(aTDShape); - Standard_Real aStart, aEnd; - Handle(Geom_Curve) aCurve = BRep_Tool::Curve(aEdge, aStart, aEnd); - GeomAdaptor_Curve aAdaptor(aCurve); - if (aAdaptor.GetType() == GeomAbs_Circle) - aCount++; - } - } - } - return (aCount == 1); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && (aShapes[GeomAbs_Circle] == aNbEdges && aNbEdges == 1); } } @@ -221,9 +236,10 @@ bool PartSet_CoincidentSelection::isValid(const ModuleBase_ISelection* theSelect return isEmptySelectionValid(theOperation); } else { // Coincident can be applied to points and to lines - int aCount = shapesNbPoints(theSelection); - aCount += shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return (aNbPoints >= 0 && aNbPoints < 3) && (aNbEdges >= 0 && aNbEdges < 2); } } @@ -233,8 +249,10 @@ bool PartSet_HVDirSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount == 1); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && (aShapes[GeomAbs_Line] == aNbEdges && aNbEdges == 1); } } @@ -245,7 +263,9 @@ bool PartSet_FilletSelection::isValid(const ModuleBase_ISelection* theSelection, return isEmptySelectionValid(theOperation); } else { int aCount = shapesNbPoints(theSelection); - return aCount > 1; + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aCount > 1 && aNbEdges == 0; } } @@ -255,35 +275,10 @@ bool PartSet_TangentSelection::isValid(const ModuleBase_ISelection* theSelection if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); - if ((aList.size() == 0) || (aList.size() > 2)) - return false; - - ModuleBase_ViewerPrsPtr aPrs = aList.first(); - const GeomShapePtr& aShape = aPrs->shape(); - if (!aShape.get() || aShape->isNull() || aShape->shapeType() != GeomAPI_Shape::EDGE) - return false; - GeomAPI_Edge aEdge1(aShape); - - if (aEdge1.isLine() || aEdge1.isArc()) { - if (aList.size() == 2) { - // Check second selection - aPrs = aList.last(); - const GeomShapePtr& aShape2 = aPrs->shape(); - if (!aShape2.get() || aShape2->isNull() || aShape2->shapeType() != GeomAPI_Shape::EDGE) - return false; - GeomAPI_Edge aEdge2(aShape2); - - if (aEdge1.isLine() && aEdge2.isArc()) - return true; - else if (aEdge1.isArc() && aEdge2.isLine()) - return true; - else - return false; - } else - return true; - } - return false; + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && (aNbEdges == 1 || (aNbEdges == 2 && aShapes[GeomAbs_Line] == 1)); } } @@ -293,8 +288,10 @@ bool PartSet_AngleSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && aShapes[GeomAbs_Line] == aNbEdges && aNbEdges > 0 && aNbEdges < 3; } } @@ -304,35 +301,13 @@ bool PartSet_EqualSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - QList aList = - theSelection->getSelected(ModuleBase_ISelection::Viewer); - int aCount = 0; - int aType = 0; - foreach (ModuleBase_ViewerPrsPtr aPrs, aList) { - GeomShapePtr aShape = aPrs->shape(); - if (aShape.get() && aShape->isEdge()) { - aCount++; - GeomAPI_Edge aEdge(aShape); - if (aEdge.isLine()) { - if (aCount == 1) - aType = 1; - else if (aType != 1) - return false; - } else if (aEdge.isCircle()) { - if (aCount == 1) - aType = 2; - else if (aType != 2) - return false; - } else if (aEdge.isArc()) { - if (aCount == 1) - aType = 3; - else if (aType != 3) - return false; - } - } else - return false; - } - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && (aNbEdges > 0 && aNbEdges < 3) && + (aShapes[GeomAbs_Line] == aNbEdges || + aShapes[GeomAbs_Circle] == aNbEdges || + aShapes[GeomAbs_Ellipse] == aNbEdges); } } @@ -342,8 +317,10 @@ bool PartSet_CollinearSelection::isValid(const ModuleBase_ISelection* theSelecti if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 3); + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbPoints == 0 && aShapes[GeomAbs_Line] == aNbEdges && aNbEdges > 0 && aNbEdges < 3; } } @@ -352,8 +329,12 @@ bool PartSet_MiddlePointSelection::isValid(const ModuleBase_ISelection* theSelec { if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) return isEmptySelectionValid(theOperation); - else - return shapesNbLines(theSelection) == 1 || shapesNbPoints(theSelection) == 1; + else { + int aNbPoints = shapesNbPoints(theSelection); + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return (aNbPoints >= 0 && aNbPoints < 3) && (aNbEdges >= 0 && aNbEdges < 2); + } } bool PartSet_MultyTranslationSelection::isValid(const ModuleBase_ISelection* theSelection, @@ -362,8 +343,9 @@ bool PartSet_MultyTranslationSelection::isValid(const ModuleBase_ISelection* the if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return aCount > 0; + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbEdges > 0; } } @@ -373,20 +355,24 @@ bool PartSet_SplitSelection::isValid(const ModuleBase_ISelection* theSelection, if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { return isEmptySelectionValid(theOperation); } else { - int aCount = shapesNbLines(theSelection); - return aCount > 0; + ShapeQuantity aShapes; + int aNbEdges = shapesNbEdges(theSelection, aShapes); + return aNbEdges > 0; } } bool PartSet_ProjectionSelection::isValid(const ModuleBase_ISelection* theSelection, ModuleBase_Operation* theOperation) const { - if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) { - return isEmptySelectionValid(theOperation); - } else { - int aCount = shapesNbLines(theSelection); - return aCount > 0; - } + return theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0 && + isEmptySelectionValid(theOperation); +} + +bool PartSet_IntersectionSelection::isValid(const ModuleBase_ISelection* theSelection, + ModuleBase_Operation* theOperation) const +{ + return theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0 && + isEmptySelectionValid(theOperation); } @@ -449,8 +435,9 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute continue; if (isObject) { if (aRef->object() == anObject) { - theError = errorMessage(EqualObjects, anObject.get() ? anObject->data()->name() : "", - theAttribute->id(), aRef->id()); + theError = errorMessage(EqualObjects, + anObject.get() ? ModelAPI_Tools::toString(anObject->data()->name()) : "", + theAttribute->id(), aRef->id()); return false; } } @@ -471,6 +458,7 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(theAttribute); ResultPtr aContext = anAttr->context(); + FeaturePtr aContextFeature = anAttr->contextFeature(); GeomShapePtr aShape = anAttr->value(); // Check selection attributes @@ -489,6 +477,24 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute return false; } } + // check the whole selected feature contains the result + if (aContextFeature.get()) { + if (aRef->contextFeature().get()) { + if (aContextFeature == aRef->contextFeature()) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRef->id()); + return false; + } + } else if (aRef->context().get() && + aRef->context()->document()->feature(aRef->context()) == aContextFeature) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRef->id()); + return false; + } + } else if (aRef->contextFeature().get() && aContext.get()) { + if (aContext->document()->feature(aContext) == aRef->contextFeature()) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRef->id()); + return false; + } + } } } } @@ -507,8 +513,9 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute std::dynamic_pointer_cast(*anAttr); // check the object is already presented if (aRef->value() == anObject) { - theError = errorMessage(EqualObjects, anObject.get() ? anObject->data()->name() : "", - theAttribute->id(), aRef->id()); + theError = errorMessage(EqualObjects, + anObject.get() ? ModelAPI_Tools::toString(anObject->data()->name()) : "", + theAttribute->id(), aRef->id()); return false; } } @@ -529,7 +536,8 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute for(int i = 0; i < aCurSelList->size(); i++) { std::shared_ptr aCurSel = aCurSelList->value(i); ResultPtr aCurSelContext = aCurSel->context(); - ResultCompSolidPtr aCurSelCompSolidPtr = ModelAPI_Tools::compSolidOwner(aCurSelContext); + FeaturePtr aCurSelFeature = aCurSel->contextFeature(); + ResultBodyPtr aCurSelCompSolidPtr = ModelAPI_Tools::bodyOwner(aCurSelContext); std::shared_ptr aCurSelCompSolid; if(aCurSelCompSolidPtr.get()) { aCurSelCompSolid = aCurSelCompSolidPtr->shape(); @@ -537,27 +545,47 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute for(int j = 0; j < aRefSelList->size(); j++) { std::shared_ptr aRefSel = aRefSelList->value(j); ResultPtr aRefSelContext = aRefSel->context(); - ResultCompSolidPtr aRefSelCompSolidPtr = - ModelAPI_Tools::compSolidOwner(aRefSelContext); + FeaturePtr aRefSelFeature = aRefSel->contextFeature(); + ResultBodyPtr aRefSelCompSolidPtr = + ModelAPI_Tools::bodyOwner(aRefSelContext); std::shared_ptr aRefSelCompSolid; - if(aRefSelCompSolidPtr.get()) { + if (aRefSelCompSolidPtr.get()) { aRefSelCompSolid = aRefSelCompSolidPtr->shape(); } if ((aCurSelCompSolid.get() && aCurSelCompSolid->isEqual(aRefSel->value())) || (aRefSelCompSolid.get() && aRefSelCompSolid->isEqual(aCurSel->value()))) { - theError = errorMessage(EqualShapes, "", theAttribute->id(), - aRefSel->id()); - return false; + theError = errorMessage(EqualShapes, "", theAttribute->id(), + aRefSel->id()); + return false; } - if(aCurSelContext == aRefSelContext) { + if (aCurSelContext == aRefSelContext) { if (aCurSel->value().get() == NULL || aRefSel->value().get() == NULL) { - theError = errorMessage(EmptyShapes, "", theAttribute->id(), - aRefSel->id()); + theError = errorMessage(EmptyShapes, "", theAttribute->id(), aRefSel->id()); return false; } if (aCurSel->value()->isEqual(aRefSel->value())) { - theError = errorMessage(EqualShapes, "", theAttribute->id(), - aRefSel->id()); + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRefSel->id()); + return false; + } + } + + // check the whole selected feature contains the result + if (aCurSelFeature.get()) { + if (aRefSelFeature.get()) { + if (aCurSelFeature == aRefSelFeature) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRefSel->id()); + return false; + } + } + else if (aRefSelContext.get() && + aRefSelContext->document()->feature(aRefSelContext) == aCurSelFeature) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRefSel->id()); + return false; + } + } + else if (aRefSelFeature.get() && aCurSelContext.get()) { + if (aCurSelContext->document()->feature(aCurSelContext) == aRefSelFeature) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRefSel->id()); return false; } } @@ -582,8 +610,9 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute for (int j = 0; j < aRefSelList->size(); j++) { if (aCurSelObject == aRefSelList->object(j)) { theError = errorMessage(EqualObjects, - aCurSelObject.get() ? aCurSelObject->data()->name() : "", - theAttribute->id(), aCurSelList->id()); + aCurSelObject.get()? + ModelAPI_Tools::toString(aCurSelObject->data()->name()) : "", + theAttribute->id(), aCurSelList->id()); return false; } } @@ -595,6 +624,56 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute return true; } +bool PartSet_DifferentPointsValidator::isValid(const AttributePtr& theAttribute, + const std::list& theArguments, + Events_InfoMessage& theError) const +{ + FeaturePtr aFeature = std::dynamic_pointer_cast(theAttribute->owner()); + + // the type of validated attributes should be equal, attributes with + // different types are not validated + // Check RefAttr attributes + std::string anAttrType = theAttribute->attributeType(); + std::list > anAttrs; + if (anAttrType != ModelAPI_AttributeRefAttr::typeId()) + return true; + + // obtain point of the given attribute + AttributePoint2DPtr anAttributePoint = getRefPointAttribute(theAttribute); + if (!anAttributePoint.get() || !anAttributePoint->isInitialized()) + return true; + + // obtain point of the parameter attribute + AttributePoint2DPtr anArgumentPoint = getRefPointAttribute + (aFeature->attribute(theArguments.front())); + + if (!anArgumentPoint.get() || !anArgumentPoint->isInitialized()) + return true; + + return !anAttributePoint->pnt()->isEqual(anArgumentPoint->pnt()); +} + +AttributePoint2DPtr PartSet_DifferentPointsValidator::getRefPointAttribute + (const AttributePtr& theAttribute) const +{ + AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast(theAttribute); + + AttributePoint2DPtr aPointAttribute; + if (anAttr->isObject()) { + ObjectPtr anObject = anAttr->object(); + if (anObject.get()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); + if (aFeature->getKind() == SketchPlugin_Point::ID()) + aPointAttribute = std::dynamic_pointer_cast + (aFeature->attribute(SketchPlugin_Point::COORD_ID())); + } + } + else { + aPointAttribute = std::dynamic_pointer_cast(anAttr->attr()); + } + return aPointAttribute; +} + bool PartSet_CoincidentAttr::isValid(const AttributePtr& theAttribute, const std::list& theArguments, Events_InfoMessage& theError) const