-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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
//
// 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 "PartSet_Validators.h"
#include <SketchPlugin_Point.h>
#include <GeomAPI_Edge.h>
+#include <Locale_Convert.h>
+
#include <list>
+#include <unordered_map>
#ifdef _DEBUG
#include <iostream>
#endif
return aCount;
}
-int shapesNbLines(const ModuleBase_ISelection* theSelection)
+typedef std::unordered_map<int, int> ShapeQuantity;
+
+int shapesNbEdges(const ModuleBase_ISelection* theSelection, ShapeQuantity& theEdges)
{
QList<ModuleBase_ViewerPrsPtr> aList = theSelection->getSelected(ModuleBase_ISelection::Viewer);
int aCount = 0;
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++;
}
}
}
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);
}
}
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);
}
}
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;
}
}
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;
}
}
if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) {
return isEmptySelectionValid(theOperation);
} else {
- QList<ModuleBase_ViewerPrsPtr> 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_Shape>();
- 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);
}
}
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);
}
}
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);
}
}
return isEmptySelectionValid(theOperation);
} else {
int aCount = shapesNbPoints(theSelection);
- return aCount > 1;
+ ShapeQuantity aShapes;
+ int aNbEdges = shapesNbEdges(theSelection, aShapes);
+ return aCount > 1 && aNbEdges == 0;
}
}
if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) {
return isEmptySelectionValid(theOperation);
} else {
- QList<ModuleBase_ViewerPrsPtr> 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));
}
}
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;
}
}
if (theSelection->getSelected(ModuleBase_ISelection::Viewer).size() == 0) {
return isEmptySelectionValid(theOperation);
} else {
- QList<ModuleBase_ViewerPrsPtr> 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);
}
}
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;
}
}
{
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,
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;
}
}
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
{
- 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);
}
continue;
if (isObject) {
if (aRef->object() == anObject) {
- theError = errorMessage(EqualObjects, anObject.get() ? anObject->data()->name() : "",
- theAttribute->id(), aRef->id());
+ theError = errorMessage(EqualObjects,
+ anObject.get() ? Locale::Convert::toString(anObject->data()->name()) : "",
+ theAttribute->id(), aRef->id());
return false;
}
}
}
}
else if (anAttrType == ModelAPI_AttributeSelection::typeId()) {
- AttributeSelectionPtr anAttr =
+ AttributeSelectionPtr anAttrSel =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
- ResultPtr aContext = anAttr->context();
- FeaturePtr aContextFeature = anAttr->contextFeature();
- GeomShapePtr aShape = anAttr->value();
+ ResultPtr aContext = anAttrSel->context();
+ FeaturePtr aContextFeature = anAttrSel->contextFeature();
+ GeomShapePtr aShape = anAttrSel->value();
// Check selection attributes
anAttrs = aFeature->data()->attributes(ModelAPI_AttributeSelection::typeId());
}
}
else if (anAttrType == ModelAPI_AttributeReference::typeId()) {
- AttributeReferencePtr anAttr =
+ AttributeReferencePtr anAttrRef =
std::dynamic_pointer_cast<ModelAPI_AttributeReference>(theAttribute);
- ObjectPtr anObject = anAttr->value();
+ ObjectPtr anObject = anAttrRef->value();
// Check selection attributes
anAttrs = aFeature->data()->attributes(ModelAPI_AttributeReference::typeId());
if (anAttrs.size() > 0) {
std::dynamic_pointer_cast<ModelAPI_AttributeReference>(*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() ? Locale::Convert::toString(anObject->data()->name()) : "",
+ theAttribute->id(), aRef->id());
return false;
}
}
- return true;
}
+ return true;
}
}
else if(anAttrType == ModelAPI_AttributeSelectionList::typeId()) {
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()?
+ Locale::Convert::toString(aCurSelObject->data()->name()) : "",
+ theAttribute->id(), aCurSelList->id());
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();
- ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
AttributePtr aAR = aRAttr->attr();
if (aAR->id() != SketchPlugin_Arc::CENTER_ID()) // ignore constraint to center of arc
aCoinList.insert(aConstrFeature);
- QList<bool> anIsAttributes;
- PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, aCoins,
- SketchPlugin_ConstraintCoincidence::ENTITY_A(),
- anIsAttributes);
- PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, aCoins,
- SketchPlugin_ConstraintCoincidence::ENTITY_B(),
- anIsAttributes);
+ QList<bool> anIsAttributes;
+ PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, aCoins,
+ SketchPlugin_ConstraintCoincidence::ENTITY_A(),
+ anIsAttributes);
+ PartSet_Tools::findCoincidences(aConstrFeature, aCoinsideLines, aCoins,
+ SketchPlugin_ConstraintCoincidence::ENTITY_B(),
+ anIsAttributes);
}
}
// if there is no coincidence then it is not valid