Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • phelix/rust/opossum
1 result
Show changes
Commits on Source (10)
Showing
with 78 additions and 25 deletions
No preview for this file type
File added
use opossum::error::OpossumError;
use opossum::nodes::{Dummy, NodeGroup};
use opossum::OpticScenery;
use std::path::Path;
fn main() -> Result<(), OpossumError> {
let mut scenery = OpticScenery::new();
let mut group1 = NodeGroup::new("real lens group");
group1.expand_view(true);
let g1_n1 = group1.add_node(Dummy::new("surface"))?;
let g1_n2 = group1.add_node(Dummy::new("material propagation"))?;
let g1_n3 = group1.add_node(Dummy::new("surface"))?;
group1.connect_nodes(g1_n1, "rear", g1_n2, "front")?;
group1.connect_nodes(g1_n2, "rear", g1_n3, "front")?;
let _scene_g1 = scenery.add_node(group1);
scenery.save_to_file(Path::new("playground/real_lens_group.opm"))?;
Ok(())
}
use opossum::error::OpossumError;
use opossum::nodes::{Dummy, Source, EnergyMeter};
use opossum::OpticScenery;
use std::path::Path;
fn main() -> Result<(), OpossumError> {
let mut scenery = OpticScenery::new();
scenery.set_description("OpticScenery demo");
let node1 = scenery.add_node(Source::default());
let node2 = scenery.add_node(Dummy::new("optic"));
let node3 = scenery.add_node(EnergyMeter::default());
scenery.connect_nodes(node1, "out1", node2, "front")?;
scenery.connect_nodes(node2, "rear", node3, "in1")?;
scenery.save_to_file(Path::new("playground/simple_for_talk.opm"))?;
Ok(())
}
...@@ -3,8 +3,8 @@ digraph { ...@@ -3,8 +3,8 @@ digraph {
compound = true; compound = true;
rankdir = "LR"; rankdir = "LR";
label="Test" label="Test"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
} }
...@@ -3,8 +3,8 @@ digraph { ...@@ -3,8 +3,8 @@ digraph {
compound = true; compound = true;
rankdir = "TB"; rankdir = "TB";
label="Test" label="Test"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
} }
...@@ -3,9 +3,9 @@ digraph { ...@@ -3,9 +3,9 @@ digraph {
compound = true; compound = true;
rankdir = "LR"; rankdir = "LR";
label="SceneryTest" label="SceneryTest"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
i0 [ i0 [
shape=plaintext shape=plaintext
......
...@@ -3,9 +3,9 @@ digraph { ...@@ -3,9 +3,9 @@ digraph {
compound = true; compound = true;
rankdir = "LR"; rankdir = "LR";
label="SceneryTest" label="SceneryTest"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
i0 [ i0 [
shape=plaintext shape=plaintext
......
...@@ -3,9 +3,9 @@ digraph { ...@@ -3,9 +3,9 @@ digraph {
compound = true; compound = true;
rankdir = "TB"; rankdir = "TB";
label="SceneryTest" label="SceneryTest"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
i0 [ i0 [
shape=plaintext shape=plaintext
......
...@@ -3,9 +3,9 @@ digraph { ...@@ -3,9 +3,9 @@ digraph {
compound = true; compound = true;
rankdir = "LR"; rankdir = "LR";
label="SceneryTest" label="SceneryTest"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
i0 [ i0 [
shape=plaintext shape=plaintext
......
...@@ -3,9 +3,9 @@ digraph { ...@@ -3,9 +3,9 @@ digraph {
compound = true; compound = true;
rankdir = "TB"; rankdir = "TB";
label="SceneryTest" label="SceneryTest"
fontname="Helvetica,Arial,sans-serif" fontname="Helvetica"
node [fontname="Helvetica,Arial,sans-serif" fontsize = 10] node [fontname="Helvetica" fontsize = 10]
edge [fontname="Helvetica,Arial,sans-serif"] edge [fontname="Helvetica"]
i0 [ i0 [
shape=plaintext shape=plaintext
......
...@@ -36,7 +36,7 @@ fn do_it() -> OpmResult<()> { ...@@ -36,7 +36,7 @@ fn do_it() -> OpmResult<()> {
dot_path.set_extension("dot"); dot_path.set_extension("dot");
print!("Write diagram to {}...", dot_path.display()); print!("Write diagram to {}...", dot_path.display());
let mut output = File::create(dot_path).unwrap(); let mut output = File::create(dot_path).unwrap();
write!(output, "{}", scenery.to_dot("")?).unwrap(); write!(output, "{}", scenery.to_dot("LR")?).unwrap();
println!("Success"); println!("Success");
print!("\nAnalyzing..."); print!("\nAnalyzing...");
scenery.analyze(&opossum_args.analyzer)?; scenery.analyze(&opossum_args.analyzer)?;
......
...@@ -65,6 +65,8 @@ impl NodeReference { ...@@ -65,6 +65,8 @@ impl NodeReference {
pub fn from_node(node: OpticRef) -> Self { pub fn from_node(node: OpticRef) -> Self {
let mut props = create_default_props(); let mut props = create_default_props();
props.set("reference id", node.uuid().into()).unwrap(); 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 { Self {
reference: Some(Rc::downgrade(&node.optical_ref)), reference: Some(Rc::downgrade(&node.optical_ref)),
props, props,
...@@ -173,6 +175,16 @@ mod test { ...@@ -173,6 +175,16 @@ mod test {
assert!(node.reference.is_some()); assert!(node.reference.is_some());
} }
#[test] #[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() { fn assign_reference() {
let mut scenery = OpticScenery::default(); let mut scenery = OpticScenery::default();
let idx = scenery.add_node(Dummy::default()); let idx = scenery.add_node(Dummy::default());
......
...@@ -240,7 +240,12 @@ impl<'de> Deserialize<'de> for OpticGraph { ...@@ -240,7 +240,12 @@ impl<'de> Deserialize<'de> for OpticGraph {
Uuid::nil() Uuid::nil()
}; };
let ref_node = g.node(uuid).unwrap(); let ref_node = g.node(uuid).unwrap();
let ref_name = format!("ref ({})", ref_node.optical_ref.borrow().name());
refnode.assign_reference(ref_node); refnode.assign_reference(ref_node);
refnode
.set_property("name", Proptype::String(ref_name))
.unwrap();
} }
} }
for edge in edges.iter() { for edge in edges.iter() {
......
...@@ -149,9 +149,9 @@ impl OpticScenery { ...@@ -149,9 +149,9 @@ impl OpticScenery {
dot_string.push_str("\tcompound = true;\n"); dot_string.push_str("\tcompound = true;\n");
dot_string.push_str(&format!("\trankdir = \"{}\";\n", rankdir)); dot_string.push_str(&format!("\trankdir = \"{}\";\n", rankdir));
dot_string.push_str(&format!("\tlabel=\"{}\"\n", self.description())); dot_string.push_str(&format!("\tlabel=\"{}\"\n", self.description()));
dot_string.push_str("\tfontname=\"Helvetica,Arial,sans-serif\"\n"); dot_string.push_str("\tfontname=\"Helvetica\"\n");
dot_string.push_str("\tnode [fontname=\"Helvetica,Arial,sans-serif\" fontsize = 10]\n"); dot_string.push_str("\tnode [fontname=\"Helvetica\" fontsize = 10]\n");
dot_string.push_str("\tedge [fontname=\"Helvetica,Arial,sans-serif\"]\n\n"); dot_string.push_str("\tedge [fontname=\"Helvetica\"]\n\n");
dot_string dot_string
} }
fn create_node_edge_str( fn create_node_edge_str(
......