From dcdef113e22f1d580e4ec803a799923edaae4b3c Mon Sep 17 00:00:00 2001
From: pjil27 <jillpantigcs@gmail.com>
Date: Tue, 3 Aug 2021 10:22:31 -0700
Subject: [PATCH] Deleting FourWheelCar.py to remove error "Keyword:fright"
plus only printing the tank top on Tank.yaml
---
rocolib/builders/TankBuilder.py | 31 +++++-----
rocolib/library/Tank.yaml | 106 +-------------------------------
rocolib/library/Trapezoid.py | 3 +-
3 files changed, 21 insertions(+), 119 deletions(-)
diff --git a/rocolib/builders/TankBuilder.py b/rocolib/builders/TankBuilder.py
index 101d2fa..5485044 100644
--- a/rocolib/builders/TankBuilder.py
+++ b/rocolib/builders/TankBuilder.py
@@ -2,22 +2,23 @@ from rocolib.api.components.Component import Component
c = Component()
-c.addSubcomponent("tankskeleton", "FourWheelCar", inherit=True, prefix=None)
-c.addSubcomponent("tophole", "Cutout")
-
-#Connecting tank top
+#Just printing the top of the car
+# c.addSubcomponent("tankskeleton", "FourWheelCar", inherit=True, prefix=None)
+# c.addSubcomponent("tophole", "Cutout")
+#
+# #Connecting tank top
c.addSubcomponent("tanktop", "TankTop", inherit=True, prefix=None)
-c.addSubcomponent("support0", "Rectangle")
-c.addSubcomponent("split0", "SplitEdge")
-
-c.addConstraint(("split0", "toplength"), "width", "(x,)")
-c.addConstraint(("split0", "botlength"), "width", "(float((x - 30)/2.), float(x - (x - 30)), float((x - 30)/2.))")
-c.addConstraint(("support0", "w"),"width", "float(x - (x - 30))")
-c.addConstraint(("support0", "l"), "length", "x*1.5")
-
-c.addConnection(("tankskeleton", "sheath1.topedge0"), ("split0", "topedge0"))
-c.addConnection(("split0", "botedge1"), ("support0", "l"), angle=180)
-c.addConnection(("support0", "r"), ("tanktop", "backedge"), angle=90)
+# c.addSubcomponent("support0", "Rectangle")
+# c.addSubcomponent("split0", "SplitEdge")
+#
+# c.addConstraint(("split0", "toplength"), "width", "(x,)")
+# c.addConstraint(("split0", "botlength"), "width", "(float((x - 30)/2.), float(x - (x - 30)), float((x - 30)/2.))")
+# c.addConstraint(("support0", "w"),"width", "float(x - (x - 30))")
+# c.addConstraint(("support0", "l"), "length", "x*1.5")
+#
+# c.addConnection(("tankskeleton", "sheath1.topedge0"), ("split0", "topedge0"))
+# c.addConnection(("split0", "botedge1"), ("support0", "l"), angle=180)
+# c.addConnection(("support0", "r"), ("tanktop", "backedge"), angle=90)
#Attaching the side designs
c.addSubcomponent("side0", "TankSide")
diff --git a/rocolib/library/Tank.yaml b/rocolib/library/Tank.yaml
index af23666..e29268b 100644
--- a/rocolib/library/Tank.yaml
+++ b/rocolib/library/Tank.yaml
@@ -1,41 +1,23 @@
connections:
connection0:
- - - tankskeleton
- - sheath1.topedge0
- - - split0
- - topedge0
- - {}
- connection1:
- - - split0
- - botedge1
- - - support0
- - l
- - angle: 180
- connection2:
- - - support0
- - r
- - - tanktop
- - backedge
- - angle: 90
- connection3:
- - tanktop
- ledge
- - support1
- topedge
- angle: -90
- connection4:
+ connection1:
- - tanktop
- redge
- - support2
- topedge
- angle: -90
- connection5:
+ connection2:
- - side0
- sideedge
- - support1
- botedge
- {}
- connection6:
+ connection3:
- - side1
- sideedge
- - support2
@@ -50,40 +32,6 @@ parameters:
minValue: 0
units: degrees
valueType: (float, int)
- brains:
- defaultValue: esp32stack
- spec:
- valueType: str
- bright.angle:
- defaultValue: 0
- spec:
- maxValue: null
- minValue: null
- units: degrees
- valueType: (float, int)
- driveservo:
- defaultValue: fs90r
- spec:
- valueType: str
- fleft.angle:
- defaultValue: 0
- spec:
- maxValue: null
- minValue: null
- units: degrees
- valueType: (float, int)
- height:
- defaultValue: 36
- spec:
- minValue: 36
- units: mm
- valueType: (float, int)
- length:
- defaultValue: 60
- spec:
- minValue: 60
- units: mm
- valueType: (float, int)
tangle:
defaultValue: 45
spec:
@@ -109,12 +57,6 @@ parameters:
minValue: 0
units: mm
valueType: (float, int)
- width:
- defaultValue: 72
- spec:
- minValue: 72
- units: mm
- valueType: (float, int)
source: ..\builders\TankBuilder.py
subcomponents:
side0:
@@ -131,26 +73,6 @@ subcomponents:
length:
function: x*2
parameter: length
- split0:
- classname: SplitEdge
- kwargs: {}
- parameters:
- botlength:
- function: (float((x - 30)/2.), float(x - (x - 30)), float((x - 30)/2.))
- parameter: width
- toplength:
- function: (x,)
- parameter: width
- support0:
- classname: Rectangle
- kwargs: {}
- parameters:
- l:
- function: x*1.5
- parameter: length
- w:
- function: float(x - (x - 30))
- parameter: width
support1:
classname: Trapezoid
kwargs: {}
@@ -181,24 +103,6 @@ subcomponents:
parameter: *id002
width:
parameter: toplength
- tankskeleton:
- classname: FourWheelCar
- kwargs: {}
- parameters:
- brains:
- parameter: brains
- bright.angle:
- parameter: bright.angle
- driveservo:
- parameter: driveservo
- fleft.angle:
- parameter: fleft.angle
- height:
- parameter: height
- length:
- parameter: length
- width:
- parameter: width
tanktop:
classname: TankTop
kwargs: {}
@@ -213,7 +117,3 @@ subcomponents:
parameter: toplength
topwidth:
parameter: topwidth
- tophole:
- classname: Cutout
- kwargs: {}
- parameters: {}
diff --git a/rocolib/library/Trapezoid.py b/rocolib/library/Trapezoid.py
index e96f668..c4b6983 100644
--- a/rocolib/library/Trapezoid.py
+++ b/rocolib/library/Trapezoid.py
@@ -10,8 +10,9 @@ class Trapezoid(FoldedComponent):
self.addParameter("width", 50, paramType="length")
self.addParameter("depth", 20, paramType="length")
self.addParameter("bangle", 45, paramType="angle", minValue=1)
- self.addParameter("side", self.getSubCParameter("depth") * np.sqrt(2.), paramType="length")
+ self.addParameter("side", 10, paramType="length")
+ #float(self.getParameter("depth") * np.sqrt(2.))
self.addEdgeInterface("topedge", "r0.e2", "width")
self.addEdgeInterface("ledge", "r0.e1", "side")
self.addEdgeInterface("redge", "r0.e3", "side")
--
GitLab