Skip to content

Commit 251c354

Browse files
authored
9 ➡️ 10 (#750)
Signed-off-by: Louise Poubel <louise@openrobotics.org>
2 parents 424bf9c + 0262ecd commit 251c354

47 files changed

Lines changed: 1563 additions & 108 deletions

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# More info:
2+
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
3+
4+
* @azeey @scpeters

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ jobs:
2323
- name: Compile and test
2424
id: ci
2525
uses: ignition-tooling/action-ignition-ci@focal
26-

Changelog.md

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,43 @@
209209

210210
### libsdformat 9.X.X (202X-XX-XX)
211211

212+
### libsdformat 9.7.0 (2021-11-03)
213+
214+
1. Make exception for plugins when checking for name uniqueness
215+
* [Pull request #733](https://github.com/ignitionrobotics/sdformat/pull/733)
216+
217+
1. Backport test utilities from sdf10
218+
* [Pull request #731](https://github.com/ignitionrobotics/sdformat/pull/731)
219+
220+
1. Added Force Torque Noise functions + Unit tests
221+
* [Pull request #669](https://github.com/ignitionrobotics/sdformat/pull/669)
222+
223+
1. Add Joint DOM API to access joint sensors
224+
* [Pull request #517](https://github.com/ignitionrobotics/sdformat/pull/517)
225+
226+
1. Add force torque sensor
227+
* [Pull request #393](https://github.com/ignitionrobotics/sdformat/pull/393)
228+
229+
### libsdformat 9.6.1 (2021-09-07)
230+
231+
1. Parse URDF continuous joint effort/velocity limits
232+
* [Pull request #684](https://github.com/ignitionrobotics/sdformat/pull/684)
233+
234+
1. Add a codecheck make target
235+
* [Pull request #682](https://github.com/ignitionrobotics/sdformat/pull/682)
236+
237+
1. Refactor sdf::readXml
238+
* [Pull request #681](https://github.com/ignitionrobotics/sdformat/pull/681)
239+
240+
1. Upgrade cpplint and fix new errors
241+
* [Pull request #680](https://github.com/ignitionrobotics/sdformat/pull/680)
242+
243+
1. BUG: add missing plugin element to include
244+
* [Pull request #675](https://github.com/ignitionrobotics/sdformat/pull/675)
245+
246+
1. Added comment reminder to update functions
247+
* [Pull request #677](https://github.com/ignitionrobotics/sdformat/pull/677)
248+
212249
### libsdformat 9.6.0 (2021-08-18)
213250

214251
1. Adds `enable_metrics` flag to Sensor.
@@ -922,7 +959,21 @@
922959

923960
## libsdformat 6.0
924961

925-
### libsdformat 6.X.X (20XX-XX-XX)
962+
### libsdformat 6.3.1 (2021-07-06)
963+
964+
1. Fix flattening logic for nested model names
965+
* [Pull request 597](https://github.com/osrf/sdformat/pull/597)
966+
967+
1. Translate poses of nested models inside other nested models
968+
* [Pull request 596](https://github.com/osrf/sdformat/pull/596)
969+
970+
### libsdformat 6.3.0 (2021-06-21)
971+
972+
1. Move recursiveSameTypeUniqueNames from ign.cc to parser.cc and make public.
973+
* [Pull request 580](https://github.com/osrf/sdformat/pull/580)
974+
975+
1. Parse rpyOffset as radians
976+
* [Pull request 497](https://github.com/osrf/sdformat/pull/497)
926977

927978
1. Parse urdf files to SDFormat 1.5 instead of 1.4 to avoid `use_parent_model_frame`.
928979
* [BitBucket pull request 575](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/575)

Migration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,11 @@ but with improved human-readability..
198198

199199
## SDFormat 5.x to 6.x
200200

201+
### Additions
202+
203+
1. **sdf/parser.hh**
204+
+ bool recursiveSameTypeUniqueNames(sdf::ElementPtr)
205+
201206
### Deprecations
202207

203208
1. **sdf/Types.hh**

bitbucket-pipelines.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

doc/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h2 style="text-align:center;">
4141
<dd><a href="http://sdf.com/wiki/Tutorials">Tutorials</a></dd>
4242
<dd><a href="http://sdf.com/downloads.html">Download</a></dd>
4343
-->
44-
<dd><a href="https://github.com/osrf/sdformat/issues/new">Report Documentation Issues</a></dd>
44+
<dd><a href="https://github.com/ignitionrobotics/sdformat/issues/new">Report Documentation Issues</a></dd>
4545
</dl>
4646
</div>
4747
<div>

doc/mainpage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Desctiption Format API. The code reference is divided into the groups below.
66
Should you find problems with this documentation - typos, unclear phrases,
77
or insufficient detail - please create a <a
8-
href="https://github.com/osrf/sdformat/issues/new">new GitHub issue</a>.
8+
href="https://github.com/ignitionrobotics/sdformat/issues/new">new GitHub issue</a>.
99
Include sufficient detail to quickly locate the problematic documentation,
1010
and set the issue's fields accordingly: Assignee - blank; Kind - bug;
1111
Priority - minor; Version - blank.

include/sdf/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set (headers
1515
Error.hh
1616
Exception.hh
1717
Filesystem.hh
18+
ForceTorque.hh
1819
Frame.hh
1920
Geometry.hh
2021
Gui.hh

include/sdf/Console.hh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ namespace sdf
9292
const std::string &_file,
9393
unsigned int _line, int _color);
9494

95+
/// \brief Set the stream object.
96+
/// \param[in] _stream Pointer to an output stream. This can be
97+
/// useful for redirecting the output, for example, to a std::stringstream
98+
/// for testing.
99+
public: void SetStream(std::ostream *_stream);
100+
101+
/// \brief Get the current stream object.
102+
/// \return Pointer to current stream object.
103+
public: std::ostream *GetStream();
104+
95105
/// \brief The ostream to log to; can be NULL/nullptr.
96106
private: std::ostream *stream;
97107
};
@@ -131,6 +141,18 @@ namespace sdf
131141
const std::string &file,
132142
unsigned int line);
133143

144+
/// \brief Get the current message stream object. This can be
145+
/// useful for redirecting the output, for example, to a std::stringstream
146+
/// for testing.
147+
/// \return Mutable reference to current message stream object.
148+
public: ConsoleStream &GetMsgStream();
149+
150+
/// \brief Get the current log stream object. This can be
151+
/// useful for redirecting the output, for example, to a std::stringstream
152+
/// for testing.
153+
/// \return Mutable reference to current log stream object.
154+
public: ConsoleStream &GetLogStream();
155+
134156
/// \internal
135157
/// \brief Pointer to private data.
136158
private: std::unique_ptr<ConsolePrivate> dataPtr;

include/sdf/Element.hh

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,20 @@ namespace sdf
365365
/// names. Also return true if no elements of the specified type are found.
366366
public: bool HasUniqueChildNames(const std::string &_type = "") const;
367367

368+
/// \brief Checks whether any child elements of the specified element type,
369+
/// except those listed in \p _ignoreElements, have identical name attribute
370+
/// values and returns false if so.
371+
/// \param[in] _type The type of Element to check. If empty, check names
372+
/// of all child elements.
373+
/// \param[in] _ignoreElements A list of child element types to ignore when
374+
/// checking for uniqueness.
375+
/// \return True if all child elements with name attributes of the
376+
/// specified type have unique names, return false if there are duplicated
377+
/// names. Also return true if no elements of the specified type are found.
378+
public: bool HasUniqueChildNames(
379+
const std::string &_type,
380+
const std::vector<std::string> &_ignoreElements) const;
381+
368382
/// \brief Count the number of child elements of the specified element type
369383
/// that have the same name attribute value.
370384
/// \param[in] _type The type of Element to check. If empty, count names
@@ -375,6 +389,20 @@ namespace sdf
375389
public: std::map<std::string, std::size_t>
376390
CountNamedElements(const std::string &_type = "") const;
377391

392+
/// \brief Count the number of child elements of the specified element type
393+
/// that have the same name attribute value with the exception of elements
394+
/// listed in \p _ignoreElements.
395+
/// \param[in] _type The type of Element to check. If empty, count names
396+
/// of all child elements.
397+
/// \param[in] _ignoreElements A list of child element types to ignore when
398+
/// checking for uniqueness.
399+
/// \return Map from Element names to a count of how many times the name
400+
/// occurs. The count should never be 0. If all 2nd values are 1, then
401+
/// there are exclusively unique names.
402+
public: std::map<std::string, std::size_t> CountNamedElements(
403+
const std::string &_type,
404+
const std::vector<std::string> &_ignoreElements) const;
405+
378406
/// \brief Return a pointer to the child element with the provided name.
379407
///
380408
/// A new child element, with the provided name, is added to this element
@@ -482,6 +510,11 @@ namespace sdf
482510
/// \return A pointer to the named element if found, nullptr otherwise.
483511
public: ElementPtr GetElementImpl(const std::string &_name) const;
484512

513+
/// \brief List of elements to which exceptions are made when checking for
514+
/// name uniqueness.
515+
/// \return List of element types that are allowed to have name collisions.
516+
public: static std::vector<std::string> NameUniquenessExceptions();
517+
485518
/// \brief Generate a string (XML) representation of this object.
486519
/// \param[in] _prefix arbitrary prefix to put on the string.
487520
/// \param[in] _includeDefaultElements flag to include default elements.

0 commit comments

Comments
 (0)