X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=5f2de9487292e02c43d0404457b94b335c2d3e5c;hb=8939cbac9c5ec3a58a827dd7f364b965a8bb9d3c;hp=56b9a89a9171cc6f790638ec88e5589804e143be;hpb=d98e61872b752201b6f3f4bdbf513f8b4a7181d1;p=csit.git diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py index 56b9a89a91..5f2de94872 100644 --- a/resources/tools/presentation/generator_plots.py +++ b/resources/tools/presentation/generator_plots.py @@ -1513,49 +1513,62 @@ def plot_service_density_heatmap_compare(plot, input_data): for c in range(len(txt_chains)): hover_line = list() for n in range(len(txt_nodes)): - if data_r[c][n] is not None: - data_point = dict( - x=n+1, - y=c+1, - xref="x", - yref="y", - xanchor="center", - yanchor="middle", - text=str(data_r[c][n]) if data_r[c][n] is not None else "", - font=dict( - size=14, - ), - align="center", - showarrow=False - ) - annotations_r.append(deepcopy(data_point)) - data_point["text"] = str(data_c[c][n]) \ - if data_c[c][n] is not None else "" - annotations_c.append(deepcopy(data_point)) - data_point["text"] = str(diff[c][n]) \ - if diff[c][n] is not None else "" - annotations_diff.append(deepcopy(data_point)) + point = dict( + x=n + 1, + y=c + 1, + xref="x", + yref="y", + xanchor="center", + yanchor="middle", + text="", + font=dict( + size=14, + ), + align="center", + showarrow=False + ) - hover_line.append(text.format( - name=vals[txt_chains[c]][txt_nodes[n]]["name"], + try: + data_point = str(data_r[c][n]) + except KeyError: + data_point = None + point["text"] = "" if data_point is None else data_point + annotations_r.append(deepcopy(point)) + + try: + data_point = str(data_c[c][n]) + except KeyError: + data_point = None + point["text"] = "" if data_point is None else data_point + annotations_c.append(deepcopy(point)) + + try: + data_point = str(diff[c][n]) + except KeyError: + data_point = None + point["text"] = "" if data_point is None else data_point + annotations_diff.append(deepcopy(point)) + + hover_line.append(text.format( + name=vals[txt_chains[c]][txt_nodes[n]]["name"], + title_r=plot["reference"]["name"], + text_r=text_r.format( + val_r=data_r[c][n], + stdev_r=vals[txt_chains[c]][txt_nodes[n]]["stdev_r"], + nr_r=vals[txt_chains[c]][txt_nodes[n]]["nr_r"] + ) if data_r[c][n] is not None else "Test Failed", + title_c=plot["compare"]["name"], + text_c=text_c.format( + val_c=data_c[c][n], + stdev_c=vals[txt_chains[c]][txt_nodes[n]]["stdev_c"], + nr_c=vals[txt_chains[c]][txt_nodes[n]]["nr_c"] + ) if data_c[c][n] is not None else "Test Failed", + text_diff=text_diff.format( title_r=plot["reference"]["name"], - text_r=text_r.format( - val_r=data_r[c][n], - stdev_r=vals[txt_chains[c]][txt_nodes[n]]["stdev_r"], - nr_r=vals[txt_chains[c]][txt_nodes[n]]["nr_r"] - ) if data_r[c][n] is not None else "Test Failed", title_c=plot["compare"]["name"], - text_c=text_c.format( - val_c=data_c[c][n], - stdev_c = vals[txt_chains[c]][txt_nodes[n]]["stdev_c"], - nr_c=vals[txt_chains[c]][txt_nodes[n]]["nr_c"] - ) if data_c[c][n] is not None else "Test Failed", - text_diff=text_diff.format( - title_r=plot["reference"]["name"], - title_c=plot["compare"]["name"], - diff=diff[c][n] - ) if diff[c][n] is not None else "" - )) + diff=diff[c][n] + ) if diff[c][n] is not None else "" + )) hovertext.append(hover_line)