From 6ee6e4bf8cc52ea88d063520f025d8fd96edff3e Mon Sep 17 00:00:00 2001 From: mehtank <mehtank> Date: Tue, 20 Sep 2022 10:26:50 -0700 Subject: [PATCH] restore Component.toLibrary function call --- rocolib/api/components/Component.py | 5 ++++- rocolib/builders/ESPSegBuilder.py | 3 +-- rocolib/builders/MountedBrainsBuilder.py | 3 +-- rocolib/builders/MountedServoBuilder.py | 3 +-- rocolib/builders/PaperbotBuilder.py | 3 +-- rocolib/builders/ServoMountBuilder.py | 3 +-- rocolib/builders/WheelBuilder.py | 3 +-- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/rocolib/api/components/Component.py b/rocolib/api/components/Component.py index 9776246..4b34101 100644 --- a/rocolib/api/components/Component.py +++ b/rocolib/api/components/Component.py @@ -13,7 +13,7 @@ from rocolib.api.Function import YamlFunction from rocolib.utils.utils import prefix as prefixString from rocolib.utils.utils import tryImport from rocolib.utils.nx2go import GraphVisualization as gv -from rocolib.library import getComponent +from rocolib.library import getComponent, save from dash import html, dcc @@ -60,6 +60,9 @@ class Component(Parameterized): self.predefine() self.define() + def toLibrary(self, lib=None): + save(self, lib) + def fromYaml(self, filename): with open(filename, 'r') as fd: definition = yaml.safe_load(fd) diff --git a/rocolib/builders/ESPSegBuilder.py b/rocolib/builders/ESPSegBuilder.py index f7899bc..ee7f796 100644 --- a/rocolib/builders/ESPSegBuilder.py +++ b/rocolib/builders/ESPSegBuilder.py @@ -1,6 +1,5 @@ from rocolib.library import getComponent from rocolib.api.components.Component import newComponent -from rocolib.library import save from rocolib.api.Function import Function c = newComponent("ESPSeg") @@ -116,4 +115,4 @@ c.addConnection(("left", "face0"), c.addConnection(("brain", "face1"), ("sheath", "face1"), copyDecorations=True, transform=False) -save(c, True) +c.toLibrary(True) diff --git a/rocolib/builders/MountedBrainsBuilder.py b/rocolib/builders/MountedBrainsBuilder.py index 5983744..b6d3513 100644 --- a/rocolib/builders/MountedBrainsBuilder.py +++ b/rocolib/builders/MountedBrainsBuilder.py @@ -1,5 +1,4 @@ from rocolib.api.components.Component import newComponent -from rocolib.library import save from rocolib.api.Function import Function @@ -27,4 +26,4 @@ c.addConnection(("beam", "face1"), c.inheritAllInterfaces("beam", prefix=None) -save(c, True) +c.toLibrary(True) diff --git a/rocolib/builders/MountedServoBuilder.py b/rocolib/builders/MountedServoBuilder.py index 82e784d..f373a67 100644 --- a/rocolib/builders/MountedServoBuilder.py +++ b/rocolib/builders/MountedServoBuilder.py @@ -1,5 +1,4 @@ from rocolib.api.components.Component import newComponent -from rocolib.library import save from rocolib.api.Function import Function c = newComponent("MountedServo") @@ -12,4 +11,4 @@ c.inheritAllInterfaces("servo", prefix=None) c.addConnection(("mount", "mount.decoration"), ("servo", "mount")) -save(c, True) +c.toLibrary(True) diff --git a/rocolib/builders/PaperbotBuilder.py b/rocolib/builders/PaperbotBuilder.py index 85e9f6c..490242a 100644 --- a/rocolib/builders/PaperbotBuilder.py +++ b/rocolib/builders/PaperbotBuilder.py @@ -1,5 +1,4 @@ from rocolib.api.components.Component import newComponent -from rocolib.library import save c = newComponent("Paperbot") @@ -9,4 +8,4 @@ c.addParameter("height", 25, paramType="length", minValue=20) c.addSubcomponent("paperbot", "ESPSeg", inherit="length width height battery tire_thickness".split(), prefix=None) -save(c, True) +c.toLibrary(True) diff --git a/rocolib/builders/ServoMountBuilder.py b/rocolib/builders/ServoMountBuilder.py index 6bce1cc..0ccd12c 100644 --- a/rocolib/builders/ServoMountBuilder.py +++ b/rocolib/builders/ServoMountBuilder.py @@ -1,6 +1,5 @@ from rocolib.library import getComponent from rocolib.api.components.Component import newComponent -from rocolib.library import save from rocolib.api.Function import Function c = newComponent("ServoMount") @@ -29,4 +28,4 @@ c.addConnection(("beam", "face0"), ("mount", "decoration"), mode="hole", offset=Function(params="offset")) -save(c, True) +c.toLibrary(True) diff --git a/rocolib/builders/WheelBuilder.py b/rocolib/builders/WheelBuilder.py index e735fd0..b5dfa34 100644 --- a/rocolib/builders/WheelBuilder.py +++ b/rocolib/builders/WheelBuilder.py @@ -1,5 +1,4 @@ from rocolib.api.components.Component import newComponent -from rocolib.library import save from rocolib.api.Function import Function c = newComponent("Wheel") @@ -12,4 +11,4 @@ c.inheritAllInterfaces("drive", prefix=None) c.addConnection(("drive", "horn"), ("tire", "face"), copyDecorations=True) -save(c, True) +c.toLibrary(True) -- GitLab