Skip to content
Snippets Groups Projects
Commit ac592dea authored by mehtank's avatar mehtank
Browse files

Merge branch 'componentfixes' into 'v0.4'

Componentfixes

See merge request mehtank/rocolib!5
parents e5a52765 fa886c0b
Branches
Tags
1 merge request!34V0.4
...@@ -4,7 +4,7 @@ from rocolib.api.ports import AnchorPort ...@@ -4,7 +4,7 @@ from rocolib.api.ports import AnchorPort
from rocolib.utils.utils import decorateGraph from rocolib.utils.utils import decorateGraph
from rocolib.utils.dimensions import getDim from rocolib.utils.dimensions import getDim
from rocolib.utils.transforms import Translate, RotateZ from rocolib.utils.transforms import Translate, RotateZ
from rocolib.utils.numsym import dot from rocolib.utils.numsym import dot, deg2rad
class ServoMotor(FoldedComponent): class ServoMotor(FoldedComponent):
...@@ -22,7 +22,7 @@ class ServoMotor(FoldedComponent): ...@@ -22,7 +22,7 @@ class ServoMotor(FoldedComponent):
f = Shape("horn", 0, 0) f = Shape("horn", 0, 0)
decorateGraph(f, Shape("hole", 1, 1)) decorateGraph(f, Shape("hole", 1, 1))
self.addFace(f) self.addFace(f)
self.setInterface("mount", AnchorPort(self, self.getGraph(), "horn", dot(RotateZ(self.p.angle), Translate([0,-dy,dz])))) self.setInterface("mount", AnchorPort(self, self.getGraph(), "horn", dot(RotateZ(deg2rad(self.p.angle)), Translate([0,-dy,dz]))))
if __name__ == "__main__": if __name__ == "__main__":
ServoMotor.test() ServoMotor.test()
...@@ -9,10 +9,10 @@ class SimpleUChannel(FoldedComponent): ...@@ -9,10 +9,10 @@ class SimpleUChannel(FoldedComponent):
self.addParameter("width", 50, paramType="length") self.addParameter("width", 50, paramType="length")
self.addParameter("depth", 20, paramType="length") self.addParameter("depth", 20, paramType="length")
for i in range(3): for i, nm in enumerate("lcr"):
self.addEdgeInterface("topedge%d" % i, "r%d.e0" % i, ["depth", "width"][i % 2]) self.addEdgeInterface(f"top{nm}edge", "r%d.e0" % i, ["depth", "width"][i % 2])
self.addEdgeInterface("botedge%d" % i, "r%d.e2" % i, ["depth", "width"][i % 2]) self.addEdgeInterface(f"bot{nm}edge", "r%d.e2" % i, ["depth", "width"][i % 2])
self.addFaceInterface("face%d" % i, "r%d" % i) self.addFaceInterface(f"{nm}face", "r%d" % i)
self.addEdgeInterface("ledge", "r0.e3", "length") self.addEdgeInterface("ledge", "r0.e3", "length")
self.addEdgeInterface("redge", "r2.e1", "length") self.addEdgeInterface("redge", "r2.e1", "length")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment