Skip to content
Snippets Groups Projects
Commit 8765362a authored by y.zobus's avatar y.zobus
Browse files

Merge branch '104-reference-node-display-referred-node-name-in-diagram' into 'main'

Resolve "Reference node: display referred node name in diagram"

Closes #104

See merge request !48
parents 5f71df8e 97a166e8
No related branches found
No related tags found
1 merge request!48Resolve "Reference node: display referred node name in diagram"
Pipeline #7844 passed
......@@ -65,6 +65,8 @@ impl NodeReference {
pub fn from_node(node: OpticRef) -> Self {
let mut props = create_default_props();
props.set("reference id", node.uuid().into()).unwrap();
let ref_name = format!("ref ({})", node.optical_ref.borrow().name());
props.set("name", Proptype::String(ref_name)).unwrap();
Self {
reference: Some(Rc::downgrade(&node.optical_ref)),
props,
......@@ -173,6 +175,16 @@ mod test {
assert!(node.reference.is_some());
}
#[test]
fn from_node_name() {
let mut scenery = OpticScenery::default();
let idx = scenery.add_node(Dummy::default());
let node_ref = scenery.node(idx).unwrap();
let node_name = format!("ref ({})", node_ref.optical_ref.borrow().name());
let node = NodeReference::from_node(node_ref);
assert_eq!(node.name(), node_name);
}
#[test]
fn assign_reference() {
let mut scenery = OpticScenery::default();
let idx = scenery.add_node(Dummy::default());
......
......@@ -240,7 +240,12 @@ impl<'de> Deserialize<'de> for OpticGraph {
Uuid::nil()
};
let ref_node = g.node(uuid).unwrap();
let ref_name = format!("ref ({})", ref_node.optical_ref.borrow().name());
refnode.assign_reference(ref_node);
refnode
.set_property("name", Proptype::String(ref_name))
.unwrap();
}
}
for edge in edges.iter() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment