Skip to content

fix order of ofSaveJson #6940

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

Open
2bbb wants to merge 4 commits into
base: master
Choose a base branch
from
+39 −13
Open

fix order of ofSaveJson #6940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be7f5b9
add ofJson.h and ofThreadChannel.h to project
2bbb Apr 15, 2022
d8f34b2
fix order of arguments of ofSaveJson
2bbb Apr 15, 2022
b2bb226
fix order of arguments of ofSavePrettyJson
2bbb Apr 15, 2022
58ea9f8
fix about deprecation macro?
2bbb Apr 15, 2022
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
44 changes: 31 additions & 13 deletions libs/openFrameworks/utils/ofJson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,38 @@ inline ofJson ofLoadJson(const std::filesystem::path& filename){
return json;
}

/// \brief Save minified Json to the given path.
/// \param json The Json to save.
/// \param filename The destination path.
/// \returns true if the json was saved successfully.
inline bool ofSaveJson(const ofJson & json, const std::filesystem::path& filename){
ofFile jsonFile(filename, ofFile::WriteOnly);
try{
jsonFile << json;
}catch(std::exception & e){
ofLogError("ofSaveJson") << "Error saving json to " << filename.string() << ": " << e.what();
return false;
}catch(...){
ofLogError("ofSaveJson") << "Error saving json to " << filename.string();
return false;
}
return true;
}

/// \brief Save minified Json to the given path.
/// \param filename The destination path.
/// \param json The Json to save.
/// \returns true if the json was saved successfully.
OF_DEPRECATED_MSG("Use ofSaveJson(json, path) instead.", inline bool ofSaveJson(const std::filesystem::path& filename, const ofJson & json));
inline bool ofSaveJson(const std::filesystem::path& filename, const ofJson & json){
ofFile jsonFile(filename, ofFile::WriteOnly);
try{
jsonFile << json;
}catch(std::exception & e){
ofLogError("ofSaveJson") << "Error saving json to " << filename.string() << ": " << e.what();
return false;
}catch(...){
ofLogError("ofSaveJson") << "Error saving json to " << filename.string();
return false;
}
return true;
return ofSaveJson(json, filename);
}

/// \brief Save "pretty" indented Json to the given path.
/// \param filename The destination path.
/// \param json The Json to save.
/// \param filename The destination path.
/// \returns true if the json was saved successfully.
inline bool ofSavePrettyJson(const std::filesystem::path& filename, const ofJson & json){
inline bool ofSavePrettyJson(const ofJson & json, const std::filesystem::path& filename){
ofFile jsonFile(filename, ofFile::WriteOnly);
try{
jsonFile << json.dump(4);
Expand All @@ -63,6 +72,15 @@ inline bool ofSavePrettyJson(const std::filesystem::path& filename, const ofJson
return true;
}

/// \brief Save "pretty" indented Json to the given path.
/// \param filename The destination path.
/// \param json The Json to save.
/// \returns true if the json was saved successfully.
OF_DEPRECATED_MSG("Use ofSavePrettyJson(json, path) instead.", inline bool ofSavePrettyJson(const std::filesystem::path& filename, const ofJson & json));
inline bool ofSavePrettyJson(const std::filesystem::path& filename, const ofJson & json){
return ofSavePrettyJson(json, filename);
}

inline void ofSerialize(ofJson & js, const ofAbstractParameter & parameter){
if(!parameter.isSerializable()){
return;
Expand Down
8 changes: 8 additions & 0 deletions libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
772BDF74146928600030F0EE /* ofOpenALSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */; };
92C55F88132DA7DD00EC2631 /* ofPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92C55F86132DA7DD00EC2631 /* ofPath.cpp */; };
92C55F89132DA7DD00EC2631 /* ofPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 92C55F87132DA7DD00EC2631 /* ofPath.h */; };
959744752809DDF70091BACA /* ofJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 959744742809DDF70091BACA /* ofJson.h */; };
959744782809DE340091BACA /* ofThreadChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 959744772809DE340091BACA /* ofThreadChannel.h */; };
9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */; };
9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; };
9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; };
Expand Down Expand Up @@ -207,6 +209,8 @@
772BDF72146928600030F0EE /* ofOpenALSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofOpenALSoundPlayer.h; sourceTree = "<group>"; };
92C55F86132DA7DD00EC2631 /* ofPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofPath.cpp; sourceTree = "<group>"; };
92C55F87132DA7DD00EC2631 /* ofPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPath.h; sourceTree = "<group>"; };
959744742809DDF70091BACA /* ofJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofJson.h; sourceTree = "<group>"; };
959744772809DE340091BACA /* ofThreadChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofThreadChannel.h; sourceTree = "<group>"; };
9979E81F1A1CCC44007E55D1 /* ofWindowSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofWindowSettings.h; sourceTree = "<group>"; };
9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = "<group>"; };
9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -588,13 +592,15 @@
E4F3BAE312F4C745002D19BB /* ofConstants.h */,
E4F3BAE412F4C745002D19BB /* ofFileUtils.cpp */,
E4F3BAE512F4C745002D19BB /* ofFileUtils.h */,
959744742809DDF70091BACA /* ofJson.h */,
E4F3BAE612F4C745002D19BB /* ofLog.cpp */,
E4F3BAE712F4C745002D19BB /* ofLog.h */,
E4F3BAE812F4C745002D19BB /* ofNoise.h */,
E4F3BAE912F4C745002D19BB /* ofSystemUtils.cpp */,
E4F3BAEA12F4C745002D19BB /* ofSystemUtils.h */,
E4F3BAEB12F4C745002D19BB /* ofThread.cpp */,
E4F3BAEC12F4C745002D19BB /* ofThread.h */,
959744772809DE340091BACA /* ofThreadChannel.h */,
E4F3BAED12F4C745002D19BB /* ofURLFileLoader.cpp */,
E4F3BAEE12F4C745002D19BB /* ofURLFileLoader.h */,
E4F3BAEF12F4C745002D19BB /* ofUtils.cpp */,
Expand Down Expand Up @@ -663,6 +669,7 @@
E4F3BAC812F4C72F002D19BB /* ofQuaternion.h in Headers */,
E4F3BACA12F4C72F002D19BB /* ofVec2f.h in Headers */,
E4F3BACB12F4C72F002D19BB /* ofVec3f.h in Headers */,
959744752809DDF70091BACA /* ofJson.h in Headers */,
E4F3BACD12F4C72F002D19BB /* ofVec4f.h in Headers */,
692C298C19DC5C5500C27C5D /* ofFpsCounter.h in Headers */,
E4F3BACE12F4C72F002D19BB /* ofVectorMath.h in Headers */,
Expand Down Expand Up @@ -702,6 +709,7 @@
DACFA8E4132D09E8008D4B7A /* ofShader.h in Headers */,
676672A51A749D1900400051 /* ofAVFoundationVideoPlayer.h in Headers */,
DACFA8E6132D09E8008D4B7A /* ofTexture.h in Headers */,
959744782809DE340091BACA /* ofThreadChannel.h in Headers */,
DACFA8E8132D09E8008D4B7A /* ofVbo.h in Headers */,
DACFA8EA132D09E8008D4B7A /* ofVboMesh.h in Headers */,
9979E8221A1CCC44007E55D1 /* ofWindowSettings.h in Headers */,
Expand Down