Skip to content

Commit e7f4a23

Browse files
committed
Merge branch 'master' of github.com:gramaziokohler/compas_fab into rhino-installer-plugin
2 parents 6bf56ad + 7f82500 commit e7f4a23

39 files changed

+755
-239
lines changed

.github/workflows/ironpython.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: Setting IronPython path
18-
run: echo "::set-env name=IRONPYTHONPATH::$env:GITHUB_WORKSPACE/src"
18+
run: echo "IRONPYTHONPATH=$GITHUB_WORKSPACE/src" >> $GITHUB_ENV
1919
- name: Install dependencies
2020
run: |
21+
echo IRONPYTHONPATH=$IRONPYTHONPATH
2122
choco install ironpython --version=2.7.8.1
2223
ipy -X:Frames -m ensurepip
2324
ipy -X:Frames -m pip install --no-deps compas roslibpy
2425
ipy -X:Frames -m pip install ironpython-pytest
2526
- name: Run tests
2627
run: |
27-
ipy tests/ipy_test_runner.py
28+
ipy tests/ipy_test_runner.py

CHANGELOG.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ Unreleased
1717
* Added ``ClientInterface``, ``PlannerInterface`` and various backend feature interfaces
1818
* Added implementations of these interfaces for ROS and V-REP
1919
* Added ``attributes`` dictionary to ``Robot`` class
20+
* Added ``compas_fab.robots.Tool.from_t0cf_to_tcf``
21+
* Added ``compas_fab.robots.Tool.from_tcf_to_t0cf``
22+
* Added ```joint_names`` as optional parameter for all ``compas_fab.robots.Configuration`` constructors
23+
* Added ``compas_fab.robots.Configuration.iter_differences``
24+
* Added ``compas_fab.robots.Configuration.max_difference``
25+
* Added ``compas_fab.robots.Configuration.close_to``
26+
* Added ``compas_fab.robots.Configuration.merge``
27+
* Added ``compas_fab.robots.JointTrajectoryPoint.merge``
28+
* Added ``compas_fab.robots.Semantics.group_states``
2029

2130
**Changed**
2231

@@ -28,6 +37,11 @@ Unreleased
2837
* The signatures of all kinematics, motion planning and planning scene management methods have been homogenized across backend clients and within ``Robot``
2938
* All examples have been updated to reflect these changes
3039
* The installer to Rhino has been unified with COMPAS core. Now running ``python -m compas_rhino.install`` will also detect and install COMPAS FAB and its dependencies.
40+
* Renamed all ``RobotArtist`` implementations to ``RobotModelArtist`` to reflect
41+
the fact they depend on ``compas.robots.RobotModel``.
42+
* Renamed ``compas_fab.robots.Robot.from_tool0_to_attached_tool`` to ``compas_fab.robots.Robot.from_t0cf_to_tcf``
43+
* Renamed ``compas_fab.robots.Robot.from_attached_tool_to_tool0`` to ``compas_fab.robots.Robot.from_tcf_to_t0cf``
44+
* Changed ROS planning scene methods to be synchronous.
3145

3246

3347
**Fixed**
@@ -39,6 +53,7 @@ Unreleased
3953
* The methods ``forward_kinematics``, ``inverse_kinematics``, ``plan_cartesian_motion`` and ``plan_motion``
4054
of ``Robot`` class have been refactored, but a backwards-compatible deprecated version with the old
4155
signatures still exists suffixed by ``_deprecated``, e.g. ``forward_kinematics_deprecated``.
56+
* ``RobotArtist`` are deprecated in favor of ``RobotModelArtist``.
4257

4358
**Removed**
4459

conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
def pytest_configure(config):
2+
from twisted.internet import selectreactor
3+
selectreactor.install()

docs/examples/02_description_models/02_robot.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ separated from the specific CAD interfaces, while providing a way to leverage
6464
native performance of the CAD environment.
6565

6666
In the main library there are artists for various datastructures (meshes,
67-
networks, etc), and **COMPAS FAB** adds a ``RobotArtist`` to them.
67+
networks, etc), and **COMPAS FAB** adds a ``RobotModelArtist`` to them.
6868
Robot artists allow visualizing robot models easily and efficiently.
6969

7070
The following example illustrates how to load an entire robot model from

docs/examples/02_description_models/files/02_robot_artist_blender.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
compas.PRECISION = '12f'
33

44
from compas.robots import *
5-
from compas_fab.blender import RobotArtist
5+
from compas_fab.blender import RobotModelArtist
66

77
r = 'ros-industrial/abb'
88
p = 'abb_irb6600_support'
@@ -11,7 +11,7 @@
1111
github = GithubPackageMeshLoader(r, p, b)
1212
urdf = github.load_urdf('irb6640.urdf')
1313

14-
robot = RobotModel.from_urdf_file(urdf)
15-
robot.load_geometry(github)
14+
model = RobotModel.from_urdf_file(urdf)
15+
model.load_geometry(github)
1616

17-
RobotArtist(robot).draw_visual()
17+
RobotModelArtist(model).draw_visual()

docs/examples/02_description_models/files/02_robot_artist_grasshopper.ghx

Lines changed: 32 additions & 40 deletions
Large diffs are not rendered by default.

docs/examples/02_description_models/files/02_robot_artist_rhino.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
compas.PRECISION = '12f'
33

44
from compas.robots import *
5-
from compas_fab.rhino import RobotArtist
5+
from compas_fab.rhino import RobotModelArtist
66

77
r = 'ros-industrial/abb'
88
p = 'abb_irb6600_support'
@@ -14,4 +14,4 @@
1414
robot = RobotModel.from_urdf_file(urdf)
1515
robot.load_geometry(github)
1616

17-
RobotArtist(robot).draw_visual()
17+
RobotModelArtist(robot).draw_visual()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import compas
22
from compas_fab.backends import RosClient
3-
from compas_fab.rhino import RobotArtist
3+
from compas_fab.rhino import RobotModelArtist
44

55
# Set high precision to import meshes defined in meters
66
compas.PRECISION = '12f'
@@ -10,6 +10,6 @@
1010
robot = ros.load_robot(load_geometry=True)
1111

1212
# Visualize robot
13-
robot.artist = RobotArtist(robot.model, layer='COMPAS FAB::Example')
13+
robot.artist = RobotModelArtist(robot.model, layer='COMPAS FAB::Example')
1414
robot.artist.clear_layer()
1515
robot.artist.draw_visual()

docs/examples/03_backends_ros/files/04_add_collision_mesh.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
cm = CollisionMesh(mesh, 'floor')
1717
scene.add_collision_mesh(cm)
1818

19+
# sleep a bit before removing the floor
1920
time.sleep(1)
20-
scene.remove_collision_mesh('floor')
2121

22-
# sleep a bit before terminating the client
23-
time.sleep(1)
22+
scene.remove_collision_mesh('floor')

docs/examples/03_backends_ros/files/04_append_collision_meshes.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323
scene.append_collision_mesh(cm)
2424

25+
# sleep a bit before removing the bricks
2526
time.sleep(1)
26-
scene.remove_collision_mesh('brick')
2727

28-
# sleep a bit before terminating the client
29-
time.sleep(1)
28+
scene.remove_collision_mesh('brick')

0 commit comments

Comments
 (0)