Skip to content
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

Jump to bottom

Try to fix urdfs in memory before SDF import #481

Merged
merged 5 commits into from
Sep 8, 2023
Merged

Try to fix urdfs in memory before SDF import #481

merged 5 commits into from
Sep 8, 2023

Conversation

michalpelka
Copy link
Contributor

Some proposition to solve #476 and #472.

@michalpelka michalpelka changed the title Fix urdfs in memory Fix urdfs in memory before SDF import Aug 29, 2023
@michalpelka michalpelka force-pushed the mp/urdf_fix_in_mem branch 2 times, most recently from 7c8a6fd to 7e88d3d Compare September 4, 2023 12:50
@michalpelka michalpelka marked this pull request as ready for review September 4, 2023 12:50
@michalpelka michalpelka requested review from a team as code owners September 4, 2023 12:50
@michalpelka michalpelka force-pushed the mp/urdf_fix_in_mem branch 2 times, most recently from 71ca879 to 0fcb7fc Compare September 4, 2023 13:04
@michalpelka
Copy link
Contributor Author

Added option to enable and disable
Screenshot from 2023-09-04 14-39-34
Added notification to the User:
Screenshot from 2023-09-04 14-43-13

adamdbrw
adamdbrw reviewed Sep 4, 2023
View reviewed changes
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.cpp Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.cpp Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.cpp Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.h Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.h Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/FixURDF/FixURDF.h Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/RobotImporterWidget.cpp Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/RobotImporter/URDF/UrdfParser.cpp Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.cpp Outdated Show resolved Hide resolved
Gems/ROS2/Code/Source/SdfAssetBuilder/SdfAssetBuilderSettings.h Outdated Show resolved Hide resolved
@michalpelka michalpelka requested review from a team September 4, 2023 16:13
@michalpelka michalpelka force-pushed the mp/urdf_fix_in_mem branch 3 times, most recently from 5bffe98 to 29f15c7 Compare September 5, 2023 08:03
@michalpelka
Copy link
Contributor Author

Thanks @lumberyard-employee-dm, @mbalfour-amzn and @adamdbrw for review, applied all you great suggestions. Please take a second look and consider approving this PR!

@michalpelka michalpelka changed the title Fix urdfs in memory before SDF import Try to ix urdfs in memory before SDF import Sep 5, 2023
@michalpelka michalpelka changed the title Try to ix urdfs in memory before SDF import Try to fix urdfs in memory before SDF import Sep 5, 2023
@adamdbrw
Copy link
Contributor

adamdbrw commented Sep 5, 2023

image

Suggestions:

  1. Indicate what the modification was (for example "Modified names:", "Added Inertial").
  2. Make it easy to copy / save the modified URDF.

michalpelka and others added 4 commits September 7, 2023 11:10
@michalpelka
Fix in memory urdf with errors 2 and 19
25faebd 
Signed-off-by: Michał <[email protected]>
@michalpelka
Notify user and settings
92d9776 
Signed-off-by: Michał <[email protected]>
@michalpelka
Apply suggestions from code review
b922a17 
Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>

Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Michał <[email protected]>
@michalpelka @mbalfour-amzn
Update Gems/ROS2/Code/Source/RobotImporter/URDF/UrdfParser.h
0cead87 
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
Signed-off-by: Michał <[email protected]>
@michalpelka
Adjust to review
e4f5251 
Signed-off-by: Michał <[email protected]>
@michalpelka michalpelka merged commit 4ca8411 into development Sep 8, 2023
@michalpelka michalpelka deleted the mp/urdf_fix_in_mem branch September 8, 2023 08:19
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Sep 8, 2023
@michalpelka @adamdbrw
@lemonade-dm @mbalfour-amzn
Try to fix urdfs in memory before SDF import (o3de#481)
0e1cf65 
* Fix in memory urdf with errors 2 and 19
* Notify user and added settings
* Apply suggestions from code review

Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
@lgleim lgleim mentioned this pull request Sep 11, 2023
Closed
@lewandowskikacper lewandowskikacper mentioned this pull request Sep 11, 2023
Closed
@michalpelka michalpelka mentioned this pull request Sep 22, 2023
Merged
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Sep 25, 2023
@michalpelka @adamdbrw
@lemonade-dm @mbalfour-amzn
Try to fix urdfs in memory before SDF import (o3de#481)
ecca4a2 
* Fix in memory urdf with errors 2 and 19
* Notify user and added settings
* Apply suggestions from code review

Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Sep 25, 2023
@michalpelka @adamdbrw
@lemonade-dm @mbalfour-amzn
Try to fix urdfs in memory before SDF import (o3de#481)
92dd795 
* Fix in memory urdf with errors 2 and 19
* Notify user and added settings
* Apply suggestions from code review

Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
@adamdbrw adamdbrw mentioned this pull request Sep 29, 2023
Closed
michalpelka added a commit to RobotecAI/o3de-extras that referenced this pull request Oct 2, 2023
@michalpelka @adamdbrw
@lemonade-dm @mbalfour-amzn
Try to fix urdfs in memory before SDF import (o3de#481)
f978e73 
* Fix in memory urdf with errors 2 and 19
* Notify user and added settings
* Apply suggestions from code review

Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
michalpelka added a commit that referenced this pull request Oct 3, 2023
@michalpelka @adamdbrw
@lemonade-dm @mbalfour-amzn
Try to fix urdfs in memory before SDF import (#481)
b19dea8 
* Fix in memory urdf with errors 2 and 19
* Notify user and added settings
* Apply suggestions from code review

Co-authored-by: Adam Dąbrowski <[email protected]>
Co-authored-by: lumberyard-employee-dm <[email protected]>
Co-authored-by: Mike Balfour <[email protected]>
Signed-off-by: Michał Pełka <[email protected]>
@adamdbrw adamdbrw mentioned this pull request Oct 30, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamdbrw adamdbrw adamdbrw approved these changes

@lemonade-dm lemonade-dm lemonade-dm approved these changes

@mbalfour-amzn mbalfour-amzn mbalfour-amzn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michalpelka @adamdbrw @lemonade-dm @mbalfour-amzn