agx-openplx 0.15.1__cp39-cp39-win_amd64.whl → 0.15.2__cp39-cp39-win_amd64.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/__init__.py,sha256=EArbIZbutmQl-IsSwvqFrSTNqL6iEDk6jWWdBg00450,2101
-openplx/_AgxOpenPlxPyApi.cp39-win_amd64.pyd,sha256=xbUJXePkmnp-ItdI8Dl5LyoEulL0804hAbIb9ykSq4k,6322176
-openplx/_CorePythonSwig.cp39-win_amd64.pyd,sha256=h_EAH2osNZN5YzbnPm3FpnkEqOM2MxwbjnoFZFU23vI,2550272
-openplx/_DriveTrainSwig.cp39-win_amd64.pyd,sha256=IRxecez-v6HtPEJDWJ0rb0nTM8K3wqZny-solEy5JGI,2826752
-openplx/_MathSwig.cp39-win_amd64.pyd,sha256=Urn4mLjI-nFswhUpJohfJ3JrhZOKtkGv9KR61yHrqWU,1313792
-openplx/_Physics1DSwig.cp39-win_amd64.pyd,sha256=7IIjG5aLSMqzJLrPd5pG3ibL6duvZnBqrvRE5HoOGQc,2173440
-openplx/_Physics3DSwig.cp39-win_amd64.pyd,sha256=xY4wZkd276KHG1eQLIQ8rceRihxH4U86xkaXM9rZNa4,12642816
-openplx/_PhysicsSwig.cp39-win_amd64.pyd,sha256=o2LNHB9jTvbDKSyMK7wtrl49zyFMItR1jqYFeLgzqPY,9691136
-openplx/_RoboticsSwig.cp39-win_amd64.pyd,sha256=rLb3fFgjgwE17FMiWv1L5yPRa7XrQjwVyHtpdtUu2no,5177344
-openplx/_SimulationSwig.cp39-win_amd64.pyd,sha256=kOi89KwrKL2hnxE7q0UiQtnqAKAFJSvb-mo56VYjXCk,632320
-openplx/_TerrainSwig.cp39-win_amd64.pyd,sha256=7_K9gTcwGtXMfbcJ25IU5KU41vhYJlvH1WUPhTvLtKQ,1536512
-openplx/_UrdfSwig.cp39-win_amd64.pyd,sha256=tvi-k7CsI9VU0mrm0Pdu2s4JHepCd-WCejMVoXQ32LU,698368
-openplx/_VehiclesSwig.cp39-win_amd64.pyd,sha256=F4kayBXSVXaVWsGmuAf4Q1z3UMNdzxYWyJSLhhdUglo,3124224
-openplx/_VisualsSwig.cp39-win_amd64.pyd,sha256=8gGQkFBvL9Gnp2-hf59Rv8bWsIkAnkNACPkWkRxpPis,1281024
-openplx/agxtoopenplx.py,sha256=LCt_tm9tffb0aA5ZsVAqvD1w276NKuq2MQ9vOZS1V1I,2477
-openplx/anytoopenplx.py,sha256=ckINLkHMyraBaIhdJfVXcaeVNh6m7BnyEx9or3j7mxo,2318
-openplx/api.py,sha256=XoU3a-t2bNxO71FeBpuGgENsVaR14DrlPpkCE4cJRn8,48252
-openplx/Core.py,sha256=lQcUoerxSC-TjMSjdNFWGjnQ1eQKVpFJhGl0sTlPkE0,277824
-openplx/DriveTrain.py,sha256=e3ntEsPnXXhw3LWqNsP78A5aZaMNwd_jDa9cjShmP_g,427468
-openplx/Math.py,sha256=hi3zI0KfxZNqy8u78nEm55bZGo0ZoWgqA8piOE2e2B8,193933
-openplx/migrate.py,sha256=3kupvPeccEGwoBxWEoLH4a-tkcl7fXaGKkVgYSfccJI,6587
-openplx/migration_hint.py,sha256=JiD5f7DzCVNoN-N_VweRNIKnSmCRqxhRof4QiR-1rEs,617
-openplx/migrations.py,sha256=KY1fIEwI6mgcw6ZHj-pJepzHHJj-R6xds68uIBs_RpE,16128
-openplx/openplx_application.py,sha256=mVyv19mh18OqoqWdh15ouWFIDezr2IGLyn_dQRNfFrc,6536
-openplx/openplx_serialize.py,sha256=0_hKFnBP8IQ4f22vW6RLHRRNxUZVSu21Lcrgy6lbqPc,1491
-openplx/openplx_validate.py,sha256=PgbC1K0OzKC2rknUtqYWXyCca5TKnZdpkg_ZresGvOY,2112
-openplx/openplx_view.py,sha256=Rmg2uWhaDQ4WMEsKlDTcMBSoPIFDNXXZzN7ytFU9ZgQ,365
-openplx/Physics.py,sha256=uoxRlbDAfIJ-uWtAo3W33VXuv_79ZHco4Nw4KEj6Rl8,1920631
-openplx/Physics1D.py,sha256=zumBcg-GGIW39BXkywKVldM3FtSWhUFX2aLbZFHRahU,352638
-openplx/Physics3D.py,sha256=Zu70VSG1gbmnvageGT07xIQXXMmNvuICkCfpM0e_Y8I,2480375
-openplx/Robotics.py,sha256=gaq0xM3ZuhvIINeoKP14xENZqTw_B5px_gh40-m-_mI,814741
-openplx/Simulation.py,sha256=xab3Q6-d90xNuPk--zjTB-XO8BNEv48equ_Ms48PLf8,47374
-openplx/Terrain.py,sha256=RhhE6CboZ88n5CbHlyhLzG78vwpjY1sViGgpg7HHuyU,188775
-openplx/Urdf.py,sha256=Z9Q5dKrSPIEgXS9JE7cYKl4zgkhbrdlmV3vBcORE0KY,24434
-openplx/Vehicles.py,sha256=ljYCuwGfA-qqQywHdcI530mIzqIq1DNgb1_d2Jmo5_4,458867
-openplx/versionaction.py,sha256=u0rZ34x1-KtLHM93OBN2BsFAxEAv6HDLadvu14en5io,294
-openplx/Visuals.py,sha256=xTDmvGIxyJPWSgH20CWwQRPDHwOFp48nBl8fo8sN0JY,190953
-agx_openplx-0.15.1.dist-info/entry_points.txt,sha256=IyHBVBNuH_4ZhfWnB1ZVXYtpKG_QT7dwGIUMLWdyhrc,263
-agx_openplx-0.15.1.dist-info/METADATA,sha256=dvmCfwyGWb7uK73YK3cGxhw-4__IGcZAB1_fqTicaFY,2128
-agx_openplx-0.15.1.dist-info/WHEEL,sha256=T7hzPzFWHJiWCVylm2UCj5payilA7ulisMC0IiBEe3o,96
-agx_openplx-0.15.1.dist-info/RECORD,,