Skip to content

Commit

Permalink
Change planner type arg
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzalocasas committed Jun 20, 2024
1 parent c6ef2c0 commit 59107e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Changed the behavior of Duration class when accepting both seconds (float) and nanoseconds (int) where the decimal point of seconds and the nanoseconds add up to more than 1 second.
* Changed GH Component `ConstraintsFromPlane` to `FrameTargetFromPlane`.
* Changed GH Component `ConstraintsFromTargetConfiguration` to `ConfigurationTarget`.
* Changed `RosClient` constructor to take a type for planner backend instead of a string. This also changes the name of the argument from `planner_backend` to `planner_backend_type`.

### Removed

Expand Down
14 changes: 5 additions & 9 deletions src/compas_fab/backends/ros/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
"RosClient",
]

PLANNER_BACKENDS = {"moveit": MoveItPlanner}


class CancellableRosActionResult(CancellableFutureResult):
def __init__(self, goal):
Expand Down Expand Up @@ -116,10 +114,10 @@ class RosClient(Ros, ClientInterface):
Port of the ROS Bridge. Defaults to ``9090``.
is_secure : :obj:`bool`
``True`` to indicate it should use a secure web socket, otherwise ``False``.
planner_backend: str
Name of the planner backend plugin to use. The plugin must be a sub-class of
:class:`compas_fab.backends.PlannerInterface`. Defaults to ``"moveit"``,
making use of :class:`compas_fab.backends.MoveItPlanner`.
planner_backend_type: type
Type the planner backend plugin to use. The plugin must be a sub-class of
:class:`compas_fab.backends.PlannerInterface`.
Defaults to :class:`~compas_fab.backends.MoveItPlanner`.
Examples
--------
Expand All @@ -132,10 +130,8 @@ class RosClient(Ros, ClientInterface):
For more examples, check out the :ref:`ROS examples page <ros_examples>`.
"""

def __init__(self, host="localhost", port=9090, is_secure=False, planner_backend="moveit"):
def __init__(self, host="localhost", port=9090, is_secure=False, planner_backend_type=MoveItPlanner):
super(RosClient, self).__init__(host, port, is_secure)

planner_backend_type = PLANNER_BACKENDS[planner_backend]
self.planner = planner_backend_type(self)
self._ros_distro = None

Expand Down

0 comments on commit 59107e6

Please sign in to comment.