Commit 0cf41ae9 authored by Samuel GAIST's avatar Samuel GAIST
Browse files

Merge branch 'fix_plot_names' into '1.4.x'

Prepend plot output with experiment name - Fix

See merge request !32
parents 5124609c 6b4b3cfa
Pipeline #20505 passed with stages
in 45 minutes and 42 seconds
...@@ -523,7 +523,7 @@ def plot(webapi, configuration, prefix, names, remote_results, show, force, inde ...@@ -523,7 +523,7 @@ def plot(webapi, configuration, prefix, names, remote_results, show, force, inde
for key, value in results.iteritems(): for key, value in results.iteritems():
# remove non plottable results # remove non plottable results
if value['type'] not in RESULTS_SIMPLE_TYPE_NAMES: if value['type'] not in RESULTS_SIMPLE_TYPE_NAMES:
output_name = key + '.png' output_name = name.rsplit('/', 1)[1] + '_' + key + '.png'
output_name = os.path.join(output_folder, output_name) output_name = os.path.join(output_folder, output_name)
pl_status = plotters_pull(webapi, configuration.path, [value['type']], force, indentation + 2, {}) pl_status = plotters_pull(webapi, configuration.path, [value['type']], force, indentation + 2, {})
plot_status = plotters_plot(webapi, configuration.path, [value['type']], show, False, False, value['value'], plot_status = plotters_plot(webapi, configuration.path, [value['type']], show, False, False, value['value'],
...@@ -568,7 +568,7 @@ def plot(webapi, configuration, prefix, names, remote_results, show, force, inde ...@@ -568,7 +568,7 @@ def plot(webapi, configuration, prefix, names, remote_results, show, force, inde
datatype = attr.__class__.__name__.replace('_','/') datatype = attr.__class__.__name__.replace('_','/')
# remove non plottable results # remove non plottable results
if datatype not in RESULTS_SIMPLE_TYPE_NAMES: if datatype not in RESULTS_SIMPLE_TYPE_NAMES:
output_name = the_data + '.png' output_name = name.rsplit('/', 1)[1] + '_' + the_data + '.png'
output_name = os.path.join(output_folder, output_name) output_name = os.path.join(output_folder, output_name)
pl_status = plotters_pull(webapi, configuration.path, [datatype], force, indentation + 2, {}) pl_status = plotters_pull(webapi, configuration.path, [datatype], force, indentation + 2, {})
plot_status = plotters_plot(webapi, configuration.path, [datatype], show, False, False, plot_status = plotters_plot(webapi, configuration.path, [datatype], show, False, False,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment