Skip to content

Commit f61a3f3

Browse files
authored
Merge pull request #217 from compas-dev/move_robotmodelartist
Move RobotModelArtist
2 parents 80a400c + 266dbc7 commit f61a3f3

File tree

19 files changed

+314
-850
lines changed

19 files changed

+314
-850
lines changed

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

Lines changed: 1 addition & 1 deletion
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 RobotModelArtist
5+
from compas_blender.artists import RobotModelArtist
66

77
r = 'ros-industrial/abb'
88
p = 'abb_irb6600_support'

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

Lines changed: 191 additions & 179 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
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 RobotModelArtist
5+
from compas_rhino.artists import RobotModelArtist
66

77
r = 'ros-industrial/abb'
88
p = 'abb_irb6600_support'

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

Lines changed: 1 addition & 1 deletion
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 RobotModelArtist
3+
from compas_rhino.artists import RobotModelArtist
44

55
# Set high precision to import meshes defined in meters
66
compas.PRECISION = '12f'

docs/examples/03_backends_ros/files/gh_robot_visualisation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
if robot and full_configuration:
2828
robot.update(full_configuration, visual=show_visual, collision=show_collision)
29+
2930
print(full_configuration)
3031

3132
if show_visual:

docs/examples/03_backends_ros/files/robot-playground.ghx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3238,7 +3238,7 @@ from scriptcontext import sticky as st
32383238

32393239
import compas
32403240
from compas_fab.robots.ur5 import Robot
3241-
from compas_fab.ghpython import RobotModelArtist
3241+
from compas_ghpython.artists import RobotModelArtist
32423242

32433243
compas.PRECISION = '12f'
32443244

@@ -12922,7 +12922,7 @@ from compas_fab.backends import RosClient
1292212922
from compas_fab.backends import RosFileServerLoader
1292312923
from compas_fab.robots import Robot
1292412924
from compas_fab.robots import RobotSemantics
12925-
from compas_fab.ghpython import RobotModelArtist
12925+
from compas_ghpython.artists import RobotModelArtist
1292612926

1292712927
# Set high precision to import meshes defined in meters
1292812928
compas.PRECISION = '24f'
@@ -15974,6 +15974,7 @@ from __future__ import print_function
1597415974

1597515975
if robot and full_configuration:
1597615976
robot.update(full_configuration, visual=show_visual, collision=show_collision)
15977+
1597715978
print(full_configuration)
1597815979

1597915980
if show_visual:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
requirements = [
1313
# Until COMPAS reaches 1.0, we pin major.minor and allow patch version updates
14-
'compas>=0.16.8,<0.17',
14+
'compas>=0.16.9,<0.17',
1515
'roslibpy>=1.1.0',
1616
'pybullet',
1717
'pyserial',

src/compas_fab/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
.. toctree::
1313
:maxdepth: 3
1414
15-
compas_fab.artists
1615
compas_fab.backends
1716
compas_fab.robots
1817
compas_fab.utilities

src/compas_fab/artists/__init__.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/compas_fab/artists/base.py

Lines changed: 0 additions & 267 deletions
This file was deleted.

0 commit comments

Comments
 (0)