-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Modify structures to support newest JSON format, add JSON export.
- Loading branch information
Showing
7 changed files
with
80 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,97 @@ | ||
| use crate::enums::{RelationshipType, VariableType}; | ||
| use crate::update_fn::bma_fn_tree::BmaFnNode; | ||
| use serde::{Deserialize, Serialize}; | ||
| use serde::{Deserialize, Serialize, Serializer}; | ||
| use serde_with::skip_serializing_none; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[skip_serializing_none] | ||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct BmaModel { | ||
| /// Main data with variables and relationships. | ||
| pub model: Model, | ||
| /// Layout information (variable positions, containers, ...). | ||
| pub layout: Layout, | ||
| /// Stores additional metadata like description, biocheck_version, etc. | ||
| /// Stores additional metadata like biocheck_version that are sometimes present in XML. | ||
| #[serde(flatten)] | ||
| pub metadata: HashMap<String, String>, | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct Model { | ||
| pub name: String, | ||
| pub variables: Vec<Variable>, | ||
| pub relationships: Vec<Relationship>, | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct Variable { | ||
| pub id: u32, | ||
| pub name: String, | ||
| pub variable_type: VariableType, // Corresponds to "Type" in JSON/XML | ||
| pub range_from: u32, | ||
| pub range_to: u32, | ||
| pub formula: BmaFnNode, | ||
| #[serde(serialize_with = "serialize_update_fn")] | ||
| pub formula: Option<BmaFnNode>, | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct Relationship { | ||
| pub id: u32, | ||
| pub from_variable: u32, | ||
| pub to_variable: u32, | ||
| #[serde(rename = "Type")] | ||
| pub relationship_type: RelationshipType, // Corresponds to "Type" in JSON/XML | ||
| } | ||
|
|
||
| #[skip_serializing_none] | ||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct Layout { | ||
| pub variables: Vec<LayoutVariable>, | ||
| pub containers: Vec<Container>, | ||
| pub description: String, // can be empty (by default if not provided) | ||
| pub zoom_level: Option<f32>, | ||
| pub pan_x: Option<i32>, | ||
| pub pan_y: Option<i32>, | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct LayoutVariable { | ||
| pub id: u32, | ||
| pub name: String, // duplicated with Variable.name, but that's what BMA does | ||
| #[serde(rename = "Type")] | ||
| pub variable_type: VariableType, // Corresponds to "Type" in JSON/XML | ||
| pub container_id: u32, | ||
| pub position_x: f64, | ||
| pub position_y: f64, | ||
| pub cell_x: Option<u32>, | ||
| pub cell_y: Option<u32>, | ||
| pub cell_x: Option<u32>, // this can be serialized to null | ||
| pub cell_y: Option<u32>, // this can be serialized to null | ||
| pub angle: f64, | ||
| pub description: String, // can be empty (by default if not provided) | ||
| } | ||
|
|
||
| #[skip_serializing_none] | ||
| #[derive(Serialize, Deserialize, Debug, Clone)] | ||
| #[serde(rename_all = "PascalCase")] | ||
| pub struct Container { | ||
| pub id: u32, | ||
| pub name: Option<String>, // Optional, as some containers may not have a name | ||
| pub name: String, // can be empty if not provided | ||
| pub size: u32, | ||
| pub position_x: f64, | ||
| pub position_y: f64, | ||
| } | ||
|
|
||
| fn serialize_update_fn<S>(update_fn: &Option<BmaFnNode>, s: S) -> Result<S::Ok, S::Error> | ||
| where | ||
| S: Serializer, | ||
| { | ||
| if let Some(update_fn_str) = update_fn { | ||
| s.serialize_str(update_fn_str.as_str()) | ||
| } else { | ||
| s.serialize_str("") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters