From 364e9c035b72d9ae513a0fc9a48ab91622a59594 Mon Sep 17 00:00:00 2001 From: czm180 Date: Sat, 16 Dec 2023 15:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=A2=9C=E8=89=B2=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/export.py | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/utils/export.py b/utils/export.py index 706cf511..44a4ea95 100644 --- a/utils/export.py +++ b/utils/export.py @@ -668,38 +668,17 @@ def draw_block(self, img: Image.Image, index: int, _nodename_width, _key_list, _ for i, t1 in enumerate(_key_list): if "RTT延迟" == t1 or "HTTP(S)延迟" == t1: rtt = float(self.info[t1][t][:-2]) - if interval[0] < rtt < interval[1]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[0], end_color=end_color[0], - alpha=alphas[0]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[1] <= rtt < interval[2]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[1], end_color=end_color[1], - alpha=alphas[1]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[2] <= rtt < interval[3]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[2], end_color=end_color[2], - alpha=alphas[2]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[3] <= rtt < interval[4]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[3], end_color=end_color[3], - alpha=alphas[3]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[4] <= rtt < interval[5]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[4], end_color=end_color[4], - alpha=alphas[4]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[5] <= rtt < interval[6]: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[5], end_color=end_color[5], - alpha=alphas[5]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif interval[6] <= rtt: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[6], end_color=end_color[6], - alpha=alphas[6]) - img.alpha_composite(block, (width, 60 * (t + 2))) - elif rtt == 0: - block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[7], end_color=end_color[7], + for colo_int in range(0, len(colorvalue)): + if interval[colo_int] < rtt < interval[colo_int + 1]: + block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[colo_int], end_color=end_color[colo_int], + alpha=alphas[0]) + img.alpha_composite(block, (width, 60 * (t + 2))) + break + elif rtt == 0: + block = c_block_grad((_info_list_width[i], 60), color_value=colorvalue[len(colorvalue)], end_color=end_color[len(colorvalue)], alpha=alphas[7]) - img.alpha_composite(block, (width, 60 * (t + 2))) + img.alpha_composite(block, (width, 60 * (t + 2))) + break def draw_delay(self, img, t1: str, t: int, info_list_length, speedblock_height): pass