Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Task 2.4. Ability to modify the radius of circles and arcs of circle with the mouse
[modules/shaper.git]
/
src
/
SketchPlugin
/
Test
/
TestSplit.py
diff --git
a/src/SketchPlugin/Test/TestSplit.py
b/src/SketchPlugin/Test/TestSplit.py
index aa86ac4000a93697f73941c83bea87337ad30309..9d81de1cd72d9a669ee2bbd02b63669ec79b67e7 100644
(file)
--- a/
src/SketchPlugin/Test/TestSplit.py
+++ b/
src/SketchPlugin/Test/TestSplit.py
@@
-1,4
+1,4
@@
-import model
+
from salome.shaper
import model
from ModelAPI import *
from ModelAPI import *
@@
-18,7
+18,7
@@
Part_1_doc = Part_1.document()
Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
SketchLine_1 = Sketch_1.addLine(0, 50, 100, 50)
SketchPoint_1 = Sketch_1.addPoint(50, 50)
Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
SketchLine_1 = Sketch_1.addLine(0, 50, 100, 50)
SketchPoint_1 = Sketch_1.addPoint(50, 50)
-SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchPoint_1.coordinates(), SketchLine_1.result()
[0]
)
+SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchPoint_1.coordinates(), SketchLine_1.result())
Sketch_1.addSplit(SketchLine_1, SketchPoint_1.coordinates(), SketchLine_1.endPoint())
model.do()
Sketch_1.addSplit(SketchLine_1, SketchPoint_1.coordinates(), SketchLine_1.endPoint())
model.do()
@@
-29,8
+29,8
@@
for index in range(Sketch_1_feature.numberOfSubs()):
assert(idList.count(SketchLineId) == 2)
assert(idList.count(SketchPointId) == 1)
assert(idList.count(SketchLineId) == 2)
assert(idList.count(SketchPointId) == 1)
-assert(idList.count(SketchConstraintCoincidenceId) ==
2
)
-assert(idList.count(SketchConstraintParallelId) ==
1
)
+assert(idList.count(SketchConstraintCoincidenceId) ==
3
)
+assert(idList.count(SketchConstraintParallelId) ==
0
)
# Test end
# Test split on line with two points
# Test end
# Test split on line with two points
@@
-38,8
+38,8
@@
Sketch_2 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
SketchLine_2_1 = Sketch_2.addLine(0, 50, 100, 50)
SketchPoint_2_1 = Sketch_2.addPoint(25, 50)
SketchPoint_2_2 = Sketch_2.addPoint(75, 50)
SketchLine_2_1 = Sketch_2.addLine(0, 50, 100, 50)
SketchPoint_2_1 = Sketch_2.addPoint(25, 50)
SketchPoint_2_2 = Sketch_2.addPoint(75, 50)
-SketchConstraintCoincidence_2_1 = Sketch_2.setCoincident(SketchPoint_2_1.coordinates(), SketchLine_2_1.result()
[0]
)
-SketchConstraintCoincidence_2_2 = Sketch_2.setCoincident(SketchPoint_2_2.coordinates(), SketchLine_2_1.result()
[0]
)
+SketchConstraintCoincidence_2_1 = Sketch_2.setCoincident(SketchPoint_2_1.coordinates(), SketchLine_2_1.result())
+SketchConstraintCoincidence_2_2 = Sketch_2.setCoincident(SketchPoint_2_2.coordinates(), SketchLine_2_1.result())
Sketch_2.addSplit(SketchLine_2_1, SketchPoint_2_1.coordinates(), SketchPoint_2_2.coordinates())
model.do()
Sketch_2.addSplit(SketchLine_2_1, SketchPoint_2_1.coordinates(), SketchPoint_2_2.coordinates())
model.do()
@@
-50,8
+50,8
@@
for index in range(Sketch_2_feature.numberOfSubs()):
assert(idList.count(SketchLineId) == 3)
assert(idList.count(SketchPointId) == 2)
assert(idList.count(SketchLineId) == 3)
assert(idList.count(SketchPointId) == 2)
-assert(idList.count(SketchConstraintCoincidenceId) ==
4
)
-assert(idList.count(SketchConstraintParallelId) ==
2
)
+assert(idList.count(SketchConstraintCoincidenceId) ==
6
)
+assert(idList.count(SketchConstraintParallelId) ==
0
)
# Test end
# Test split on circle with two points
# Test end
# Test split on circle with two points
@@
-59,8
+59,8
@@
Sketch_3 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
SketchCircle_3_1 = Sketch_3.addCircle(50, 50, 50)
SketchPoint_3_1 = Sketch_3.addPoint(50, 0)
SketchPoint_3_2 = Sketch_3.addPoint(50, 100)
SketchCircle_3_1 = Sketch_3.addCircle(50, 50, 50)
SketchPoint_3_1 = Sketch_3.addPoint(50, 0)
SketchPoint_3_2 = Sketch_3.addPoint(50, 100)
-SketchConstraintCoincidence_3_1 = Sketch_3.setCoincident(SketchPoint_3_1.coordinates(), SketchCircle_3_1.result()[1])
-SketchConstraintCoincidence_3_2 = Sketch_3.setCoincident(SketchPoint_3_2.coordinates(), SketchCircle_3_1.result()[1])
+SketchConstraintCoincidence_3_1 = Sketch_3.setCoincident(SketchPoint_3_1.coordinates(), SketchCircle_3_1.result
s
()[1])
+SketchConstraintCoincidence_3_2 = Sketch_3.setCoincident(SketchPoint_3_2.coordinates(), SketchCircle_3_1.result
s
()[1])
Sketch_3.addSplit(SketchCircle_3_1, SketchPoint_3_1.coordinates(), SketchPoint_3_2.coordinates())
model.do()
Sketch_3.addSplit(SketchCircle_3_1, SketchPoint_3_1.coordinates(), SketchPoint_3_2.coordinates())
model.do()
@@
-71,8
+71,8
@@
for index in range(Sketch_3_feature.numberOfSubs()):
assert(idList.count(SketchArcId) == 2)
assert(idList.count(SketchPointId) == 2)
assert(idList.count(SketchArcId) == 2)
assert(idList.count(SketchPointId) == 2)
-assert(idList.count(SketchConstraintCoincidenceId) ==
2
)
-assert(idList.count(SketchConstraintTangentId) ==
1
)
+assert(idList.count(SketchConstraintCoincidenceId) ==
6
)
+assert(idList.count(SketchConstraintTangentId) ==
0
)
# Test end
# Test split on arc with one point
# Test end
# Test split on arc with one point
@@
-82,7
+82,7
@@
Sketch_4.setFixed(SketchArc_4_1.startPoint())
Sketch_4.setFixed(SketchArc_4_1.endPoint())
Sketch_4.setRadius(SketchArc_4_1, 50)
SketchPoint_4_1 = Sketch_4.addPoint(50, 100)
Sketch_4.setFixed(SketchArc_4_1.endPoint())
Sketch_4.setRadius(SketchArc_4_1, 50)
SketchPoint_4_1 = Sketch_4.addPoint(50, 100)
-SketchConstraintCoincidence_4_1 = Sketch_4.setCoincident(SketchPoint_4_1.coordinates(), SketchArc_4_1.result()[1])
+SketchConstraintCoincidence_4_1 = Sketch_4.setCoincident(SketchPoint_4_1.coordinates(), SketchArc_4_1.result
s
()[1])
Sketch_4.addSplit(SketchArc_4_1, SketchPoint_4_1.coordinates(), SketchArc_4_1.endPoint())
model.do()
Sketch_4.addSplit(SketchArc_4_1, SketchPoint_4_1.coordinates(), SketchArc_4_1.endPoint())
model.do()
@@
-93,23
+93,22
@@
for index in range(Sketch_4_feature.numberOfSubs()):
assert(idList.count(SketchArcId) == 2)
assert(idList.count(SketchPointId) == 1)
assert(idList.count(SketchArcId) == 2)
assert(idList.count(SketchPointId) == 1)
-assert(idList.count(SketchConstraintCoincidenceId) ==
2
)
-assert(idList.count(SketchConstraintEqualId) ==
1
)
-assert(idList.count(SketchConstraintTangentId) ==
1
)
+assert(idList.count(SketchConstraintCoincidenceId) ==
3
)
+assert(idList.count(SketchConstraintEqualId) ==
0
)
+assert(idList.count(SketchConstraintTangentId) ==
0
)
# Test end
# Test split on arc with two points
Sketch_5 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
# Test end
# Test split on arc with two points
Sketch_5 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
-#SketchArc_5_1 = Sketch_5.addArc(50, 50, 6.69872981078, 75, 93.30127018922, 75, True)
-SketchArc_5_1 = Sketch_5.addArc(50, 50, 0, 50, 93.30127018922, 75, True)
+SketchArc_5_1 = Sketch_5.addArc(50, 50, 93.30127018922, 75, 0, 50, False)
Sketch_5.setFixed(SketchArc_5_1.startPoint())
Sketch_5.setFixed(SketchArc_5_1.endPoint())
Sketch_5.setRadius(SketchArc_5_1, 50)
SketchLine_5_1 = Sketch_5.addLine(25, 93.301270189222, 75, 93.301270189222)
Sketch_5.setFixed(SketchArc_5_1.startPoint())
Sketch_5.setFixed(SketchArc_5_1.endPoint())
Sketch_5.setRadius(SketchArc_5_1, 50)
SketchLine_5_1 = Sketch_5.addLine(25, 93.301270189222, 75, 93.301270189222)
-SketchConstraintCoincidence_5_1 = Sketch_5.setCoincident(SketchLine_5_1.startPoint(), SketchArc_5_1.result()[1])
-SketchConstraintCoincidence_5_2 = Sketch_5.setCoincident(SketchLine_5_1.endPoint(), SketchArc_5_1.result()[1])
-SketchConstraintHorizontal_5_1 = Sketch_5.setHorizontal(SketchLine_5_1.result()
[0]
)
-SketchConstraintLength_5_1 = Sketch_5.setLength(SketchLine_5_1.result()
[0]
, 50)
+SketchConstraintCoincidence_5_1 = Sketch_5.setCoincident(SketchLine_5_1.startPoint(), SketchArc_5_1.result
s
()[1])
+SketchConstraintCoincidence_5_2 = Sketch_5.setCoincident(SketchLine_5_1.endPoint(), SketchArc_5_1.result
s
()[1])
+SketchConstraintHorizontal_5_1 = Sketch_5.setHorizontal(SketchLine_5_1.result())
+SketchConstraintLength_5_1 = Sketch_5.setLength(SketchLine_5_1.result(), 50)
Sketch_5.addSplit(SketchArc_5_1, SketchLine_5_1.startPoint(), SketchLine_5_1.endPoint())
model.do()
Sketch_5.addSplit(SketchArc_5_1, SketchLine_5_1.startPoint(), SketchLine_5_1.endPoint())
model.do()
@@
-120,11
+119,11
@@
for index in range(Sketch_5_feature.numberOfSubs()):
assert(idList.count(SketchArcId) == 3)
assert(idList.count(SketchPointId) == 0)
assert(idList.count(SketchArcId) == 3)
assert(idList.count(SketchPointId) == 0)
-assert(idList.count(SketchConstraintCoincidenceId) ==
4
)
-assert(idList.count(SketchConstraintEqualId) ==
2
)
-assert(idList.count(SketchConstraintTangentId) ==
2
)
+assert(idList.count(SketchConstraintCoincidenceId) ==
6
)
+assert(idList.count(SketchConstraintEqualId) ==
0
)
+assert(idList.count(SketchConstraintTangentId) ==
0
)
# Test end
model.end()
# Test end
model.end()
-
#
assert(model.checkPythonDump())
+assert(model.checkPythonDump())