diff --git a/rocolib/library/ServoMotor.py b/rocolib/library/ServoMotor.py index a3b88ca7fa79c819668fcf516946781da79dc49c..a4f2761937f9fc127b04d1383a7024c423b52312 100644 --- a/rocolib/library/ServoMotor.py +++ b/rocolib/library/ServoMotor.py @@ -4,7 +4,7 @@ from rocolib.api.ports import AnchorPort from rocolib.utils.utils import decorateGraph from rocolib.utils.dimensions import getDim from rocolib.utils.transforms import Translate, RotateZ -from rocolib.utils.numsym import dot +from rocolib.utils.numsym import dot, deg2rad class ServoMotor(FoldedComponent): @@ -22,7 +22,7 @@ class ServoMotor(FoldedComponent): f = Shape("horn", 0, 0) decorateGraph(f, Shape("hole", 1, 1)) 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__": ServoMotor.test() diff --git a/rocolib/library/SimpleUChannel.py b/rocolib/library/SimpleUChannel.py index 9f4a52b17abe81b851fedde03c509d178fd843a7..bd9abc23584b2c89a0dada86138cb4620d89a5e2 100644 --- a/rocolib/library/SimpleUChannel.py +++ b/rocolib/library/SimpleUChannel.py @@ -9,10 +9,10 @@ class SimpleUChannel(FoldedComponent): self.addParameter("width", 50, paramType="length") self.addParameter("depth", 20, paramType="length") - for i in range(3): - self.addEdgeInterface("topedge%d" % i, "r%d.e0" % i, ["depth", "width"][i % 2]) - self.addEdgeInterface("botedge%d" % i, "r%d.e2" % i, ["depth", "width"][i % 2]) - self.addFaceInterface("face%d" % i, "r%d" % i) + for i, nm in enumerate("lcr"): + self.addEdgeInterface(f"top{nm}edge", "r%d.e0" % i, ["depth", "width"][i % 2]) + self.addEdgeInterface(f"bot{nm}edge", "r%d.e2" % i, ["depth", "width"][i % 2]) + self.addFaceInterface(f"{nm}face", "r%d" % i) self.addEdgeInterface("ledge", "r0.e3", "length") self.addEdgeInterface("redge", "r2.e1", "length")