Unify all enum contents tags used in serialization

Author: stfnp

gui/source/solver/BowModel.cpp

@@ -183,19 +183,19 @@ void from_json(const nlohmann::json& obj, DrawLength& output) {
 void to_json(nlohmann::json& obj, const ProfileSegment& input) {
     if(auto value = std::get_if<Line>(&input)) {
         obj["type"] = "line";
-        obj["parameters"] = *value;
+        obj["value"] = *value;
     }
     else if(auto value = std::get_if<Arc>(&input)) {
         obj["type"] = "arc";
-        obj["parameters"] = *value;
+        obj["value"] = *value;
     }
     else if(auto value = std::get_if<Spiral>(&input)) {
         obj["type"] = "spiral";
-        obj["parameters"] = *value;
+        obj["value"] = *value;
     }
     else if(auto value = std::get_if<Spline>(&input)) {
         obj["type"] = "spline";
-        obj["parameters"] = *value;
+        obj["value"] = *value;
     }
     else {
         throw std::runtime_error("Unknown segment type");
@@ -204,16 +204,16 @@ void to_json(nlohmann::json& obj, const ProfileSegment& input) {
 
 void from_json(const nlohmann::json& obj, ProfileSegment& output) {
     if(obj.at("type") == "line") {
-        output = obj.at("parameters").get<Line>();
+        output = obj.at("value").get<Line>();
     }
     else if(obj.at("type") == "arc") {
-        output = obj.at("parameters").get<Arc>();
+        output = obj.at("value").get<Arc>();
     }
     else if(obj.at("type") == "spiral") {
-        output = obj.at("parameters").get<Spiral>();
+        output = obj.at("value").get<Spiral>();
     }
     else if(obj.at("type") == "spline") {
-        output = obj.at("parameters").get<Spline>();
+        output = obj.at("value").get<Spline>();
     }
     else {
         throw std::runtime_error("Unknown segment type");
@@ -232,15 +232,15 @@ void to_json(nlohmann::json& obj, const LayerAlignment& input) {
     }
     else if(auto value = std::get_if<LayerBack>(&input)) {
         obj["type"] = "layer_back";
-        obj["layer"] = value->layer;
+        obj["value"] = value->layer;
     }
     else if(auto value = std::get_if<LayerBelly>(&input)) {
         obj["type"] = "layer_belly";
-        obj["layer"] = value->layer;
+        obj["value"] = value->layer;
     }
     else if(auto value = std::get_if<LayerCenter>(&input)) {
         obj["type"] = "layer_center";
-        obj["layer"] = value->layer;
+        obj["value"] = value->layer;
     }
     else {
         throw std::runtime_error("Unknown alignment type");
@@ -259,17 +259,17 @@ void from_json(const nlohmann::json& obj, LayerAlignment& output) {
     }
     else if(obj.at("type") == "layer_back") {
         output = LayerBack {
-            .layer = obj.at("layer")
+            .layer = obj.at("value")
         };
     }
     else if(obj.at("type") == "layer_belly") {
         output = LayerBelly {
-            .layer = obj.at("layer")
+            .layer = obj.at("value")
         };
     }
     else if(obj.at("type") == "layer_center") {
         output = LayerCenter {
-            .layer = obj.at("layer")
+            .layer = obj.at("value")
         };
     }
     else {

solver/virtualbow/data/input/valid_model.bow

@@ -3,7 +3,7 @@
   "comment": "",
   "settings": {
     "num_limb_elements": 30,
-    "num_limb_eval_points": 250,
+    "num_limb_sample_points": 250,
     "min_draw_resolution": 100,
     "max_draw_resolution": 100,
     "static_iteration_tolerance": 1e-6,
@@ -30,7 +30,7 @@
     "segments": [
       {
         "type": "line",
-        "parameters": {
+        "value": {
           "length": 0.8
         }
       }
@@ -59,7 +59,7 @@
         "shear_modulus": 6000000000.0,
         "tensile_strength": 0.0,
         "compressive_strength": 0.0,
-        "safety_margin": 0.0
+        "margin_of_safety": 0.0
       }
     ],
     "layers": [
@@ -82,7 +82,7 @@
   "string": {
     "strand_stiffness": 3500.0,
     "strand_density": 0.0005,
-    "n_strands": 12
+    "num_strands": 12
   },
   "masses": {
     "arrow": {
@@ -91,7 +91,7 @@
     },
     "limb_tip": 0.0,
     "string_center": 0.0,
-    "string_tip": 0.0
+    "string_end": 0.0
   },
   "damping": {
     "damping_ratio_limbs": 0.05,

solver/virtualbow/data/output/valid_results.res

@@ -124,7 +124,7 @@ pub struct Profile {
 // - Section: The profile curve is aligned with the back side, belly side, or geometrical center of the combined section
 // - Layer: The profile curve is aligned with the back side, belly side, or geometrical center of a specific layer
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-#[serde(tag = "type", content = "layer", rename_all = "snake_case")]
+#[serde(tag = "type", content = "value", rename_all = "snake_case")]
 pub enum LayerAlignment {
     SectionBack,
     SectionBelly,
@@ -135,7 +135,7 @@ pub enum LayerAlignment {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-#[serde(tag = "type", content = "parameters", rename_all = "snake_case")]
+#[serde(tag = "type", content = "value", rename_all = "snake_case")]
 pub enum ProfileSegment {
     Line(Line),
     Arc(Arc),

solver/virtualbow/src/input/versions/latest.rs

@@ -90,7 +90,7 @@ fn create_section(name: &str) -> impl CrossSection {
     }
 }
 
-test_each_path!{ in "virtualbow_num/data/gxbeam" => simulate_and_test_beam}
+test_each_path!{ in "virtualbow_num/data/gxbeam" => simulate_and_test_beam }
 
 fn simulate_and_test_beam(path: &Path) {
     // Open reference data from path