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

WIP: Save json with uri hint #1383

Open
wants to merge 3 commits into
base: production
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
# Define here the needed parameters
set (OPENRAVE_VERSION_MAJOR 0)
set (OPENRAVE_VERSION_MINOR 144)
set (OPENRAVE_VERSION_PATCH 0)
set (OPENRAVE_VERSION_PATCH 1)
set (OPENRAVE_VERSION ${OPENRAVE_VERSION_MAJOR}.${OPENRAVE_VERSION_MINOR}.${OPENRAVE_VERSION_PATCH})
set (OPENRAVE_SOVERSION ${OPENRAVE_VERSION_MAJOR}.${OPENRAVE_VERSION_MINOR})
message(STATUS "Compiling OpenRAVE Version ${OPENRAVE_VERSION}, soversion=${OPENRAVE_SOVERSION}")
Expand Down
5 changes: 5 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
ChangeLog
#########

Version 0.144.1
===============

- Fix the issue that saved json scene cannot be loaded on non-openrave software. To do so, save json file with referenceUriHint by default.

Version 0.144.0
===============

Expand Down
6 changes: 3 additions & 3 deletions src/libopenrave-core/jsonparser/jsonwriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ class EnvironmentJSONWriter
{
public:
EnvironmentJSONWriter(const AttributesList& atts, rapidjson::Value& rEnvironment, rapidjson::Document::AllocatorType& allocator) : _rEnvironment(rEnvironment), _allocator(allocator) {
_serializeOptions = 0;
_serializeOptions = ISO_ReferenceUriHint;
FOREACHC(itatt,atts) {
if( itatt->first == "openravescheme" ) {
_vForceResolveOpenRAVEScheme = itatt->second;
}
else if( itatt->first == "uriHint" ) {
else if( itatt->first == "noUriHint" ) {
if( itatt->second == "1" ) {
_serializeOptions = ISO_ReferenceUriHint;
_serializeOptions = 0;
}
}
}
Expand Down
Loading