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

added port name to file name of properties, which otherwise overwrite ...

added port name to file name of properties, which otherwise overwrite  previously written files of same node. e.g. lens hitmaps of front and read side.
Closes #336
parent 805670c2
No related branches found
No related tags found
1 merge request!199removed last step in source ghost focus analysis which used another raytrace...
......@@ -3,6 +3,7 @@ pub mod property;
pub mod proptype;
use log::warn;
use petgraph::visit::NodeRef;
pub use property::Property;
pub use proptype::{PropCondition, Proptype};
......@@ -152,7 +153,7 @@ impl Properties {
} else {
uuid
};
if let Ok(html_prop_value) = prop.1.prop().to_html(node_name, node_uuid) {
if let Ok(html_prop_value) = prop.1.prop().to_html((prop.0.to_owned() + "_"+node_name).as_str(), node_uuid) {
let html_prop = HtmlProperty {
name: prop.0.to_owned(),
description: prop.1.description().into(),
......@@ -176,7 +177,7 @@ impl Properties {
/// returns an error.
pub fn export_data(&self, report_path: &Path, id: &str) -> OpmResult<()> {
for prop in &self.props {
prop.1.export_data(report_path, id)?;
prop.1.export_data(report_path, (prop.0.to_owned()+"_" + id).as_str())?;
}
Ok(())
}
......
......@@ -128,8 +128,8 @@ impl Plottable for HitMap {
x_min *= f64::powi(10., -x_exponent);
y_min *= f64::powi(10., -y_exponent);
let x_limits = AxLims::create_useful_axlims(x_min * 1.1, x_max * 1.1);
let y_limits = AxLims::create_useful_axlims(y_min * 1.1, y_max * 1.1);
let x_limits = AxLims::create_useful_axlims(x_min -0.1*(x_max -x_min), x_max +0.1*(x_max -x_min));
let y_limits = AxLims::create_useful_axlims(y_min -0.1*(y_max -y_min), y_max +0.1*(y_max -y_min));
plt_type.set_plot_param(&PlotArgs::XLim(x_limits))?;
plt_type.set_plot_param(&PlotArgs::YLim(y_limits))?;
......
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