Patch: Export node IDs to json sequentially

ideoforms · Jan 11, 2024 · 5979770 · 5979770
1 parent 5732366
commit 5979770
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/src/patch/patch-spec.cpp b/source/src/patch/patch-spec.cpp
@@ -192,9 +192,11 @@ std::string PatchSpec::to_json()
     std::vector<Json::object> patch_inputs;
     std::vector<Json::object> patch_buffer_inputs;
 
-    for (auto pair : nodespecs)
+    // Iterate over node pairs, ordered by node ID
+    int nodespec_count = nodespecs.size();
+    for (auto nodespec_index = 0; nodespec_index < nodespec_count; nodespec_index++)
     {
-        PatchNodeSpec *spec = pair.second;
+        PatchNodeSpec *spec = nodespecs[nodespec_index];
         Json::object inputs;
         Json::object properties;
 
@@ -282,8 +284,6 @@ std::string PatchSpec::to_json()
         nodes.push_back(object);
     }
 
-    std::reverse(nodes.begin(), nodes.end());
-
     Json::object root;
     root["name"] = this->name;
     root["nodes"] = nodes;

diff --git a/tests/test_patch.py b/tests/test_patch.py
@@ -101,7 +101,7 @@ def __init__(self):
     patch = TestPatch()
     spec = patch.to_spec()
     spec_json = spec.to_json()
-    ref_json = '{"buffer_inputs": [], "inputs": [], "name": "", "nodes": [{"id": 4, "inputs": {"attack": 0.1, "curve": 1, "release": 0.1, "sustain": 0.5}, "node": "asr-envelope"}, {"id": 2, "inputs": {"frequency": 440}, "node": "sine"}, {"id": 1, "inputs": {"input0": {"id": 2}, "input1": {"id": 4}}, "node": "multiply"}, {"id": 0, "inputs": {"input": {"id": 1}, "pan": 0}, "is_output": true, "node": "stereo-panner"}]}'
+    ref_json = '{"buffer_inputs": [], "inputs": [], "name": "", "nodes": [{"id": 0, "inputs": {"input": {"id": 1}, "pan": 0}, "is_output": true, "node": "stereo-panner"}, {"id": 1, "inputs": {"input0": {"id": 2}, "input1": {"id": 4}}, "node": "multiply"}, {"id": 2, "inputs": {"frequency": 440}, "node": "sine"}, {"id": 4, "inputs": {"attack": 0.1, "curve": 1, "release": 0.1, "sustain": 0.5}, "node": "asr-envelope"}]}'
 
     #--------------------------------------------------------------------------------
     # Can't simply compare the to_json output to the ref_json, as ordering of objects
@@ -112,4 +112,4 @@ def __init__(self):
     #--------------------------------------------------------------------------------
     spec_json_deserialised = json.loads(spec_json)
     ref_json_deserialised = json.loads(ref_json)
-    assert spec_json_deserialised == ref_json_deserialised
+    assert spec_json_deserialised == ref_json_deserialised