From 9f73552d295322e864bc9eb3adb3a4426bc5f6fb Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Fri, 7 Feb 2020 23:17:24 +0100 Subject: [PATCH] new variable nolegend: with 'set nolegend' plotting of the legend is suppressed. --- examples/utf-8/стекло/있어요/ext-utf8-3.cir | 2 ++ src/frontend/plotting/graf.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/utf-8/стекло/있어요/ext-utf8-3.cir b/examples/utf-8/стекло/있어요/ext-utf8-3.cir index 621dc4657..aa6305b8e 100644 --- a/examples/utf-8/стекло/있어요/ext-utf8-3.cir +++ b/examples/utf-8/стекло/있어요/ext-utf8-3.cir @@ -18,6 +18,8 @@ setcs xfont='Noto Sans CJK JP Medium' set gridwidth=4 set xbrushwidth=1 +set nolegend + *hardcopy **plot y vs x xlabel 'Labellisé X' ylabel 'Labellisé Y: ÜüÖöÄäÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜ' title 'Titré' diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c index 29fd2b9e3..cbefaa1bc 100644 --- a/src/frontend/plotting/graf.c +++ b/src/frontend/plotting/graf.c @@ -423,9 +423,9 @@ static void gr_start_internal(struct dvec *dv, bool copyvec) /* Put the legend entry on the screen. */ - drawlegend(currentgraph, cur.plotno++, dv); -} /* end of function gr_start_internal */ - + if (!cp_getvar("nolegend", CP_BOOL, NULL, 0)) + drawlegend(currentgraph, cur.plotno++, dv); +} /* Start one plot of a graph */ @@ -599,7 +599,8 @@ void gr_redraw(GRAPH *graph) cur.plotno = 0; for (link = graph->plotdata; link; link = link->next) { /* redraw legend */ - drawlegend(graph, cur.plotno++, link->vector); + if (!cp_getvar("nolegend", CP_BOOL, NULL, 0)) + drawlegend(graph, cur.plotno++, link->vector); /* replot data if onevalue, pass it a NULL scale