agx-openplx 0.15.1__cp39-cp39-macosx_12_0_arm64.whl → 0.15.2__cp39-cp39-macosx_12_0_arm64.whl

openplx/migrations.py

@@ -25,9 +25,8 @@ def migration(from_version: str, to_version: str, order: int = 0):
 
     return decorator
 
-
-@migration("0.9.2", "0.9.3")
-def snakecaseify_methods(documents):
+@migration("0.9.3", "0.10.0")
+def snakecaseify_methods_093(documents): # pylint: disable=too-many-statements
     ops = []
     ops.extend(RefactorToolkit.renameMethod(documents, "Math.Vec3.fromXYZ", "from_xyz"))
     ops.extend(
@@ -118,13 +117,6 @@ def snakecaseify_methods(documents):
     ops.extend(
         RefactorToolkit.renameMethod(documents, "Math.Line.fromPoints", "from_points")
     )
-
-    return [ReplaceOp(op) for op in ops]
-
-
-@migration("0.9.3", "0.10.0")
-def snakecaseify_methods_093(documents):
-    ops = []
     # ValueOutputSignal
     ops.extend(
         RefactorToolkit.renameMethod(
@@ -456,6 +448,180 @@ def rename_from_brick_to_openplx(document_path):
     return ChangeExtensionOp(Path(document_path), ".openplx")
 
 
+@migration("0.15.1", "0.15.2")
+def migrations_for_0_15_1(documents):
+    ops = []
+    ops.extend(
+        RefactorToolkit.renameModel(
+            documents,
+            "Robotics.Joints.TorqueDriveTrain",
+            "FlexibleJointDriveTrain",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameModel(
+            documents,
+            "Robotics.Joints.AngularVelocityDriveTrain",
+            "FlexibleJointDriveTrain",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.HingeAngularVelocityOutput",
+            "Physics.Signals",
+            "AngularVelocity1DOutput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.HingeAngularVelocityOutput.hinge", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "DriveTrain.Signals.TorqueMotorInput",
+            "Physics.Signals",
+            "Torque1DInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "DriveTrain.Signals.TorqueMotorInput.motor", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.LinearSpringPositionInput",
+            "Physics.Signals",
+            "Position1DInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.LinearSpringPositionInput.spring", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.TorsionSpringAngleInput",
+            "Physics.Signals",
+            "AngleInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.TorsionSpringAngleInput.spring", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.RigidBodyRPYOutput",
+            "Physics3D.Signals",
+            "RPYOutput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.RigidBodyRPYOutput.rigid_body", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.RigidBodyPositionOutput",
+            "Physics3D.Signals",
+            "Position3DOutput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.RigidBodyPositionOutput.rigid_body", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Interactions.VelocityMotor.desired_speed", "target_speed"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics1D.Interactions.VelocityMotor.desired_speed", "target_speed"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.RotationalVelocityMotorVelocityInput",
+            "Physics.Signals",
+            "AngularVelocity1DInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.RotationalVelocityMotorVelocityInput.motor", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics1D.Signals.RotationalVelocityMotor1DVelocityInput",
+            "Physics.Signals",
+            "AngularVelocity1DInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics1D.Signals.RotationalVelocityMotor1DVelocityInput.motor", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics3D.Signals.LinearVelocityMotorVelocityInput",
+            "Physics.Signals",
+            "LinearVelocity1DInput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics3D.Signals.LinearVelocityMotorVelocityInput.motor", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics1D.Signals.RotationalBodyAngularVelocityOutput",
+            "Physics.Signals",
+            "AngularVelocity1DOutput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics1D.Signals.RotationalBodyAngularVelocityOutput.body", "source"
+        )
+    )
+    ops.extend(
+        RefactorToolkit.moveAndRenameModel(
+            documents,
+            "Physics1D.Signals.RotationalBodyAngleOutput",
+            "Physics.Signals",
+            "AngleOutput",
+        )
+    )
+    ops.extend(
+        RefactorToolkit.renameAttribute(
+            documents, "Physics1D.Signals.RotationalBodyAngleOutput.body", "source"
+        )
+    )
+
+    return [ReplaceOp(op) for op in ops]
+
+
 def split_version(v):
     match = re.match(r"^(\d+)\.(\d+)\.(\d+)", v)
 

openplx/openplx_application.py

@@ -12,7 +12,7 @@ from openplxbundles import bundle_path
 # Import useful utilities to access the current simulation, graphics root and application
 from agxPythonModules.utils.environment import init_app, simulation, application, root
 
-from openplx import InputSignalListener, OutputSignalListener, OsgClickAdapter
+from openplx import InputSignalQueue, OutputSignalQueue, InputSignalListener, OutputSignalListener, OsgClickAdapter
 from openplx import load_from_file, OptParams, addVisuals, addDeformableVisualUpdaters, __version__, set_log_level, add_file_changed_listener
 from openplx.versionaction import VersionAction
 
@@ -72,7 +72,7 @@ class OpenPlxApplication:
 
         opt_params = OptParams()
         if args.modelname is not None:
-            opt_params.with_model_name(args.modelname)
+            opt_params = opt_params.with_model_name(args.modelname)
 
         result = load_from_file(simulation(), args.openplxfile if openplxfile is None else openplxfile, args.bundle_path, opt_params)
 
@@ -80,8 +80,10 @@ class OpenPlxApplication:
         openplx_scene = result.scene()
 
         # Add signal listeners so that signals are picked up from inputs
-        input_signal_listener = InputSignalListener(assembly)
-        output_signal_listener = OutputSignalListener(assembly, openplx_scene)
+        input_queue = InputSignalQueue.create()
+        output_queue = OutputSignalQueue.create()
+        input_signal_listener = InputSignalListener(assembly, input_queue)
+        output_signal_listener = OutputSignalListener(assembly, openplx_scene, output_queue)
 
         simulation().add(input_signal_listener, InputSignalListener.RECOMMENDED_PRIO)
         simulation().add(output_signal_listener, OutputSignalListener.RECOMMENDED_PRIO)
@@ -98,13 +100,14 @@ class OpenPlxApplication:
 
         if "enable_click" in args:
             click_adapter = globals()["click_adapter"]
-            click_adapter.add_listeners(application(), simulation(), args.click_addr, openplx_scene, output_signal_listener)
+            click_adapter.add_listeners(application(), simulation(), args.click_addr, openplx_scene,
+                                        input_queue, output_queue, output_signal_listener)
 
         if not addVisuals(result, root(), args.debug_render_frames):
             application().setEnableDebugRenderer(True)
         simulation().add(assembly.get())
         addDeformableVisualUpdaters(result, root())
-        return openplx_scene
+        return openplx_scene, input_queue, output_queue
 
     @staticmethod
     def ctrl_break_handler(_signum, _frame):

openplx/openplx_validate.py

@@ -20,11 +20,11 @@ def parse_args():
                         metavar="<bundle_path>", default=bundle_path())
     parser.add_argument("--debug-render-frames", action='store_true', help="enable rendering of frames for mate connectors and rigid bodies.")
     parser.add_argument("--loglevel", choices=["trace", "debug", "info", "warn", "error", "critical", "off"], help="Set log level", default="warn")
-    parser.add_argument("--modelname", help="The model to load (defaults to last model in file)", metavar="<name>", default="")
+    parser.add_argument("--modelname", help="The model to load (defaults to last model in file)", metavar="<name>", default=None)
     parser.add_argument("--version", help="Show version", action=VersionAction, nargs=0, default=SUPPRESS)
     return parser.parse_args()
 
-class AllowCtrlBreakListener(agxOSG.ExampleApplicationListener):
+class AllowCtrlBreakListener(agxOSG.ExampleApplicationListener): # pylint: disable=too-few-public-methods
     pass
 
 def validate():
@@ -37,7 +37,7 @@ def validate():
 
     opt_params = OptParams()
     if args.modelname is not None:
-        opt_params.with_model_name(args.modelname)
+        opt_params = opt_params.with_model_name(args.modelname)
 
     result = load_from_file(simulation, args.openplxfile, args.bundle_path, opt_params)
 

agx_openplx-0.15.1.dist-info/RECORD

@@ -1,41 +0,0 @@
-openplx/Core.py,sha256=8V0Y0pJANycjq8SpFEUmqb3cNiqQbFkRI8IagtcsMFE,270043
-openplx/DriveTrain.py,sha256=c7N8ivmXsfTeGnVSFaEM7-CzKpjOalZK7ZpQqxgjI1Y,418894
-openplx/Math.py,sha256=kTaoNjhQSmvVHmo1WV3z9GdjNvuzPSXFW6kd-UQpJAQ,188561
-openplx/Physics.py,sha256=A2TcVBtnpTh7WJjpRruH1Me70kTBKaIc2k0xCMZNtjs,1884436
-openplx/Physics1D.py,sha256=wix9M9SMRvmGSPrQyCKWdMM7IqdkkVI9Vi7eyrMrfIE,345906
-openplx/Physics3D.py,sha256=5YQwAXEAp-CMP8Ajqvj_QKgTj3Uvp7gWI9vyRsQ5D0A,2437851
-openplx/Robotics.py,sha256=NvqWJbCpk1jDZvJJVi0PijOwOpWZm2OZGZJ1_HegNj8,798979
-openplx/Simulation.py,sha256=mIuypCjz1O6c9_x4O_Ro6GLhOiXRzNlZlVjdgoGYq3U,46318
-openplx/Terrain.py,sha256=9CxizkDVf9UtPIyBumenXzfbxAL6yn2G_d0_ZWbv-JY,184884
-openplx/Urdf.py,sha256=JOryVyaFIROiyJ9V9OMrZAS3MoUwVmJW_2TTPSsRlH4,23780
-openplx/Vehicles.py,sha256=QmtdIawHlYcIRtJH4LotXSQNs06rCpxPl6e5gklUvWg,450074
-openplx/Visuals.py,sha256=lYBFzzPZvMeWaKzXQgzikmO-fuDshcgf5uCJJQ-WKTM,187052
-openplx/_AgxOpenPlxPyApi.cpython-39-darwin.so,sha256=Qtdjc8wXQ-e0mQ7O49zvAAowlQmUBwNIsS72qxXUIIg,12442370
-openplx/_CorePythonSwig.cpython-39-darwin.so,sha256=AC1Au-yZE8eefWcZh4iQ0Oq2LWExqJswpmOLl8T_5rM,3234113
-openplx/_DriveTrainSwig.cpython-39-darwin.so,sha256=S7K59t90bLKImeeDcs6pFN5dCryqv64tNesbnxHjQU4,6557505
-openplx/_MathSwig.cpython-39-darwin.so,sha256=sayquEba_a8Dz4oTlrHuTJW1NqeirzqeetLbHT4YO7g,2121771
-openplx/_Physics1DSwig.cpython-39-darwin.so,sha256=PJm_3eoDi4OuU6hp6FM_sDxrckT8Z0kP8pl9HjasHdM,4094304
-openplx/_Physics3DSwig.cpython-39-darwin.so,sha256=h7NsNvuDGXHtL0iVsJ_kbchUnfzmoKtrCgSLEa9i-AI,16812448
-openplx/_PhysicsSwig.cpython-39-darwin.so,sha256=V2snA_N-So-EKgROP1wTMP_FXwc3A3dgP-MMY_Xah_4,12399070
-openplx/_RoboticsSwig.cpython-39-darwin.so,sha256=qzsEP-XNczq2XByPFPnV7Ov_0qPwbB4nFss7fq5Sk-s,9431775
-openplx/_SimulationSwig.cpython-39-darwin.so,sha256=GLM3sAMVORYN_y4kMfW-sL5jkojHt-TNAyyd9-78Wm8,2310593
-openplx/_TerrainSwig.cpython-39-darwin.so,sha256=bWJ0k3fM4JtS3W09lOpExQlZetx7KTMcRXRDFX1KwNY,4833198
-openplx/_UrdfSwig.cpython-39-darwin.so,sha256=Uo_6kWz6hNJHI-a_oU0fbTYMvzjQkjcj-BA7mTO3FX8,3854011
-openplx/_VehiclesSwig.cpython-39-darwin.so,sha256=lRCt62LggLFZGR1oF4xSDRIvipX_ChivunOLrV4TPCY,6575247
-openplx/_VisualsSwig.cpython-39-darwin.so,sha256=n4R9qwQ6Y3f_1QkzJHW-8tFZgi9oilF7kOSYo5milEA,2249374
-openplx/__init__.py,sha256=q3hkfn5aNgyXksGZjKomJ2t1pPGNkIiHWSPBEbMadVI,2050
-openplx/agxtoopenplx.py,sha256=gxQgZ_Pgda_5scCCBBhyu8D-jjL1yxlE7bZLtxigKCs,2422
-openplx/anytoopenplx.py,sha256=qAZVnelFOVAQIpCQt3y9LlfCBHQcNmxUWXFbCZuNQUc,2274
-openplx/api.py,sha256=05ECQBudlYfrMh1OgAYbq8VDsj_UlZKlPxx31RGnES0,46915
-openplx/migrate.py,sha256=bPnhmYv22k52bQf_H34IvW89Ep3ekziiEhJPPZOJemQ,6431
-openplx/migration_hint.py,sha256=2Xs2OB_HikmiynDAk4xHKhmU5N4pqOnPFPpeIWhK37Y,603
-openplx/migrations.py,sha256=bvz7ZTUwQ-_84UEPf20TmGaZuZTtWFO93R3Slv1leGQ,15591
-openplx/openplx_application.py,sha256=ZJFq2RgfW01IhE4o0qoEMPuwYIc6W6gYqnowcJWTdSA,6401
-openplx/openplx_serialize.py,sha256=Uul2-6_BwyJzg26JdgAz2MjR37mQJ6kWKjPbmE-sJzk,1456
-openplx/openplx_validate.py,sha256=pqBg9WBh7OUi63dOmmCpDWt_jTn8OhCSmtgL-nmb1XY,2055
-openplx/openplx_view.py,sha256=GCFQSl4W-dPRWL0qLQmfJ69OEwgTMKL05J62YyKSb64,351
-openplx/versionaction.py,sha256=Obj_q69dn5GnFMZs2as87ZScPMLaLAduPppmXUzLB6I,283
-agx_openplx-0.15.1.dist-info/METADATA,sha256=HMmjVYcn7l1cUbXgnS1xEGk9-PD-CyXB8Z7kyECu-QE,2077
-agx_openplx-0.15.1.dist-info/WHEEL,sha256=O5AT1Qb1jPpISLjIwxiRxhUaN9TX1BFXuc9iRVvoPmk,104
-agx_openplx-0.15.1.dist-info/entry_points.txt,sha256=IyHBVBNuH_4ZhfWnB1ZVXYtpKG_QT7dwGIUMLWdyhrc,263
-agx_openplx-0.15.1.dist-info/RECORD,,