+## Copyright (C) 2014-2017 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<mailto:webmaster.salome@opencascade.com>
+##
+
"""
TestFillet.py
- Unit test of SketchPlugin_ConstraintFillet class
-
- SketchPlugin_ConstraintFillet
- static const std::string MY_CONSTRAINT_FILLET_ID("SketchConstraintFillet");
+ Unit test of SketchPlugin_Fillet class
+
+ SketchPlugin_Fillet
+ static const std::string MY_CONSTRAINT_FILLET_ID("SketchFillet");
data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::typeId());
- data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId());
- data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefAttr::typeId());
- data()->addAttribute(SketchPlugin_Constraint::ENTITY_C(), ModelAPI_AttributeRefList::typeId());
+ data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttrList::typeId());
+ data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId());
+ data()->addAttribute(SketchPlugin_Constraint::ENTITY_C(), ModelAPI_AttributeRefAttrList::typeId());
"""
from GeomDataAPI import *
from ModelAPI import *
import math
+from salome.shaper import model
#=========================================================================
# Auxiliary functions
#=========================================================================
-aStartPoint1 = []
+TOLERANCE = 1.e-7
def createSketch1(theSketch):
- global aStartPoint1
- # Initialize sketch by two lines with coincident boundary
+ global aEndPoint1, aEndPoint2
+ # Initialize sketch by three lines with coincident boundaries
allFeatures = []
+
+ aSession.startOperation()
# Line1
aSketchLine1 = theSketch.addFeature("SketchLine")
aStartPoint1 = geomDataAPI_Point2D(aSketchLine1.attribute("StartPoint"))
aEndPoint1 = geomDataAPI_Point2D(aSketchLine1.attribute("EndPoint"))
- aStartPoint1.setValue(10., 5.)
+ aStartPoint1.setValue(-10., -10.)
aEndPoint1.setValue(-10., 10.)
allFeatures.append(aSketchLine1)
# Line2
aSketchLine2 = theSketch.addFeature("SketchLine")
aStartPoint2 = geomDataAPI_Point2D(aSketchLine2.attribute("StartPoint"))
aEndPoint2 = geomDataAPI_Point2D(aSketchLine2.attribute("EndPoint"))
- aStartPoint2.setValue(10., 5.)
- aEndPoint2.setValue(15., 20.)
+ aStartPoint2.setValue(-10., 10.)
+ aEndPoint2.setValue(10., 10.)
allFeatures.append(aSketchLine2)
- # Coincidence
- aCoincidence = theSketch.addFeature("SketchConstraintCoincidence")
- aCoincidence.refattr("ConstraintEntityA").setAttr(aStartPoint1)
- aCoincidence.refattr("ConstraintEntityB").setAttr(aStartPoint2)
-
- theSketch.execute()
+ # Line3
+ aSketchLine3 = theSketch.addFeature("SketchLine")
+ aStartPoint3 = geomDataAPI_Point2D(aSketchLine3.attribute("StartPoint"))
+ aEndPoint3 = geomDataAPI_Point2D(aSketchLine3.attribute("EndPoint"))
+ aStartPoint3.setValue(10., 10.)
+ aEndPoint3.setValue(10., -10.)
+ allFeatures.append(aSketchLine3)
+ # Coincidence1
+ aCoincidence1 = theSketch.addFeature("SketchConstraintCoincidence")
+ aCoincidence1.refattr("ConstraintEntityA").setAttr(aEndPoint1)
+ aCoincidence1.refattr("ConstraintEntityB").setAttr(aStartPoint2)
+ # Coincidence2
+ aCoincidence2 = theSketch.addFeature("SketchConstraintCoincidence")
+ aCoincidence2.refattr("ConstraintEntityA").setAttr(aEndPoint2)
+ aCoincidence2.refattr("ConstraintEntityB").setAttr(aStartPoint3)
+
+ aSession.finishOperation()
return allFeatures
global aStartPoint1
# Initialize sketch by line and arc with coincident boundary
allFeatures = []
+
+ aSession.startOperation()
# Line
aSketchLine = theSketch.addFeature("SketchLine")
aStartPoint1 = geomDataAPI_Point2D(aSketchLine.attribute("StartPoint"))
aEndPoint1 = geomDataAPI_Point2D(aSketchLine.attribute("EndPoint"))
aStartPoint1.setValue(10., 10.)
- aEndPoint1.setValue(30., 5.)
+ aEndPoint1.setValue(30., 15.)
allFeatures.append(aSketchLine)
# Arc
aSketchArc = theSketch.addFeature("SketchArc")
- aStartPoint2 = geomDataAPI_Point2D(aSketchArc.attribute("ArcStartPoint"))
- aEndPoint2 = geomDataAPI_Point2D(aSketchArc.attribute("ArcEndPoint"))
- aCenterPoint = geomDataAPI_Point2D(aSketchArc.attribute("ArcCenter"))
+ aStartPoint2 = geomDataAPI_Point2D(aSketchArc.attribute("start_point"))
+ aEndPoint2 = geomDataAPI_Point2D(aSketchArc.attribute("end_point"))
+ aCenterPoint = geomDataAPI_Point2D(aSketchArc.attribute("center_point"))
aCenterPoint.setValue(20., 10.)
aStartPoint2.setValue(10., 10.)
aEndPoint2.setValue(20., 0.)
aCoincidence = theSketch.addFeature("SketchConstraintCoincidence")
aCoincidence.refattr("ConstraintEntityA").setAttr(aStartPoint1)
aCoincidence.refattr("ConstraintEntityB").setAttr(aStartPoint2)
-
- theSketch.execute()
+
+ aSession.finishOperation()
return allFeatures
-
-def checkFillet(theObjects, theRadius):
- # Verify the arc and lines are connected smoothly
- print "Check Fillet"
- aLine = []
- anArc = []
- aSize = theObjects.size()
- for i in range (0, aSize):
- feat = ModelAPI_Feature.feature(theObjects.object(i))
- assert(feat is not None)
- if (feat.getKind() == "SketchLine"):
- aLine.append(feat)
- elif (feat.getKind() == "SketchArc"):
- anArc.append(feat)
- aFilletArc = anArc[-1]
- assert(aFilletArc is not None)
- anArc.pop()
-
- anArcPoints = []
- aPoint = geomDataAPI_Point2D(aFilletArc.attribute("ArcStartPoint"))
- print "ArcStartPoint " + repr(aPoint.x()) + " " + repr(aPoint.y())
- anArcPoints.append((aPoint.x(), aPoint.y()))
- aPoint = geomDataAPI_Point2D(aFilletArc.attribute("ArcEndPoint"))
- print "ArcEndPoint " + repr(aPoint.x()) + " " + repr(aPoint.y())
- anArcPoints.append((aPoint.x(), aPoint.y()))
- aPoint = geomDataAPI_Point2D(aFilletArc.attribute("ArcCenter"))
- print "ArcCenter " + repr(aPoint.x()) + " " + repr(aPoint.y())
- aCenterX = aPoint.x()
- aCenterY = aPoint.y()
- aFilletRadius = math.hypot(anArcPoints[0][0]-aCenterX, anArcPoints[0][1]-aCenterY)
-
- for line in aLine:
- aStartPoint = geomDataAPI_Point2D(line.attribute("StartPoint"))
- aEndPoint = geomDataAPI_Point2D(line.attribute("EndPoint"))
-
- aLinePoints = []
- aLinePoints.append((aStartPoint.x(), aStartPoint.y()))
- print "aLineStartPoint " + repr(aStartPoint.x()) + " " + repr(aStartPoint.y())
- aLinePoints.append((aEndPoint.x(), aEndPoint.y()))
- print "aLineEndPoint " + repr(aEndPoint.x()) + " " + repr(aEndPoint.y())
-
- aLineDirX = aEndPoint.x() - aStartPoint.x()
- aLineDirY = aEndPoint.y() - aStartPoint.y()
-
- for arcPt in anArcPoints:
- for linePt in aLinePoints:
- if (math.hypot(linePt[0]-arcPt[0], linePt[1]-arcPt[1]) < 1.e-10):
- aDirX = linePt[0] - aCenterX
- aDirY = linePt[1] - aCenterY
- assert(math.fabs(math.hypot(aDirX, aDirY) - theRadius) < 1.e-7)
- aDot = aDirX * aLineDirX + aDirY * aLineDirY
-
- break;
-
- for arc in anArc:
- aStartPoint = geomDataAPI_Point2D(arc.attribute("ArcStartPoint"))
- aEndPoint = geomDataAPI_Point2D(arc.attribute("ArcEndPoint"))
- aCenterPoint = geomDataAPI_Point2D(arc.attribute("ArcCenter"))
-
- aBaseArcPoints = []
- aBaseArcPoints.append((aStartPoint.x(), aStartPoint.y()))
- print "anArcStartPoint " + repr(aStartPoint.x()) + " " + repr(aStartPoint.y())
- aBaseArcPoints.append((aEndPoint.x(), aEndPoint.y()))
- print "anArcEndPoint " + repr(aEndPoint.x()) + " " + repr(aEndPoint.y())
- print "anArcCenter " + repr(aCenterPoint.x()) + " " + repr(aCenterPoint.y())
-
- aRadius = math.hypot(aStartPoint.x()-aCenterPoint.x(), aStartPoint.y()-aCenterPoint.y())
- aDist = math.hypot(aCenterPoint.x() - aCenterX, aCenterPoint.y() - aCenterY)
- assert math.fabs(aFilletRadius + aRadius - aDist) < 1.e-7 or math.fabs(math.fabs(aFilletRadius - aRadius) - aDist) < 1.e-7, \
- "Fillet radius = {0}, Base arc radius = {1}, distance between centers = {2}".format(aFilletRadius, aRadius, aDist)
+
+def checkSmoothness(theSketch):
+ aPtPtCoincidences = getCoincidences(theSketch)
+ for coinc in aPtPtCoincidences:
+ aConnectedFeatures = connectedFeatures(coinc)
+ assert(len(aConnectedFeatures) == 2)
+ if aConnectedFeatures[0].getKind() == "SketchArc":
+ if aConnectedFeatures[1].getKind() == "SketchArc":
+ checkArcArcSmoothness(aConnectedFeatures[0], aConnectedFeatures[1])
+ elif aConnectedFeatures[1].getKind() == "SketchLine":
+ checkArcLineSmoothness(aConnectedFeatures[0], aConnectedFeatures[1])
+ elif aConnectedFeatures[0].getKind() == "SketchLine" and aConnectedFeatures[1].getKind() == "SketchArc":
+ checkArcLineSmoothness(aConnectedFeatures[1], aConnectedFeatures[0])
+
+def checkArcLineSmoothness(theArc, theLine):
+ aCenter = geomDataAPI_Point2D(theArc.attribute("center_point"))
+ aDistance = model.distancePointLine(aCenter, theLine)
+ aRadius = arcRadius(theArc)
+ assert(math.fabs(aRadius - aDistance) < TOLERANCE)
+
+def checkArcArcSmoothness(theArc1, theArc2):
+ aCenter1 = geomDataAPI_Point2D(theArc1.attribute("center_point"))
+ aCenter2 = geomDataAPI_Point2D(theArc2.attribute("center_point"))
+ aDistance = model.distancePointPoint(aCenter1, aCenter2)
+ aRadius1 = arcRadius(theArc1)
+ aRadius2 = arcRadius(theArc2)
+ aRadSum = aRadius1 + aRadius2
+ aRadDiff = math.fabs(aRadius1 - aRadius2)
+ assert(math.fabs(aDistance - aRadSum) < TOLERANCE or math.fabs(aDistance - aRadDiff) < TOLERANCE)
+
+def getCoincidences(theSketch):
+ aCoincidences = []
+ for anIndex in range(0, theSketch.numberOfSubs()):
+ aSubFeature = theSketch.subFeature(anIndex)
+ if aSubFeature.getKind() == "SketchConstraintCoincidence":
+ anEntityA = aSubFeature.refattr("ConstraintEntityA")
+ anEntityB = aSubFeature.refattr("ConstraintEntityB")
+ if not anEntityA.isObject() and not anEntityB.isObject():
+ aCoincidences.append(aSubFeature)
+ return aCoincidences
+
+def connectedFeatures(theCoincidence):
+ anEntityA = theCoincidence.refattr("ConstraintEntityA")
+ anEntityB = theCoincidence.refattr("ConstraintEntityB")
+ aFeatureA = ModelAPI.ModelAPI_Feature.feature(anEntityA.attr().owner())
+ aFeatureB = ModelAPI.ModelAPI_Feature.feature(anEntityB.attr().owner())
+ return [aFeatureA, aFeatureB]
+
+def arcRadius(theArc):
+ aCenter = geomDataAPI_Point2D(theArc.attribute("center_point"))
+ aStart = geomDataAPI_Point2D(theArc.attribute("start_point"))
+ return model.distancePointPoint(aCenter, aStart)
#=========================================================================
norm.setValue(0, 0, 1)
aSession.finishOperation()
#=========================================================================
-# Initialize sketch by two lines
-#=========================================================================
-aSession.startOperation()
-aFeaturesList = createSketch1(aSketchFeature)
-aSession.finishOperation()
-#=========================================================================
-# Global variables
+# Initialize sketch by three connected lines
#=========================================================================
-FILLET_RADIUS1 = 3.
-FILLET_RADIUS2 = 5.
+createSketch1(aSketchFeature)
+assert (model.dof(aSketchFeature) == 8)
#=========================================================================
# Create the Fillet
#=========================================================================
aSession.startOperation()
-aFillet = aSketchFeature.addFeature("SketchConstraintFillet")
-aRefAttrA = aFillet.refattr("ConstraintEntityA");
-aResConstr = modelAPI_ResultConstruction(aFeaturesList[0].lastResult())
-assert(aResConstr)
-aRefAttrA.setAttr(aStartPoint1)
-aRadius = aFillet.real("ConstraintValue")
-aRadius.setValue(FILLET_RADIUS1)
-aFillet.execute()
-aResObjects = aFillet.reflist("ConstraintEntityB")
+aFillet = aSketchFeature.addFeature("SketchFillet")
+aFillet.refattr("fillet_point").setAttr(aEndPoint1);
+aSession.finishOperation()
+aSession.startOperation()
+aFillet = aSketchFeature.addFeature("SketchFillet")
+aFillet.refattr("fillet_point").setAttr(aEndPoint2);
+aSession.finishOperation()
#=========================================================================
# Verify the objects of fillet are created
#=========================================================================
-assert(aResObjects)
-checkFillet(aResObjects, FILLET_RADIUS1)
+checkSmoothness(aSketchFeature)
+assert (model.dof(aSketchFeature) == 10)
#=========================================================================
-# Change Fillet radius
+# Move a line and check the fillet is correct
#=========================================================================
-aRadius.setValue(FILLET_RADIUS2)
+DELTA_X = DELTA_Y = 10.
+aSession.startOperation()
+aEndPoint1.setValue(aEndPoint1.x() + DELTA_X, aEndPoint1.y() + DELTA_Y)
aSession.finishOperation()
-checkFillet(aResObjects, FILLET_RADIUS2)
+checkSmoothness(aSketchFeature)
+assert (model.dof(aSketchFeature) == 10)
+
#=========================================================================
# Create another sketch
#=========================================================================
# Initialize sketch by line and arc
#=========================================================================
-aSession.startOperation()
-aFeaturesList = createSketch2(aSketchFeature)
-aSession.finishOperation()
+createSketch2(aSketchFeature)
+assert (model.dof(aSketchFeature) == 7)
#=========================================================================
# Create the Fillet
#=========================================================================
aSession.startOperation()
-aFillet = aSketchFeature.addFeature("SketchConstraintFillet")
-aRefAttrA = aFillet.refattr("ConstraintEntityA");
-aRefAttrA.setAttr(aStartPoint1)
-aRadius = aFillet.real("ConstraintValue")
-aRadius.setValue(FILLET_RADIUS1)
-aFillet.execute()
-aResObjects = aFillet.reflist("ConstraintEntityB")
+aFillet = aSketchFeature.addFeature("SketchFillet")
+aFillet.refattr("fillet_point").setAttr(aStartPoint1)
+aSession.finishOperation()
#=========================================================================
# Verify the objects of fillet are created
#=========================================================================
-assert(aResObjects)
-checkFillet(aResObjects, FILLET_RADIUS1)
+checkSmoothness(aSketchFeature)
+assert (model.dof(aSketchFeature) == 8)
#=========================================================================
-# Change Fillet radius
+# Move a line and check the fillet is correct
#=========================================================================
-aRadius.setValue(FILLET_RADIUS2)
+DELTA_X = 1.
+DELTA_Y = -2.
+aSession.startOperation()
+aStartPoint1.setValue(aStartPoint1.x() + DELTA_X, aStartPoint1.y() + DELTA_Y)
aSession.finishOperation()
-checkFillet(aResObjects, FILLET_RADIUS2)
+checkSmoothness(aSketchFeature)
+assert (model.dof(aSketchFeature) == 8)
#=========================================================================
# End of test
#=========================================================================
+
+# TODO: Improve Fillet test case by moving one of filleted objectes and check coincidence and tangency are correct
+
+assert(model.checkPythonDump())
