X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Validators.cpp;h=55f0157b003a2ff8e9f36cdc1ec364f706b1d98f;hb=03421c138afb385f1bb8d11f290ccb1663f3fbb8;hp=85b0dd3eca700f983f09cbb2d8d32fabdfe70932;hpb=ed329a97add10e760a2e636697f50968a7f4d289;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Validators.cpp b/src/PartSet/PartSet_Validators.cpp index 85b0dd3ec..55f0157b0 100644 --- a/src/PartSet/PartSet_Validators.cpp +++ b/src/PartSet/PartSet_Validators.cpp @@ -20,8 +20,10 @@ #include #include #include +#include #include +#include #include #ifdef _DEBUG @@ -62,31 +64,31 @@ 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(); ModuleBase_ViewerPrs aPrs; @@ -104,60 +106,159 @@ bool PartSet_RadiusValidator::isValid(const ModuleBase_ISelection* theSelection) } } } - return (aCount > 0) && (aCount < 2); + return (aCount == 1); } -bool PartSet_RigidValidator::isValid(const ModuleBase_ISelection* theSelection) const +bool PartSet_RigidSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + QList aList = theSelection->getSelected(); + return (aList.count() == 1); +} + + +bool PartSet_CoincidentSelection::isValid(const ModuleBase_ISelection* theSelection) const +{ + int aCount = shapesNbPoints(theSelection); + return (aCount > 0) && (aCount < 3); +} + +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(); + 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_DifferentObjectsValidator::isValid(const AttributePtr& theAttribute, const std::list& theArguments) const { FeaturePtr aFeature = std::dynamic_pointer_cast(theAttribute->owner()); - // 1. check whether the object of the attribute is not among the feature attributes - // find the attribute's object - ObjectPtr anObject = GeomValidators_Tools::getObject(theAttribute); - - // check whether the object is not among other feature attributes - if (anObject.get() != NULL) { - // Check RefAttr attributes - std::list > anAttrs = aFeature->data()->attributes(""); - //if (anAttrs.size() > 0) { - std::list >::iterator anIt = anAttrs.begin(); - for(; anIt != anAttrs.end(); anIt++) { - AttributePtr anAttr = *anIt; - // the function parameter attribute should be skipped - if (anAttr.get() == NULL || anAttr->id() == theAttribute->id()) - continue; - ObjectPtr aCurObject = GeomValidators_Tools::getObject(anAttr); - if (aCurObject && aCurObject == anObject) - return false; + // 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()) { + AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast(theAttribute); + bool isObject = anAttr->isObject(); + ObjectPtr anObject = anAttr->object(); + AttributePtr anAttributeAttr = anAttr->attr(); + + anAttrs = aFeature->data()->attributes(ModelAPI_AttributeRefAttr::typeId()); + if (anAttrs.size() > 0) { + std::list >::iterator anAttr = anAttrs.begin(); + for(; anAttr != anAttrs.end(); anAttr++) { + if ((*anAttr).get() && (*anAttr)->id() != theAttribute->id()) { + std::shared_ptr aRef = + std::dynamic_pointer_cast(*anAttr); + if (aRef->isObject() != isObject) + continue; + if (isObject) { + if (aRef->object() == anObject) + return false; + } + else { // the attribute reference + if (aRef->attr() == theAttribute) + return false; + } + } + } + } + } + else if (anAttrType == ModelAPI_AttributeRefAttr::typeId()) { + AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(theAttribute); + ResultPtr aContext = anAttr->context(); + GeomShapePtr aShape = anAttr->value(); + + // Check selection attributes + anAttrs = aFeature->data()->attributes(ModelAPI_AttributeSelection::typeId()); + if (anAttrs.size() > 0) { + std::list >::iterator anAttr = anAttrs.begin(); + for(; anAttr != anAttrs.end(); anAttr++) { + if ((*anAttr).get() && (*anAttr)->id() != theAttribute->id()) { + std::shared_ptr aRef = + std::dynamic_pointer_cast(*anAttr); + // check the object is already presented + if (aRef->context() == aContext) { + bool aHasShape = aShape.get() != NULL; + if (!aHasShape || aRef->value()->isEqual(aShape)) + return false; + } + } + } } } - else { - // 2. collect object referenced by theAttribute and ... - if (featureHasReferences(theAttribute)) { - // 3. check whether the attribute value is not among other feature attributes - std::list > anAttrs = - aFeature->data()->attributes(ModelAPI_AttributeRefAttr::type()); + else if (anAttrType == ModelAPI_AttributeReference::typeId()) { + AttributeReferencePtr anAttr = std::dynamic_pointer_cast(theAttribute); + ObjectPtr anObject = anAttr->value(); + // Check selection attributes + anAttrs = aFeature->data()->attributes(ModelAPI_AttributeReference::typeId()); + if (anAttrs.size() > 0) { std::list >::iterator anAttr = anAttrs.begin(); for(; anAttr != anAttrs.end(); anAttr++) { - if (*anAttr) { - std::shared_ptr aRef = - std::dynamic_pointer_cast(*anAttr); + if ((*anAttr).get() && (*anAttr)->id() != theAttribute->id()) { + std::shared_ptr aRef = + std::dynamic_pointer_cast(*anAttr); // check the object is already presented - if (!aRef->isObject() && aRef->attr() == theAttribute) + if (aRef->value() == anObject) return false; } + return true; } - return true; } } - return true; + return !featureHasReferences(theAttribute); } bool PartSet_DifferentObjectsValidator::featureHasReferences(const AttributePtr& theAttribute) const @@ -173,7 +274,7 @@ bool PartSet_DifferentObjectsValidator::featureHasReferences(const AttributePtr& anAttrObjs = &(aRefIter->second); } if (!anAttrObjs || anAttrObjs->empty()) - return true; // theAttribute does not references to anything + 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) @@ -183,11 +284,11 @@ bool PartSet_DifferentObjectsValidator::featureHasReferences(const AttributePtr& std::list::iterator aReferencedByMe = anAttrObjs->begin(); for(; aReferencedByMe != anAttrObjs->end(); aReferencedByMe++) { if (*aReferenced == *aReferencedByMe) // found same objects! - return false; + return true; } } } - return true; + return false; } bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, @@ -201,7 +302,7 @@ bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, } std::string anAttributeType = theAttribute->attributeType(); - if (anAttributeType == ModelAPI_AttributeSelectionList::type()) { + if (anAttributeType == ModelAPI_AttributeSelectionList::typeId()) { AttributeSelectionListPtr aSelectionListAttr = std::dynamic_pointer_cast(theAttribute); // it filters only selection list attributes @@ -211,11 +312,19 @@ bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, for (int i = 0; i < aSelectionListAttr->size() && 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_AttributeRefAttr::type()) { + if (anAttributeType == ModelAPI_AttributeRefAttr::typeId()) { std::shared_ptr aRef = std::dynamic_pointer_cast(theAttribute); isSketchEntities = false; @@ -231,3 +340,32 @@ bool PartSet_SketchEntityValidator::isValid(const AttributePtr& theAttribute, return isSketchEntities; } + + + +bool PartSet_SameTypeAttrValidator::isValid( + const AttributePtr& theAttribute, const std::list& theArguments ) const +{ + // 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(); + ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); + + FeaturePtr aFeature = std::dynamic_pointer_cast(theAttribute->owner()); + AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast(theAttribute); + if (!aRefAttr) + return false; + + 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(); + FeaturePtr aOtherFea = ModelAPI_Feature::feature(aOtherObject); + return aRefFea->getKind() == aOtherFea->getKind(); + } + return false; +} +