-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GeomValidators_ShapeType.h"
#include "GeomValidators_Tools.h"
#include <GeomAPI_Curve.h>
+#include <GeomAPI_ShapeIterator.h>
#include <GeomDataAPI_Point2D.h>
#include <ModelAPI_Result.h>
+#include <ModelAPI_Feature.h>
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_AttributeRefAttr.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <Events_InfoMessage.h>
+#include <algorithm>
#include <string>
#include <map>
if (MyShapeTypes.size() == 0) {
MyShapeTypes["empty"] = Empty;
MyShapeTypes["vertex"] = Vertex;
+ MyShapeTypes["vertices"] = Vertex;
MyShapeTypes["edge"] = Edge;
+ MyShapeTypes["edges"] = Edge;
MyShapeTypes["line"] = Line;
MyShapeTypes["circle"] = Circle;
MyShapeTypes["wire"] = Wire;
MyShapeTypes["face"] = Face;
+ MyShapeTypes["faces"] = Face;
MyShapeTypes["plane"] = Plane;
MyShapeTypes["shell"] = Shell;
MyShapeTypes["solid"] = Solid;
+ MyShapeTypes["solids"] = Solid;
MyShapeTypes["compsolid"] = CompSolid;
MyShapeTypes["compound"] = Compound;
}
std::string aType = std::string(theType.c_str());
+ std::transform(aType.begin(), aType.end(), aType.begin(),
+ [](char c) { return static_cast<char>(::tolower(c)); });
if (MyShapeTypes.find(aType) != MyShapeTypes.end())
return MyShapeTypes[aType];
- Events_InfoMessage("Shape type defined in XML is not implemented!").send();
+// LCOV_EXCL_START
+ //Events_InfoMessage("Shape type defined in XML is not implemented!").send();
return AnyShape;
+// LCOV_EXCL_STOP
}
+// LCOV_EXCL_START
std::string getShapeTypeDescription(const GeomValidators_ShapeType::TypeOfShape& theType)
{
std::string aValue = "";
if (MyShapeTypes.size() != 0) {
std::map<std::string, GeomValidators_ShapeType::TypeOfShape>::const_iterator
anIt = MyShapeTypes.begin(), aLast = MyShapeTypes.end();
- for (; anIt != aLast; anIt++) {
- if (anIt->second == theType)
+ for (; anIt != aLast; anIt++)
+ if (anIt->second == theType) {
aValue = anIt->first;
break;
- }
+ }
}
return aValue;
}
+// LCOV_EXCL_STOP
bool GeomValidators_ShapeType::isValid(const AttributePtr& theAttribute,
const std::list<std::string>& theArguments,
}
if (!aValid && theError.empty()) {
std::string aTypes;
- std::list<std::string>::const_iterator anIt = theArguments.begin(), aLast = theArguments.end();
// returns true if the attribute satisfies at least one of given arguments
- for (; anIt != aLast; anIt++) {
+ for (anIt = theArguments.begin(); anIt != aLast; anIt++) {
if (!aTypes.empty())
aTypes += ", ";
aTypes += *anIt;
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
GeomShapePtr aShape = anAttr->value();
if (aShape.get())
- aValid = isValidShape(aShape, theShapeType, theError);
- else
- aValid = isValidObject(anAttr->context(), theShapeType, theError);
+ aValid = isValidShape(aShape, theShapeType, anAttr->isGeometricalSelection(), theError);
+ else {
+ if (anAttr->context().get())
+ aValid = isValidObject(anAttr->context(),
+ theShapeType,
+ anAttr->isGeometricalSelection(),
+ theError);
+ else
+ aValid = isValidObject(anAttr->contextFeature(),
+ theShapeType,
+ anAttr->isGeometricalSelection(),
+ theError);
+ }
}
else if (anAttributeType == ModelAPI_AttributeRefAttr::typeId()) {
AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
if (anAttr->isObject()) {
- aValid = isValidObject(anAttr->object(), theShapeType, theError);
+ aValid = isValidObject(anAttr->object(),
+ theShapeType,
+ false,
+ theError);
}
else if (theShapeType == Vertex) {
AttributePtr aRefAttr = anAttr->attr();
theError = "It has reference to an empty attribute";
}
else {
- std::string anAttributeType = aRefAttr->attributeType();
- aValid = anAttributeType == GeomDataAPI_Point2D::typeId();
+ std::string anAttrType = aRefAttr->attributeType();
+ aValid = anAttrType == GeomDataAPI_Point2D::typeId();
if (!aValid) {
+// LCOV_EXCL_START
theError = "Shape type is \"%1\", it should be \"%2\"";
- theError.arg(anAttributeType).arg(getShapeTypeDescription(theShapeType));
+ theError.arg(anAttrType).arg(getShapeTypeDescription(theShapeType));
+// LCOV_EXCL_STOP
}
}
}
+ else
+ aValid = false;
}
else if (anAttributeType == ModelAPI_AttributeReference::typeId()) {
AttributeReferencePtr anAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeReference>(theAttribute);
- aValid = isValidObject(anAttr->value(), theShapeType, theError);
+ aValid = isValidObject(anAttr->value(), theShapeType, false, theError);
}
else if (anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
AttributeSelectionListPtr aListAttr =
}
}
else {
+// LCOV_EXCL_START
aValid = false;
theError = "The attribute with the %1 type is not processed";
theError.arg(anAttributeType);
+// LCOV_EXCL_STOP
}
+ if (aValid)
+ theError = "";
return aValid;
}
bool GeomValidators_ShapeType::isValidObject(const ObjectPtr& theObject,
const TypeOfShape theShapeType,
+ const bool theIsGeometricalSelection,
Events_InfoMessage& theError) const
{
bool aValid = true;
}
else {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
- if( theShapeType==Plane )
- {
- ResultConstructionPtr aResultConstruction =
- std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theObject);
- FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
- const std::string& aKind = aFeature->getKind();
- return aResult.get() != NULL && aKind == "Plane";
- }
- if (!aResult.get()) {
- aValid = false;
- theError = "The result is empty";
- }
- else {
- aValid = isValidShape(aResult->shape(), theShapeType, theError);
+ if (aResult.get()) {
+ if (theShapeType == Plane)
+ {
+ ResultConstructionPtr aResultConstruction =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theObject);
+ FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+ const std::string& aKind = aFeature->getKind();
+ return aResult.get() != NULL && aKind == "Plane";
+ }
+ if (!aResult.get()) {
+ aValid = false;
+ theError = "The result is empty";
+ } else {
+ aValid = isValidShape(aResult->shape(), theShapeType, theIsGeometricalSelection, theError);
+ }
+ } else {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
+ if (aFeature.get() && (theShapeType == CompSolid))
+ return aValid;
+ else {
+ aValid = false;
+ theError = "The feature has to produce a compsolid";
+ }
}
}
return aValid;
bool GeomValidators_ShapeType::isValidShape(const GeomShapePtr theShape,
const TypeOfShape theShapeType,
+ const bool theIsGeometricalSelection,
Events_InfoMessage& theError) const
{
bool aValid = true;
case Edge:
aValid = theShape->isEdge();
break;
- case Line:
- aValid = theShape->isEdge() && GeomAPI_Curve(theShape).isLine();
+ case Line: {
+ if (theIsGeometricalSelection && theShape->isCompound()) {
+ aValid = true;
+ for (GeomAPI_ShapeIterator anIt(theShape); anIt.more(); anIt.next()) {
+ if (!anIt.current()->isEdge() || !GeomAPI_Curve(anIt.current()).isLine()) {
+ aValid = false;
+ break;
+ }
+ }
+ }
+ else {
+ aValid = theShape->isEdge() && GeomAPI_Curve(theShape).isLine();
+ }
break;
+ }
case Circle:
aValid = theShape->isEdge() && GeomAPI_Curve(theShape).isCircle();
break;
case Shell:
aValid = theShape->shapeType() == GeomAPI_Shape::SHELL;
break;
+ case Plane:
+ aValid = theShape->isPlanar();
+ break;
case Solid:
aValid = theShape->isSolid() || theShape->isCompSolid() ||
theShape->isCompoundOfSolids();
