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.

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

12 ➡️ 13 (main) #805

Merged
merged 75 commits into from
Dec 27, 2021
Merged

12 ➡️ 13 (main) #805

merged 75 commits into from
Dec 27, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

chapulina and others added 30 commits April 21, 2020 19:18
* [sdf6] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* more fixes, new version of script

Signed-off-by: Louise Poubel <louise@openrobotics.org>
* [sdf4] Update BitBucket links

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* fix a few more links

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: chapulina <louise@openrobotics.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Patch popen/pclose method for Windows
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Backport sdf6: Move recursiveSameTypeUniqueNames from ign.cc to parser.cc
* Prepare version 6.3.0

* Add entry in Changelog for 497
* Fix flattening logic for composed names in nested models

When nested models use names composed by several elements
(i.e: my_model::link) these were not converted by the
flattening logic inside parser.cc. The change makes the
logic to work with composed names.

Added a test to check that this is indeed working as
expected.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
)

Translate poses of nested models inside other nested models

When addNestedModel function is called, it processes links and joints
to translate the pose accordingly to parent pose. This was not done
for nested models inside the SDF being processed. The change includes 
nested models in the same way that is doing for links and add a test that 
fails without the change.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Prepare version 6.3.1
* Implement github actions for sdf6 branch

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* parse rpyOffset as radians

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* update tf for xyz and rpy offsets

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* remove inverse transform function in urdf parser

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* inject corrected_offets tag

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* Fix tag removal logic

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <alejandro@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Pass by const reference
* Remove unused variable
* Simplify redundant logic

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* ign_TEST: expect joint_axis_infinite_limits valid
* Add missing link6 to test/sdf/joint_axis_*.sdf

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* ign_TEST: expect joint_axis_infinite_limits valid
* Add missing link6 to test/sdf/joint_axis_*.sdf

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Adds sdf::testing::SourceFile, sdf::testing::TestFile, sdf::testing::env, and sdf::testing::setenv and updates tests to use them. This makes it easier to backport other changes from newer branches.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
…ame uniqueness (#733)

* Backport test utilities from sdf10
* Backport Console redirect functionality
* Make exception for plugins when checking for name uniqueness (#721)
* Replace unavailable error printing API

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge 10 -> 11 and resolve conflicts
Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
* Add Joint DOM API to access joint sensors

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Add missing file

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* modified Joint::SensorNameExists

Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>

Co-authored-by: Jenn Nguyen <jenn@openrobotics.org>
* Added Force Torque Noise functions + Unit tests

Signed-off-by: Devansh <devansh@vt.edu>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* Support accessing mutable sensor types

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added simple test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added more tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added asserts

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Prepare for v9.7.0

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
nkoenig and others added 19 commits November 23, 2021 15:46
* Prepare for 12.2.0

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updated changelog

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix changelog

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
The correct default value is now computed based on the attributes of the pose, so `<pose rotation_format='quat_xyzw'/>` will have the the value '0 0 0  0 0 0 1' instead of the default string specified in pose.sdf.

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Added Add & Clear function to World, Model, and Link

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Added ToElement conversion for physics and atmosphere

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Aded ToElement conversion for shapes

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* doxygen

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>
* Working on material DOM ToElement

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update material ToElement

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Use floats

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
* Added ToElement conversion for Collision, Surface, and Visual

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update src/Visual_TEST.cc

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Co-authored-by: Marco A. Gutiérrez <marco@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Added ToElement for ParticleEmitter and Link

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* expect double eq

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>
* Adding toelement for model and actor

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updated tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Added more ToElement functions

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Revert Link toelement changes

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added toelement conversion for world, scene, sky, gui

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix element insertion, and updated tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update docs

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* minor doxygen update

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Support URI in the Model DOM

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* One minor test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* placement frame and static

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* relative_to

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added nested include test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* useincludetag

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Added plugin to SDF DOM

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* tweaks

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed doxygen

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Updates

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update plugin copy and tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove string and add move functions

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix build and tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix windows warnings

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
The buildFrameAttachedToGraph and buildPoseRelativeToGraph have overloads for the type of parent element, but the code in each overload is very similar to each other. This refactors these functions so there's less code duplication.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
…used angles (#689)

* Ruby option to print in_degrees or snap_to_degrees

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Basic PrintConfig added

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* PrintConfig gets passed into printing implementations of Element and Param

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding basic test for print options

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Reverting to PrintConfig with basic API

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moved creation of PrintConfig into ign functions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Param value GetPoseAsString and tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moved attribute painting to its own function, fixed test strings

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added basic tests for pose rotation input as quaternions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using different flags for ign sdf -p, allow snapping to different values

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Disabling test on windows, fixing comment

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Remove stale function, fixed linting

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding tolerance as a argument, added tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Use 3 spaces when changing rotation formats or snapping to degrees

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added check for tolerance larger than snapping interval

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Moving PrintAttributes to ElementPrivate to remain ABI stability

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using true/false instead of 1/0

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Remove use of SDF_ASSERT in GetAsString

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added tests for //include/pose

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding parsing passing test for empty quat_xyzw pose

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added check for default string values to be modified when rotation_format is defined

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Reparsing translates default value into string to be used if values have not been assigned to param

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using StringFromValueImpl for getting strings from all ParamVariants

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Refactor pose string from value into its own function

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fixing casting erroerror, added documentation and tests for tolerance < interval

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Correcting stale comments

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fixing snapToInterval math, added more tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Removed unneeded visibility macro

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding return documentation and using const reference to variant instead of pointer

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Returning string directly, removing stale _config, reverting strValue to nullopt

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Remove use of assertions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Suggested changes to #729 (#748)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* Using three space delimiter between position and rotation if attributes are set

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added comment regarding use of default PrintConfig in Reparse

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding equality comparison for PrintConfig

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Removed stale include

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Uniied string and value parsing behavior, and modified necessary tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Overloaded function to maintain ABI stability

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Fixing missing space in test for exec command

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Adding comment regarding attributeExceptions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Indenting help message, adding test for shuffling command flags

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Modifying cmd flag shuffling test to handling flags with arguments too

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Removed Get from PrintConfig getter functions

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Using std optional's converting constructor

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Modified snapToInterval implementation, added test

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added bool type specific value parser, values are parsed using ParamStreamer by default

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Reverting all unnecessary changes made in sdf12 to old tests

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added comparison for PreserveIncludes

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Check for 'type' attribute in unknown elements as well, in order to parse booleans into true/false, instead of 1/0

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Only checking for pose related PrintConfig options for returning string instead of default PrintConfig

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

* Added comment regarding sanitizing -0 in test outputs

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@codecov-commenter
Copy link

codecov-commenter commented Dec 27, 2021

Codecov Report

Merging #805 (5f02f47) into main (d15efa7) will increase coverage by 2.48%.
The diff coverage is 92.26%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #805      +/-   ##
==========================================
+ Coverage   88.22%   90.70%   +2.48%     
==========================================
  Files          76       78       +2     
  Lines       11437    12439    +1002     
==========================================
+ Hits        10090    11283    +1193     
+ Misses       1347     1156     -191     
Impacted Files Coverage Δ
include/sdf/Element.hh 100.00% <ø> (ø)
include/sdf/Param.hh 78.57% <ø> (+1.42%) ⬆️
src/ign.cc 64.15% <36.36%> (-10.27%) ⬇️
src/Joint.cc 90.29% <66.66%> (-7.33%) ⬇️
src/Gui.cc 90.47% <80.95%> (-9.53%) ⬇️
src/Noise.cc 95.83% <81.48%> (-4.17%) ⬇️
src/Lidar.cc 87.04% <81.81%> (-1.55%) ⬇️
src/Collision.cc 97.14% <83.33%> (-2.86%) ⬇️
src/ForceTorque.cc 89.93% <86.27%> (+2.17%) ⬆️
src/parser.cc 87.55% <86.66%> (+1.51%) ⬆️
... and 54 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d15efa7...5f02f47. Read the comment docs.

@scpeters scpeters merged commit 4a7d129 into main Dec 27, 2021
@scpeters scpeters deleted the chapulina/12_to_13 branch December 27, 2021 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.