diff --git a/code/replot_security.py b/code/replot_security.py index 9b615c8..76410f6 100644 --- a/code/replot_security.py +++ b/code/replot_security.py @@ -34,16 +34,16 @@ FIG.mkdir(exist_ok=True) plt.rcParams.update({ "font.family": "serif", "font.serif": ["DejaVu Serif", "Times New Roman"], - # The manuscript includes each result figure at 0.80 of a 3.455 in - # column while the canvas is 3.15 in, a printed scale of 0.878. Every + # The manuscript includes each result figure at 0.85 of a 3.455 in + # column while the canvas is 3.15 in, a printed scale of 0.933. Every # size below is therefore pre-divided by that scale so the PRINTED # sizes are 9 pt labels, 8 pt ticks and a 6.6 pt legend. Change the # include width and these must change with it. - "font.size": 10.3, - "axes.labelsize": 10.3, - "legend.fontsize": 7.5, - "xtick.labelsize": 9.1, - "ytick.labelsize": 9.1, + "font.size": 9.7, + "axes.labelsize": 9.7, + "legend.fontsize": 7.1, + "xtick.labelsize": 8.6, + "ytick.labelsize": 8.6, "axes.grid": True, "grid.linestyle": "--", "grid.linewidth": 0.4, @@ -204,7 +204,7 @@ def main_legit(snr_db="10"): def place_legend(ax, cands=("lower left", "upper left", "center left", "center right", "lower center", "upper right", "upper center", "center", "lower right"), - sizes=(7.5, 7.2, 7.0), ncol=1): + sizes=(7.1, 6.8, 6.6), ncol=1): """Choose the location and font size whose box the fewest curve points fall inside, scored on rendered geometry rather than guessed from the data. The size sweep is what makes a long label set placeable: a @@ -227,7 +227,7 @@ def place_legend(ax, cands=("lower left", "upper left", "center left", for loc in cands: leg = ax.legend(loc=loc, prop={"size": size}, ncol=ncol, handlelength=1.4, columnspacing=0.9, - handletextpad=0.5) + handletextpad=0.5, borderaxespad=0.55) ax.figure.canvas.draw() lb = _inflate(leg.get_window_extent(), ax.figure) hits = 0 @@ -249,11 +249,12 @@ def place_legend(ax, cands=("lower left", "upper left", "center left", if hits == 0: ax.legend(loc=loc, prop={"size": size}, ncol=ncol, handlelength=1.4, columnspacing=0.9, - handletextpad=0.5) + handletextpad=0.5, borderaxespad=0.55) PL_CHOSEN.append(size) return best ax.legend(loc=best[0], prop={"size": best[1]}, ncol=ncol, - handlelength=1.4, columnspacing=0.9, handletextpad=0.5) + handlelength=1.4, columnspacing=0.9, handletextpad=0.5, + borderaxespad=0.55) PL_CHOSEN.append(best[1]) return best diff --git a/fig/fig_sec_brute.pdf b/fig/fig_sec_brute.pdf index 4b25676..cc9785d 100644 Binary files a/fig/fig_sec_brute.pdf and b/fig/fig_sec_brute.pdf differ diff --git a/fig/fig_sec_jam.pdf b/fig/fig_sec_jam.pdf index 61f70de..4a64983 100644 Binary files a/fig/fig_sec_jam.pdf and b/fig/fig_sec_jam.pdf differ diff --git a/fig/fig_sec_keylen.pdf b/fig/fig_sec_keylen.pdf index 36ea4b4..e2c9a06 100644 Binary files a/fig/fig_sec_keylen.pdf and b/fig/fig_sec_keylen.pdf differ diff --git a/fig/fig_sec_kpa.pdf b/fig/fig_sec_kpa.pdf index 25f5b59..da0520b 100644 Binary files a/fig/fig_sec_kpa.pdf and b/fig/fig_sec_kpa.pdf differ diff --git a/fig/fig_sec_real.pdf b/fig/fig_sec_real.pdf index 5e32023..2070a6e 100644 Binary files a/fig/fig_sec_real.pdf and b/fig/fig_sec_real.pdf differ diff --git a/fig/fig_sec_sens.pdf b/fig/fig_sec_sens.pdf index ba094dd..6a2613d 100644 Binary files a/fig/fig_sec_sens.pdf and b/fig/fig_sec_sens.pdf differ diff --git a/fig/fig_sec_snr.pdf b/fig/fig_sec_snr.pdf index 3e9b465..05bf6c0 100644 Binary files a/fig/fig_sec_snr.pdf and b/fig/fig_sec_snr.pdf differ