From 4e820b60f9f4667fdfafa0a6718963fe4c1a0ff7 Mon Sep 17 00:00:00 2001 From: Gyorgy Szaszko Date: Fri, 20 Dec 2024 16:04:35 +0100 Subject: [PATCH] python: removed tight_layout from inet.scave.plot; disabled subplots_adjust in all anf files to eliminate warnings in showcases/examples; removed tight_layout from anf files in showcases --- examples/ethernet/TenBaseT1S/bestcase.anf | 5 ----- examples/ethernet/TenBaseT1S/mixed.anf | 2 -- examples/ethernet/TenBaseT1S/multidrop.anf | 2 -- examples/ethernet/TenBaseT1S/notraffic.anf | 5 ----- examples/ethernet/TenBaseT1S/paper.anf | 2 -- examples/ethernet/TenBaseT1S/validation.anf | 2 -- examples/ethernet/TenBaseT1S/worstcase.anf | 5 ----- examples/wireless/combo/Results.anf | 2 -- python/inet/scave/plot.py | 1 - .../gptpandtas/GptpAndTasShowcase.anf | 1 - showcases/tsn/combiningfeatures/gptpandtas/extras.anf | 1 - .../tsn/framepreemption/FramePreemptionShowcase.anf | 6 ------ showcases/tsn/gatescheduling/sat/SatShowcase.anf | 1 - .../clockdrift/ClockDriftShowcase.anf | 2 -- .../asynchronousshaper/AsynchronousShaperShowcase.anf | 10 ---------- .../tsn/trafficshaping/cbsandats/CbsAndAtsShowcase.anf | 2 -- .../tsn/trafficshaping/cbsandtas/CbsAndTasShowcase.anf | 4 ---- .../creditbasedshaper/CreditBasedShaperShowcase.anf | 8 -------- .../timeawareshaper/TimeAwareShaperShowcase.anf | 2 -- .../underthehood/PeekingUnderTheHoodShowcase.anf | 1 - .../directionalantennas/DirectionalAntennas.anf | 1 - showcases/wireless/fragmentation/Fragmentation.anf | 1 - showcases/wireless/qos/Qos.anf | 4 ---- showcases/wireless/ratecontrol/Ratecontrol.anf | 2 -- showcases/wireless/throughput/Throughput.anf | 2 -- 25 files changed, 74 deletions(-) diff --git a/examples/ethernet/TenBaseT1S/bestcase.anf b/examples/ethernet/TenBaseT1S/bestcase.anf index 893bbbd314c..a1607460c3e 100644 --- a/examples/ethernet/TenBaseT1S/bestcase.anf +++ b/examples/ethernet/TenBaseT1S/bestcase.anf @@ -676,7 +676,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1367,7 +1366,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2079,7 +2077,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2791,7 +2788,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -3503,7 +3499,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/mixed.anf b/examples/ethernet/TenBaseT1S/mixed.anf index b1d06baad61..7d995d478a5 100644 --- a/examples/ethernet/TenBaseT1S/mixed.anf +++ b/examples/ethernet/TenBaseT1S/mixed.anf @@ -679,7 +679,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1395,7 +1394,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/multidrop.anf b/examples/ethernet/TenBaseT1S/multidrop.anf index debdaa9315a..82788b62f16 100644 --- a/examples/ethernet/TenBaseT1S/multidrop.anf +++ b/examples/ethernet/TenBaseT1S/multidrop.anf @@ -678,7 +678,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1394,7 +1393,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/notraffic.anf b/examples/ethernet/TenBaseT1S/notraffic.anf index f93dc90b41c..d0b57f51424 100644 --- a/examples/ethernet/TenBaseT1S/notraffic.anf +++ b/examples/ethernet/TenBaseT1S/notraffic.anf @@ -676,7 +676,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1388,7 +1387,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2100,7 +2098,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2812,7 +2809,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -3524,7 +3520,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/paper.anf b/examples/ethernet/TenBaseT1S/paper.anf index f6ab2358818..6e1cb194c78 100644 --- a/examples/ethernet/TenBaseT1S/paper.anf +++ b/examples/ethernet/TenBaseT1S/paper.anf @@ -1750,7 +1750,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2442,7 +2441,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/validation.anf b/examples/ethernet/TenBaseT1S/validation.anf index cc05849b052..5ba8c21a704 100644 --- a/examples/ethernet/TenBaseT1S/validation.anf +++ b/examples/ethernet/TenBaseT1S/validation.anf @@ -44,7 +44,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -757,7 +756,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/ethernet/TenBaseT1S/worstcase.anf b/examples/ethernet/TenBaseT1S/worstcase.anf index 2ffe0179405..5b38a25b16d 100644 --- a/examples/ethernet/TenBaseT1S/worstcase.anf +++ b/examples/ethernet/TenBaseT1S/worstcase.anf @@ -676,7 +676,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1388,7 +1387,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2100,7 +2098,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2812,7 +2809,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -3524,7 +3520,6 @@ utils.plot_vectors_separate(df, props, sort=False) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/examples/wireless/combo/Results.anf b/examples/wireless/combo/Results.anf index 697217f27fe..b6275f5654e 100644 --- a/examples/wireless/combo/Results.anf +++ b/examples/wireless/combo/Results.anf @@ -45,7 +45,6 @@ for x, radio in enumerate(["Generic", "Apsk", "Ieee80211"]): utils.postconfigure_plot(props) -plt.subplots_adjust(0.05, 0.1, 0.98, 0.95, 0.25, 0.5) utils.export_image_if_needed(props) ]]> @@ -665,7 +664,6 @@ for x, radio in enumerate(["Generic", "Apsk", "Ieee80211"]): utils.postconfigure_plot(props) -plt.subplots_adjust(0.05, 0.1, 0.98, 0.95, 0.25, 0.5) utils.export_image_if_needed(props) ]]> diff --git a/python/inet/scave/plot.py b/python/inet/scave/plot.py index 7e992d0ff1e..f53642fb2d8 100644 --- a/python/inet/scave/plot.py +++ b/python/inet/scave/plot.py @@ -642,7 +642,6 @@ def setup(): args.update(_legend_loc_outside_args(loc)) args["frameon"] =utils._parse_optional_bool(get_prop("legend_border")) plt.legend(**args) - plt.tight_layout() def add_to_dataframe(df, style_tuple_list=None, default_dict=None, order=None): """ diff --git a/showcases/tsn/combiningfeatures/gptpandtas/GptpAndTasShowcase.anf b/showcases/tsn/combiningfeatures/gptpandtas/GptpAndTasShowcase.anf index b9748599c73..1b9834d15b8 100644 --- a/showcases/tsn/combiningfeatures/gptpandtas/GptpAndTasShowcase.anf +++ b/showcases/tsn/combiningfeatures/gptpandtas/GptpAndTasShowcase.anf @@ -7843,7 +7843,6 @@ inet.scave.plot.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/showcases/tsn/combiningfeatures/gptpandtas/extras.anf b/showcases/tsn/combiningfeatures/gptpandtas/extras.anf index 90ba1ab07cc..28a4a467318 100644 --- a/showcases/tsn/combiningfeatures/gptpandtas/extras.anf +++ b/showcases/tsn/combiningfeatures/gptpandtas/extras.anf @@ -2625,7 +2625,6 @@ inet.scave.plot.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/showcases/tsn/framepreemption/FramePreemptionShowcase.anf b/showcases/tsn/framepreemption/FramePreemptionShowcase.anf index 37804da2568..e5c0664b522 100644 --- a/showcases/tsn/framepreemption/FramePreemptionShowcase.anf +++ b/showcases/tsn/framepreemption/FramePreemptionShowcase.anf @@ -59,8 +59,6 @@ utils.postconfigure_plot(props) # modify legend plt.legend(ls.alternate_handles, ls.alternate_labels, markerscale=4, ncol=2, loc='lower left') -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -714,8 +712,6 @@ if add_rectangle: plt.legend(ls.alternate_handles, ls.alternate_labels, markerscale=4, ncol=2, loc=legend_loc) -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -1363,8 +1359,6 @@ legend_loc = 'upper right' plt.legend(ls.alternate_handles, ls.alternate_labels, markerscale=4, ncol=2, loc=legend_loc) -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> diff --git a/showcases/tsn/gatescheduling/sat/SatShowcase.anf b/showcases/tsn/gatescheduling/sat/SatShowcase.anf index 0af17453021..4c1304c0b26 100644 --- a/showcases/tsn/gatescheduling/sat/SatShowcase.anf +++ b/showcases/tsn/gatescheduling/sat/SatShowcase.anf @@ -735,7 +735,6 @@ inet.scave.plot.add_to_dataframe(df_sat, style_tuple_list, order=order) ax_list = inet.scave.plot.plot_vectors_separate_grouped([df_eager, df_sat], props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.07, right = 0.99, top = 0.95, bottom = 0.08, wspace=0.1, hspace=0.1) ax_list[0].set_xlabel("") diff --git a/showcases/tsn/timesynchronization/clockdrift/ClockDriftShowcase.anf b/showcases/tsn/timesynchronization/clockdrift/ClockDriftShowcase.anf index 8de8901f518..b0305ca9056 100644 --- a/showcases/tsn/timesynchronization/clockdrift/ClockDriftShowcase.anf +++ b/showcases/tsn/timesynchronization/clockdrift/ClockDriftShowcase.anf @@ -7250,7 +7250,6 @@ ax_gptp.legend(handles, labels, loc='upper left', title='gPTP') ax_gptp.set_ylabel("") -plt.subplots_adjust(left = 0.08, right = 0.98, top = 0.94, bottom = 0.1, wspace=0.2, hspace=0.1) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props) @@ -9217,7 +9216,6 @@ ax_rand.legend(handles, labels, loc='upper left', title='Random drift') ax_rand.set_ylabel("") -plt.subplots_adjust(left = 0.06, right = 0.98, top = 0.94, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props) diff --git a/showcases/tsn/trafficshaping/asynchronousshaper/AsynchronousShaperShowcase.anf b/showcases/tsn/trafficshaping/asynchronousshaper/AsynchronousShaperShowcase.anf index ab45637901d..0d181cafaba 100644 --- a/showcases/tsn/trafficshaping/asynchronousshaper/AsynchronousShaperShowcase.anf +++ b/showcases/tsn/trafficshaping/asynchronousshaper/AsynchronousShaperShowcase.anf @@ -712,8 +712,6 @@ plt.axhline(y=41.12, color='grey', linestyle='dashdot', linewidth=1) plt.legend(handles, labels, ncol=3) -#plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -2036,8 +2034,6 @@ utils.postconfigure_plot(props) plt.legend(handles, labels, ncol=3) -#plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -2693,8 +2689,6 @@ utils.postconfigure_plot(props) plt.legend(handles, labels, ncol=2) -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -3372,7 +3366,6 @@ ax1.set_ylim(0,60) ax2.set_ylim(0,60) ax3.set_ylim(0,640) -#plt.subplots_adjust(left = 0.07, right = 0.99, top = 0.95, bottom = 0.1, wspace=0.1, hspace=0.2) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props)]]> @@ -4050,7 +4043,6 @@ ax1.set_ylim(0,40) ax2.set_ylim(0,40) ax3.set_ylim(0,320) -#plt.subplots_adjust(left = 0.07, right = 0.99, top = 0.95, bottom = 0.1, wspace=0.1, hspace=0.2) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props)]]> @@ -6035,7 +6027,6 @@ ax_txstate.set_yticklabels(['idle', 'transmitting']) ax_gatestate_vi.set_yticklabels(['closed', 'open']) -plt.subplots_adjust(left = 0.1, right = 0.99, top = 0.95, bottom = 0.1, wspace=0.1, hspace=0.4) #for a in plt.gcf().axes: # xmin, xmax = a.get_xlim() @@ -6752,7 +6743,6 @@ ax_txstate.set_yticklabels(['idle', 'transmitting']) ax_gatestate_vi.set_yticklabels(['closed', 'open']) -plt.subplots_adjust(left = 0.1, right = 0.99, top = 0.95, bottom = 0.1, wspace=0.1, hspace=0.4) #for a in plt.gcf().axes: # xmin, xmax = a.get_xlim() diff --git a/showcases/tsn/trafficshaping/cbsandats/CbsAndAtsShowcase.anf b/showcases/tsn/trafficshaping/cbsandats/CbsAndAtsShowcase.anf index 119ec7d1e6b..b30d3eb82d2 100644 --- a/showcases/tsn/trafficshaping/cbsandats/CbsAndAtsShowcase.anf +++ b/showcases/tsn/trafficshaping/cbsandats/CbsAndAtsShowcase.anf @@ -61,8 +61,6 @@ plt.legend(handles, labels, ncol=3) plt.axhline(y=20.84, color='black', linestyle='dashdot', linewidth=0.5, zorder=-10) # shaper data rate plt.axhline(y=41.68, color='black', linestyle='dashdot', linewidth=0.5, zorder=-10) # shaper data rate -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> diff --git a/showcases/tsn/trafficshaping/cbsandtas/CbsAndTasShowcase.anf b/showcases/tsn/trafficshaping/cbsandtas/CbsAndTasShowcase.anf index 213cfe6d9c9..ec4ca169291 100644 --- a/showcases/tsn/trafficshaping/cbsandtas/CbsAndTasShowcase.anf +++ b/showcases/tsn/trafficshaping/cbsandtas/CbsAndTasShowcase.anf @@ -693,8 +693,6 @@ utils.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2587,8 +2585,6 @@ utils.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> diff --git a/showcases/tsn/trafficshaping/creditbasedshaper/CreditBasedShaperShowcase.anf b/showcases/tsn/trafficshaping/creditbasedshaper/CreditBasedShaperShowcase.anf index 0a392ae4bdd..f252050073f 100644 --- a/showcases/tsn/trafficshaping/creditbasedshaper/CreditBasedShaperShowcase.anf +++ b/showcases/tsn/trafficshaping/creditbasedshaper/CreditBasedShaperShowcase.anf @@ -61,8 +61,6 @@ handles, labels = inet.scave.plot.create_custom_legend(props, style_tuple_list=l plt.legend(handles, labels, ncol=2) -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> @@ -1344,7 +1342,6 @@ inet.scave.plot.plot_vectors_separate(df, props, global_style={'alpha': 0.5}, sh utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.07, right = 0.97, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -1985,7 +1982,6 @@ inet.scave.plot.plot_vectors_separate(df, props, share_axes='both') utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.07, right = 0.97, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -2630,7 +2626,6 @@ import matplotlib as mpl mpl.rcParams['savefig.transparent'] = True #workaround end -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -3270,7 +3265,6 @@ utils.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.07, right = 0.98, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) for a in plt.gcf().axes: xmin, xmax = a.get_xlim() @@ -4592,8 +4586,6 @@ legend_style = [('shaper outgoing', {'linestyle': '-', 'color': 'black'}), handles, labels = inet.scave.plot.create_custom_legend(props, legend_style) plt.legend(handles, labels, ncol=2) -plt.tight_layout() - utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) ]]> diff --git a/showcases/tsn/trafficshaping/timeawareshaper/TimeAwareShaperShowcase.anf b/showcases/tsn/trafficshaping/timeawareshaper/TimeAwareShaperShowcase.anf index 748e2600911..d5461ea318e 100644 --- a/showcases/tsn/trafficshaping/timeawareshaper/TimeAwareShaperShowcase.anf +++ b/showcases/tsn/trafficshaping/timeawareshaper/TimeAwareShaperShowcase.anf @@ -2639,7 +2639,6 @@ utils.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props)]]> @@ -3279,7 +3278,6 @@ utils.plot_vectors_separate(df, props) utils.postconfigure_plot(props) -plt.subplots_adjust(left = 0.05, right = 0.99, top = 0.9, bottom = 0.1, wspace=0.1, hspace=0.1) for a in plt.gcf().axes: xmin, xmax = a.get_xlim() diff --git a/showcases/tsn/trafficshaping/underthehood/PeekingUnderTheHoodShowcase.anf b/showcases/tsn/trafficshaping/underthehood/PeekingUnderTheHoodShowcase.anf index 0422ccb57e0..00e8718b958 100644 --- a/showcases/tsn/trafficshaping/underthehood/PeekingUnderTheHoodShowcase.anf +++ b/showcases/tsn/trafficshaping/underthehood/PeekingUnderTheHoodShowcase.anf @@ -92,7 +92,6 @@ for i in [0, 1, 2]: handles, labels = inet.scave.plot.create_custom_legend(props, style_tuple_list = [('shaper limit', {'linestyle': 'dashdot', 'color': 'grey'})], ax_list=[ax], handles=handles, labels=labels) ax.legend(handles, labels, loc=props['legend_placement']) -plt.subplots_adjust(left = 0.08, right = 0.99, top = 0.95, bottom = 0.1, wspace=0.1, hspace=0.1) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props) diff --git a/showcases/wireless/directionalantennas/DirectionalAntennas.anf b/showcases/wireless/directionalantennas/DirectionalAntennas.anf index bbb86e4b640..c37451bb35c 100644 --- a/showcases/wireless/directionalantennas/DirectionalAntennas.anf +++ b/showcases/wireless/directionalantennas/DirectionalAntennas.anf @@ -3860,7 +3860,6 @@ plt.xticks([0,60,120,180,240,300,360]) ax1.grid(linestyle='--') ax2.grid(linestyle='--') -plt.subplots_adjust(left = 0.1, right = 0.98, top = 0.93, bottom = 0.12, wspace=0.1, hspace=0.2) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) diff --git a/showcases/wireless/fragmentation/Fragmentation.anf b/showcases/wireless/fragmentation/Fragmentation.anf index 515b9bda939..b8fce1e3c1e 100644 --- a/showcases/wireless/fragmentation/Fragmentation.anf +++ b/showcases/wireless/fragmentation/Fragmentation.anf @@ -3344,7 +3344,6 @@ utils.postconfigure_plot(props) plt.grid(linestyle='--') plt.legend(ncol=4, markerscale=2) -plt.tight_layout(pad=0) utils.export_image_if_needed(props) #utils.export_data_if_needed(df, props) diff --git a/showcases/wireless/qos/Qos.anf b/showcases/wireless/qos/Qos.anf index 8283ef66fd5..fbba0a5e890 100644 --- a/showcases/wireless/qos/Qos.anf +++ b/showcases/wireless/qos/Qos.anf @@ -40,7 +40,6 @@ utils.postconfigure_plot(props) plt.legend(markerscale=4, loc=2) plt.grid(linestyle='--') -plt.tight_layout() utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) @@ -675,7 +674,6 @@ utils.postconfigure_plot(props) plt.yticks([0, 0.5, 1, 1.5, 2]) plt.legend(markerscale=4, loc=2) plt.grid(linestyle='--') -plt.tight_layout() utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) @@ -4618,7 +4616,6 @@ inet.scave.plot.fix_labels_for_subplots([ax1, ax2], props, 'horizontal', remove_ ax1.legend(loc=1, ncol=4, handletextpad=0.1, columnspacing=0.1, markerscale=3) ax2.legend(loc=1, ncol=4, handletextpad=0.1, columnspacing=0.1, markerscale=3) -plt.tight_layout(pad=1.5) ax1.grid(linestyle='--') ax2.grid(linestyle='--') @@ -4645,7 +4642,6 @@ ax2.callbacks.connect('ylim_changed', on_ylims_change) on_ylims_change(ax1) on_ylims_change(ax2) -plt.subplots_adjust(left = 0.1, right = 0.98, top = 0.87, bottom = 0.12, wspace=0.1, hspace=0.2) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) diff --git a/showcases/wireless/ratecontrol/Ratecontrol.anf b/showcases/wireless/ratecontrol/Ratecontrol.anf index 3fd2aca3653..3f1b0a25be2 100644 --- a/showcases/wireless/ratecontrol/Ratecontrol.anf +++ b/showcases/wireless/ratecontrol/Ratecontrol.anf @@ -39,7 +39,6 @@ utils.plot_vectors(df, props) utils.postconfigure_plot(props) -plt.tight_layout(pad=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) @@ -1303,7 +1302,6 @@ utils.plot_vectors(df, props) utils.postconfigure_plot(props) -plt.tight_layout(pad=0.1) utils.export_image_if_needed(props) utils.export_data_if_needed(df, props) diff --git a/showcases/wireless/throughput/Throughput.anf b/showcases/wireless/throughput/Throughput.anf index 1bb6e65ecde..5043a874387 100644 --- a/showcases/wireless/throughput/Throughput.anf +++ b/showcases/wireless/throughput/Throughput.anf @@ -111,8 +111,6 @@ plt.xticks([6,9,12,18,24,36,48,54]) ax2.set_zorder(0) -plt.tight_layout() - ax = plt.gca() handles, labels = ax.get_legend_handles_labels() inet.scave.plot.create_custom_legend(props)