Skip to content

Bug fixes [Issue-136], [Issue-137] #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2025
+6 −6
Merged

Bug fixes [Issue-136], [Issue-137] #138

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84c5b80
collection of bug fixes: [Issue-136], [Issue-137], github worker
jcao-bdai Sep 27, 2024
472560a
more fixes
jcao-bdai Sep 27, 2024
656d13a
Merge branch 'master' into bug-fixes-issue-136-137
myeatman-bdai Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/sphinx.yml
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Python 3.8 is already at EOL and may disappear from the GH environment at any time. Suggest we go for something like 3.12 so we don't have to touch this again for a few years.

Also note that checkout action is currently at v4, I don't know what the difference is, or whether the old ones eventually become deprecated.

We should check the python and action versions across all the workflow files, for sphinx building and code coverage.

Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion spatialmath/base/animate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def update(frame, animation):
if isinstance(frame, float):
# passed a single transform, interpolate it
T = smb.trinterp(start=self.start, end=self.end, s=frame)
elif isinstance(frame, NDArray):
elif isinstance(frame, np.ndarray):
# type is SO3Array or SE3Array when Animate.trajectory is not None
T = frame
else:
Expand Down
8 changes: 4 additions & 4 deletions spatialmath/base/graphics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ def plot_sphere(
handles = []
for c in centre.T:
X, Y, Z = sphere(centre=c, radius=radius, resolution=resolution)
handles.append(_render3D(ax, X, Y, Z, **kwargs))
handles.append(_render3D(ax, X, Y, Z, pose=pose, **kwargs))

return handles

Expand Down Expand Up @@ -1214,7 +1214,7 @@ def plot_cylinder(
) # Pythagorean theorem

handles = []
handles.append(_render3D(ax, X, Y, Z, filled=filled, **kwargs))
handles.append(_render3D(ax, X, Y, Z, filled=filled, pose=pose, **kwargs))
handles.append(
_render3D(ax, X, (2 * centre[1] - Y), Z, filled=filled, pose=pose, **kwargs)
)
Expand Down Expand Up @@ -1298,9 +1298,9 @@ def plot_cone(
Z = height - Z

handles = []
handles.append(_render3D(ax, X, Y, Z, filled=filled, **kwargs))
handles.append(_render3D(ax, X, Y, Z, pose=pose, filled=filled, **kwargs))
handles.append(
_render3D(ax, X, (2 * centre[1] - Y), Z, filled=filled, **kwargs)
_render3D(ax, X, (2 * centre[1] - Y), Z, pose=pose, filled=filled, **kwargs)
)

if ends and kwargs.get("filled", default=False):
Expand Down
Loading