X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Validators.cpp;h=99468bcf043962bd3b78a489d98eb62eb1579ef1;hb=83e85cedfb936e7755500322e1afa638d318a863;hp=6d17784f78dbcfc44b31410e0f8fa386089a33f6;hpb=762c91644fd2b5eeb99e7ad783b844b565e9ae9d;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp old mode 100644 new mode 100755 index 6d17784f7..99468bcf0 --- a/src/PartSet/PartSet_Validators.cpp +++ b/src/PartSet/PartSet_Validators.cpp @@ -6,6 +6,8 @@ #include "PartSet_Validators.h" +#include "PartSet_Tools.h" + #include #include #include @@ -19,10 +21,15 @@ #include #include #include +#include #include #include +#include #include +#include +#include +#include #include #ifdef _DEBUG @@ -31,7 +38,9 @@ int shapesNbPoints(const ModuleBase_ISelection* theSelection) { - QList aList = theSelection->getSelected(); + QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); + ModuleBase_ISelection::filterPreselectionOnEqualPoints(aList); + int aCount = 0; foreach (ModuleBase_ViewerPrs aPrs, aList) { const TopoDS_Shape& aShape = aPrs.shape(); @@ -45,7 +54,7 @@ int shapesNbPoints(const ModuleBase_ISelection* theSelection) int shapesNbLines(const ModuleBase_ISelection* theSelection) { - QList aList = theSelection->getSelected(); + QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); int aCount = 0; foreach(ModuleBase_ViewerPrs aPrs, aList) { const TopoDS_Shape& aShape = aPrs.shape(); @@ -63,33 +72,33 @@ int shapesNbLines(const ModuleBase_ISelection* theSelection) return aCount; } -bool PartSet_DistanceValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_DistanceSelection::isValid(const ModuleBase_ISelection* theSelection) const { int aCount = shapesNbPoints(theSelection) + shapesNbLines(theSelection); return (aCount > 0) && (aCount < 3); } -bool PartSet_LengthValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_LengthSelection::isValid(const ModuleBase_ISelection* theSelection) const { int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 2); + return (aCount == 1); } -bool PartSet_PerpendicularValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_PerpendicularSelection::isValid(const ModuleBase_ISelection* theSelection) const { int aCount = shapesNbLines(theSelection); return (aCount > 0) && (aCount < 3); } -bool PartSet_ParallelValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_ParallelSelection::isValid(const ModuleBase_ISelection* theSelection) const { int aCount = shapesNbLines(theSelection); return (aCount > 0) && (aCount < 3); } -bool PartSet_RadiusValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_RadiusSelection::isValid(const ModuleBase_ISelection* theSelection) const { - QList aList = theSelection->getSelected(); + QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); ModuleBase_ViewerPrs aPrs; int aCount = 0; foreach (ModuleBase_ViewerPrs aPrs, aList) { @@ -105,17 +114,119 @@ bool PartSet_RadiusValidator::isValid(const ModuleBase_ISelection* theSelection) } } } - return (aCount > 0) && (aCount < 2); + return (aCount == 1); +} + +bool PartSet_RigidSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); + return (aList.count() == 1); +} + + +bool PartSet_CoincidentSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + // Coincident can be applied to points and to lines + int aCount = shapesNbPoints(theSelection); + aCount += shapesNbLines(theSelection); + return (aCount > 0) && (aCount < 3); } -bool PartSet_RigidValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_HVDirSelection::isValid(const ModuleBase_ISelection* theSelection) const { int aCount = shapesNbLines(theSelection); - return (aCount > 0) && (aCount < 2); + return (aCount == 1); +} + +bool PartSet_FilletSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + int aCount = shapesNbLines(theSelection); + return (aCount > 0) && (aCount < 3); +} + +bool PartSet_TangentSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + QList aList = theSelection->getSelected(ModuleBase_ISelection::Viewer); + if ((aList.size() == 0) || (aList.size() > 2)) + return false; + + ModuleBase_ViewerPrs aPrs = aList.first(); + const TopoDS_Shape& aShape = aPrs.shape(); + if (aShape.IsNull()) + return false; + + if (aShape.ShapeType() != TopAbs_EDGE) + return false; + + std::shared_ptr aShapePtr(new GeomAPI_Shape); + aShapePtr->setImpl(new TopoDS_Shape(aShape)); + GeomAPI_Edge aEdge1(aShapePtr); + + if (aEdge1.isLine() || aEdge1.isArc()) { + if (aList.size() == 2) { + // Check second selection + aPrs = aList.last(); + const TopoDS_Shape& aShape2 = aPrs.shape(); + if (aShape2.IsNull()) + return false; + + if (aShape2.ShapeType() != TopAbs_EDGE) + return false; + + std::shared_ptr aShapePtr2(new GeomAPI_Shape); + aShapePtr2->setImpl(new TopoDS_Shape(aShape2)); + GeomAPI_Edge aEdge2(aShapePtr2); + if (aEdge1.isLine() && aEdge2.isArc()) + return true; + else if (aEdge1.isArc() && aEdge2.isLine()) + return true; + else + return false; + } else + return true; + } + return false; +} + +bool PartSet_AngleSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + int aCount = shapesNbLines(theSelection); + return (aCount > 0) && (aCount < 3); +} + +std::string PartSet_DifferentObjectsValidator::errorMessage( + const PartSet_DifferentObjectsValidator::ErrorType& theType, + const std::string& thEqualObject, const std::string& theFirstAttribute, + const std::string& theSecondAttribute) const +{ + std::string anError; + switch (theType) { + case EqualObjects: + anError = "The feature uses one " + thEqualObject + " object in " + + theFirstAttribute + " and " + theSecondAttribute + " attributes."; + break; + case EqualAttributes: + anError = "The feature uses reference to one " + thEqualObject + " attribute in " + + theFirstAttribute + " and " + theSecondAttribute + " attributes."; + break; + case EqualShapes: + anError = "The feature uses one shape in " + + theFirstAttribute + " and " + theSecondAttribute + " attributes."; + break; + case EmptyShapes: + anError = "The feature uses empty shapes in " + + theFirstAttribute + " and " + theSecondAttribute + " attributes."; + break; + break; + default: + break; + } + return anError; } bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute, - const std::list& theArguments) const + const std::list& theArguments, + std::string& theError) const { FeaturePtr aFeature = std::dynamic_pointer_cast(theAttribute->owner()); @@ -140,18 +251,25 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute if (aRef->isObject() != isObject) continue; if (isObject) { - if (aRef->object() == anObject) + if (aRef->object() == anObject) { + theError = errorMessage(EqualObjects, anObject.get() ? anObject->data()->name() : "", + theAttribute->id(), aRef->id()); return false; + } } else { // the attribute reference - if (aRef->attr() == theAttribute) + if (aRef->attr() == anAttributeAttr) { + theError = errorMessage(EqualAttributes, + anAttributeAttr.get() ? anAttributeAttr->id() : "", + theAttribute->id(), aRef->id()); return false; + } } } } } } - else if (anAttrType == ModelAPI_AttributeRefAttr::typeId()) { + else if (anAttrType == ModelAPI_AttributeSelection::typeId()) { AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(theAttribute); ResultPtr aContext = anAttr->context(); GeomShapePtr aShape = anAttr->value(); @@ -167,8 +285,10 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute // check the object is already presented if (aRef->context() == aContext) { bool aHasShape = aShape.get() != NULL; - if (!aHasShape || aRef->value()->isEqual(aShape)) + if (!aHasShape || aRef->value()->isEqual(aShape)) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), aRef->id()); return false; + } } } } @@ -186,69 +306,145 @@ bool PartSet_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute std::shared_ptr aRef = std::dynamic_pointer_cast(*anAttr); // check the object is already presented - if (aRef->value() == anObject) + if (aRef->value() == anObject) { + theError = errorMessage(EqualObjects, anObject.get() ? anObject->data()->name() : "", + theAttribute->id(), aRef->id()); return false; + } } return true; } } } - return !featureHasReferences(theAttribute); -} - -bool PartSet_DifferentObjectsValidator::featureHasReferences(const AttributePtr& theAttribute) const -{ - std::list > > allRefs; - if (theAttribute->owner().get() && theAttribute->owner()->data().get()) - theAttribute->owner()->data()->referencesToObjects(allRefs); - // collect object referenced by theAttribute - std::list* anAttrObjs = 0; - std::list > >::iterator aRefIter = allRefs.begin(); - for(; aRefIter != allRefs.end(); aRefIter++) { - if (theAttribute->id() == aRefIter->first) - anAttrObjs = &(aRefIter->second); + else if(anAttrType == ModelAPI_AttributeSelectionList::typeId()) { + std::shared_ptr aCurSelList = + std::dynamic_pointer_cast(theAttribute); + anAttrs = aFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId()); + if(anAttrs.size() > 0) { + std::list>::iterator anAttrItr = anAttrs.begin(); + for(; anAttrItr != anAttrs.end(); anAttrItr++){ + if ((*anAttrItr).get() && (*anAttrItr)->id() != theAttribute->id()){ + std::shared_ptr aRefSelList = + std::dynamic_pointer_cast(*anAttrItr); + 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); + std::shared_ptr aCurSelCompSolid; + if(aCurSelCompSolidPtr.get()) { + aCurSelCompSolid = aCurSelCompSolidPtr->shape(); + } + 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); + std::shared_ptr aRefSelCompSolid; + 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; + } + if(aCurSelContext == aRefSelContext) { + if (aCurSel->value().get() == NULL || aRefSel->value().get() == NULL) { + theError = errorMessage(EmptyShapes, "", theAttribute->id(), + aRefSel->id()); + return false; + } + if (aCurSel->value()->isEqual(aRefSel->value())) { + theError = errorMessage(EqualShapes, "", theAttribute->id(), + aRefSel->id()); + return false; + } + } + } + } + } + } + } } - if (!anAttrObjs || anAttrObjs->empty()) - return false; // theAttribute does not references to anything - // check with all others - for(aRefIter = allRefs.begin(); aRefIter != allRefs.end(); aRefIter++) { - if (theAttribute->id() == aRefIter->first) - continue; // do not check with myself - std::list::iterator aReferenced = aRefIter->second.begin(); - for(; aReferenced != aRefIter->second.end(); aReferenced++) { - std::list::iterator aReferencedByMe = anAttrObjs->begin(); - for(; aReferencedByMe != anAttrObjs->end(); aReferencedByMe++) { - if (*aReferenced == *aReferencedByMe) // found same objects! - return true; + else if (anAttrType == ModelAPI_AttributeRefList::typeId()) { + std::shared_ptr aCurSelList = + std::dynamic_pointer_cast(theAttribute); + anAttrs = aFeature->data()->attributes(ModelAPI_AttributeRefList::typeId()); + if (anAttrs.size() > 0) { + std::list>::iterator anAttrItr = anAttrs.begin(); + for (; anAttrItr != anAttrs.end(); anAttrItr++){ + if ((*anAttrItr).get() && (*anAttrItr)->id() != theAttribute->id()){ + std::shared_ptr aRefSelList = + std::dynamic_pointer_cast(*anAttrItr); + for (int i = 0; i < aCurSelList->size(); i++) { + ObjectPtr aCurSelObject = aCurSelList->object(i); + 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()); + return false; + } + } + } + } } } } - return false; + return true; } bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, - const std::list& theArguments) const + const std::list& theArguments, + std::string& theError) const { bool isSketchEntities = true; std::set anEntityKinds; + std::string anEntityKindsStr; std::list::const_iterator anIt = theArguments.begin(), aLast = theArguments.end(); for (; anIt != aLast; anIt++) { anEntityKinds.insert(*anIt); + if (!anEntityKindsStr.empty()) + anEntityKindsStr += ", "; + anEntityKindsStr += *anIt; } std::string anAttributeType = theAttribute->attributeType(); if (anAttributeType == ModelAPI_AttributeSelectionList::typeId()) { AttributeSelectionListPtr aSelectionListAttr = std::dynamic_pointer_cast(theAttribute); - // it filters only selection list attributes - std::string aType = aSelectionListAttr->selectionType().c_str(); // all context objects should be sketch entities - int aSize = aSelectionListAttr->size(); - for (int i = 0; i < aSelectionListAttr->size() && isSketchEntities; i++) { + for (int i = 0, aSize = aSelectionListAttr->size(); i < aSize && isSketchEntities; i++) { AttributeSelectionPtr aSelectAttr = aSelectionListAttr->value(i); ObjectPtr anObject = aSelectAttr->context(); - FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); - isSketchEntities = anEntityKinds.find(aFeature->getKind()) != anEntityKinds.end(); + // a context of the selection attribute is a feature result. It can be a case when the result + // of the feature is null, e.g. the feature is modified and has not been executed yet. + // The validator returns an invalid result here. The case is an extrusion built on a sketch + // feature. A new sketch element creation leads to an empty result. + if (!anObject.get()) + isSketchEntities = false; + else { + FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); + isSketchEntities = anEntityKinds.find(aFeature->getKind()) != anEntityKinds.end(); + } + } + } + if (anAttributeType == ModelAPI_AttributeRefList::typeId()) { + AttributeRefListPtr aRefListAttr = + std::dynamic_pointer_cast(theAttribute); + // all context objects should be sketch entities + for (int i = 0, aSize = aRefListAttr->size(); i < aSize && isSketchEntities; i++) { + ObjectPtr anObject = aRefListAttr->object(i); + // a context of the selection attribute is a feature result. It can be a case when the result + // of the feature is null, e.g. the feature is modified and has not been executed yet. + // The validator returns an invalid result here. The case is an extrusion built on a sketch + // feature. A new sketch element creation leads to an empty result. + if (!anObject.get()) + isSketchEntities = false; + else { + FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); + isSketchEntities = anEntityKinds.find(aFeature->getKind()) != anEntityKinds.end(); + } } } if (anAttributeType == ModelAPI_AttributeRefAttr::typeId()) { @@ -264,15 +460,22 @@ bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, } } } + if (!isSketchEntities) { + theError = "It refers to feature, which kind is not in the list: " + anEntityKindsStr; + } return isSketchEntities; } - - -bool PartSet_SameTypeAttrValidator::isValid( - const AttributePtr& theAttribute, const std::list& theArguments ) const +bool PartSet_CoincidentAttr::isValid(const AttributePtr& theAttribute, + const std::list& theArguments, + std::string& theError) const { + if (theAttribute->attributeType() != ModelAPI_AttributeRefAttr::typeId()) { + theError = "The attribute with the " + theAttribute->attributeType() + " type is not processed"; + return false; + } + // there is a check whether the feature contains a point and a linear edge or two point values std::string aParamA = theArguments.front(); SessionPtr aMgr = ModelAPI_Session::get(); @@ -280,19 +483,50 @@ bool PartSet_SameTypeAttrValidator::isValid( FeaturePtr aFeature = std::dynamic_pointer_cast(theAttribute->owner()); AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(theAttribute); - if (!aRefAttr) - return false; + QList aCoinsideLines; bool isObject = aRefAttr->isObject(); ObjectPtr anObject = aRefAttr->object(); if (isObject && anObject) { FeaturePtr aRefFea = ModelAPI_Feature::feature(anObject); - AttributeRefAttrPtr aOtherAttr = aFeature->data()->refattr(aParamA); ObjectPtr aOtherObject = aOtherAttr->object(); + // if the other attribute is not filled still, the result is true + if (!aOtherObject.get()) + return true; FeaturePtr aOtherFea = ModelAPI_Feature::feature(aOtherObject); - return aRefFea->getKind() == aOtherFea->getKind(); + + // check that both have coincidence + FeaturePtr aConstrFeature; + std::set aCoinList; + const std::set>& aRefsList = aRefFea->data()->refsToMe(); + std::set>::const_iterator aIt; + for (aIt = aRefsList.cbegin(); aIt != aRefsList.cend(); ++aIt) { + std::shared_ptr aAttr = (*aIt); + aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); + if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { + AttributeRefAttrPtr aRAttr = std::dynamic_pointer_cast(aAttr); + AttributePtr aAR = aRAttr->attr(); + if (aAR->id() != SketchPlugin_Arc::CENTER_ID()) // ignore constraint to center of arc + aCoinList.insert(aConstrFeature); + PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, + SketchPlugin_ConstraintCoincidence::ENTITY_A()); + PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, + SketchPlugin_ConstraintCoincidence::ENTITY_B()); + } + } + // if there is no coincidence then it is not valid + if (aCoinList.size() > 0) { + QList::const_iterator anIt = aCoinsideLines.begin(), aLast = aCoinsideLines.end(); + bool aValid = false; + for (; anIt != aLast && !aValid; anIt++) { + aValid = *anIt == aOtherFea; + } + if (aValid) + return true; + } } + theError = "There is no a common coincident point."; return false; }