openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Json data handling

Browse Source 
- Parsing from string to Json::Value is now done by utility function
  openshot::stringToJson() in Json.cpp, all SetJson() methods call it.
- Expand use of const member functions and args where appropriate.
- Use std::to_string() to format int/float values as strings.
- Correct mentions of nonexistent Json::JsonValue type in docstrings
This commit is contained in:
FeRD (Frank Dana)
2019-12-27 08:51:51 -05:00
parent a1158ee278
commit 22bf6edfba
81 changed files with 483 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/KeyFrame.cpp
View File

@@ -325,17 +325,15 @@ std::string Keyframe::Json() const {
return JsonValue().toStyledString();
}
// Generate Json::JsonValue for this object
// Generate Json::Value for this object
Json::Value Keyframe::JsonValue() const {
// Create root json object
Json::Value root;
root["Points"] = Json::Value(Json::arrayValue);
// loop through points, and find a matching coordinate
for (int x = 0; x < Points.size(); x++) {
// Get each point
Point existing_point = Points[x];
// loop through points
for (const auto existing_point : Points) {
root["Points"].append(existing_point.JsonValue());
}
@@ -344,24 +342,12 @@ Json::Value Keyframe::JsonValue() const {
}
// Load JSON string into this object
void Keyframe::SetJson(std::string value) {
void Keyframe::SetJson(const std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;
if (!success)
// Raise exception
throw InvalidJSON("JSON could not be parsed (or is invalid)");
try
{
const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -372,17 +358,14 @@ void Keyframe::SetJson(std::string value) {
}
}
// Load Json::JsonValue into this object
void Keyframe::SetJsonValue(Json::Value root) {
// Load Json::Value into this object
void Keyframe::SetJsonValue(const Json::Value root) {
// Clear existing points
Points.clear();
if (!root["Points"].isNull())
// loop through points
for (int64_t x = 0; x < root["Points"].size(); x++) {
// Get each point
Json::Value existing_point = root["Points"][(Json::UInt) x];
for (const auto existing_point : root["Points"]) {
// Create Point
Point p;