-
Notifications
You must be signed in to change notification settings - Fork 10
Support !degree & !randians yaml prefixes #7
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.
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
Open
JafarAbdi
wants to merge
3
commits into
PickNikRobotics:main
Choose a base branch
from
JafarAbdi:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+24
−3
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ | |
| from typing import List, Union | ||
| import xacro | ||
| from ament_index_python.packages import get_package_share_directory | ||
| import math | ||
|
|
||
|
|
||
| class ParameterBuilderFileNotFoundError(KeyError): | ||
|
|
@@ -52,6 +53,20 @@ class ParameterBuilderFileNotFoundError(KeyError): | |
| ] | ||
|
|
||
|
|
||
| def construct_angle_radians(loader, node): | ||
| """Utility function to construct radian values from yaml.""" | ||
| value = loader.construct_scalar(node) | ||
| try: | ||
| return float(value) | ||
| except SyntaxError: | ||
| raise Exception(f"invalid expression: {value}") | ||
|
|
||
|
|
||
| def construct_angle_degrees(loader, node): | ||
| """Utility function for converting degrees into radians from yaml.""" | ||
|
JafarAbdi marked this conversation as resolved.
Outdated
|
||
| return math.radians(construct_angle_radians(loader, node)) | ||
|
|
||
|
|
||
| def raise_if_file_not_found(file_path: Path): | ||
| if not file_path.exists(): | ||
| raise ParameterBuilderFileNotFoundError(f"File {file_path} doesn't exist") | ||
|
|
@@ -62,17 +77,23 @@ def load_file(file_path: Path): | |
| try: | ||
| with open(file_path, "r") as file: | ||
| return file.read() | ||
| except EnvironmentError: # parent of IOError, OSError *and* WindowsError where available | ||
| except OSError: # parent of IOError, OSError *and* WindowsError where available | ||
| return None | ||
|
|
||
|
|
||
| def load_yaml(file_path: Path): | ||
| raise_if_file_not_found(file_path) | ||
|
|
||
| try: | ||
| yaml.SafeLoader.add_constructor("!radians", construct_angle_radians) | ||
| yaml.SafeLoader.add_constructor("!degrees", construct_angle_degrees) | ||
| except Exception: | ||
| raise Exception("yaml support not available; install python-yaml") | ||
|
|
||
| try: | ||
| with open(file_path, "r") as file: | ||
| return yaml.load(file, Loader=yaml.FullLoader) | ||
| except EnvironmentError: # parent of IOError, OSError *and* WindowsError where available | ||
| return yaml.safe_load(file) | ||
|
Comment on lines
+87
to
+95
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Based on this resource and some limitation I found when integrating this in Studio, I have a suggestion. First, make a function like this which we can use standalone: Then, in your implementation, you can do: |
||
| except OSError: # parent of IOError, OSError *and* WindowsError where available | ||
| return None | ||
|
|
||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.