Skip to content

Commit fa91131

Browse files
jhavljhavl
committed
moved urdf and xacro
1 parent ebad15a commit fa91131

File tree

75 files changed

+33
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+33
-32
lines changed

‎roboticstoolbox/backends/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from roboticstoolbox.backends.PyPlot import *
2-
from roboticstoolbox.backends.urdf import *
32
from roboticstoolbox.backends.Swift import *
43

54
try:

‎roboticstoolbox/robot/ERobot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# from roboticstoolbox.backends.PyPlot.functions import \
1515
# _plot, _teach, _fellipse, _vellipse, _plot_ellipse, \
1616
# _plot2, _teach2
17-
from roboticstoolbox.backends import xacro
18-
from roboticstoolbox.backends import URDF
17+
from roboticstoolbox.tools import xacro
18+
from roboticstoolbox.tools import URDF
1919
from roboticstoolbox.robot.Robot import Robot
2020
from roboticstoolbox.robot.Gripper import Gripper
2121
from pathlib import PurePath, PurePosixPath

‎roboticstoolbox/robot/Robot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
verifymatrix, getunit
88
from roboticstoolbox.robot.Link import Link
99
from spatialmath.base.transforms3d import tr2delta
10-
# from roboticstoolbox.backends import URDF
11-
# from roboticstoolbox.backends import xacro
10+
# from roboticstoolbox.tools import urdf
11+
# from roboticstoolbox.tools import xacro
1212
from pathlib import PurePath, PurePosixPath
1313
from scipy.optimize import minimize, Bounds, LinearConstraint
1414
from roboticstoolbox.tools.null import null

‎roboticstoolbox/tools/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from roboticstoolbox.tools.null import null
44
from roboticstoolbox.tools.p_servo import p_servo
55
from roboticstoolbox.tools.ticker import Ticker
6+
from roboticstoolbox.tools.urdf import *
67
# from roboticstoolbox.tools.stdout_supress import stdout_supress
78

89
__all__ = [

‎roboticstoolbox/backends/urdf/__init__.py renamed to ‎roboticstoolbox/tools/urdf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from roboticstoolbox.backends.urdf.urdf import (
1+
from roboticstoolbox.tools.urdf.urdf import (
22
URDFType,
33
Box, Cylinder, Sphere, Mesh, Geometry,
44
Collision, Visual, Inertial,

‎roboticstoolbox/backends/urdf/tests/data/ur5.urdf renamed to ‎roboticstoolbox/tools/urdf/tests/data/ur5.urdf

File renamed without changes.

‎roboticstoolbox/backends/urdf/tests/test_urdf.py renamed to ‎roboticstoolbox/tools/urdf/tests/test_urdf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import unittest
88
import roboticstoolbox as rp
9-
from roboticstoolbox.backends import URDF, Link, Joint, Transmission, xacro
9+
from roboticstoolbox.tools import URDF, Link, Joint, Transmission, xacro
1010
import numpy as np
1111
import numpy.testing as nt
1212

@@ -43,17 +43,17 @@ def test_urdf_visuals(self):
4343
urdf.links[0].visuals[0].origin,
4444
np.ndarray))
4545

46-
urdf.links[0].visuals[0].geometry.box = rp.backends.urdf.Box([1, 2, 3])
46+
urdf.links[0].visuals[0].geometry.box = rp.tools.urdf.Box([1, 2, 3])
4747
self.assertTrue(
4848
isinstance(
4949
urdf.links[0].visuals[0].geometry.geometry,
50-
rp.backends.urdf.Box))
50+
rp.tools.urdf.Box))
5151

5252
urdf.links[0].visuals[0].geometry.cylinder = \
53-
rp.backends.urdf.Cylinder(1, 2)
53+
rp.tools.urdf.Cylinder(1, 2)
5454

5555
urdf.links[0].visuals[0].geometry.sphere = \
56-
rp.backends.urdf.Sphere(2)
56+
rp.tools.urdf.Sphere(2)
5757

5858
nt.assert_array_almost_equal(
5959
urdf.links[0].visuals[0].geometry.box.size,
@@ -70,7 +70,7 @@ def test_urdf_visuals(self):
7070
self.assertTrue(
7171
isinstance(
7272
urdf.links[0].visuals[0].geometry.mesh,
73-
rp.backends.urdf.Mesh))
73+
rp.tools.urdf.Mesh))
7474

7575
try:
7676
xacro.main("")

‎roboticstoolbox/backends/urdf/urdf.py renamed to ‎roboticstoolbox/tools/urdf/urdf.py

File renamed without changes.

‎roboticstoolbox/backends/urdf/utils.py renamed to ‎roboticstoolbox/tools/urdf/utils.py

File renamed without changes.

‎roboticstoolbox/backends/xacro/__init__.py renamed to ‎roboticstoolbox/tools/xacro/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
# The top level directory
6262
tld = ''
6363

64+
6465
def push_file(filename):
6566
"""
6667
Push a new filename to the filestack.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy