clean code

analysis_db.py

@@ -1,9 +1,9 @@
 import sqlite3
 import sys
 
-from debug import debug_print
-from draw_db import draw, draw_two, draw_three
-from date_util import format_date
+from util.debug import debug_print
+from draw_db import draw_lists, min_max_list, up_down_list
+from util.date_util import format_date
 
 
 def read_section(db_name, tb_name='tb_section', section_id=''):
@@ -33,7 +33,8 @@ def read_section(db_name, tb_name='tb_section', section_id=''):
 
 
 def read_sample(conn, section_id, tb_name):
-    sql_str = ' SELECT section_id, _sample_id, _sample_end_id, section_date, section_end_date FROM ' + str(tb_name) + ' WHERE section_id == ' + str(section_id)
+    sql_str = ' SELECT section_id, _sample_id, _sample_end_id, section_date, section_end_date FROM ' + str(
+        tb_name) + ' WHERE section_id == ' + str(section_id)
     section_cursor = conn.execute(sql_str)
     for section_row in section_cursor:
         section_id = section_row[0]
@@ -56,27 +57,26 @@ def read_sample(conn, section_id, tb_name):
         for sample_row in sample_cursor:
             _id = sample_row[0]
             date = sample_row[1]
-            max = sample_row[2]
-            min = sample_row[3]
+            _max = sample_row[2]
+            _min = sample_row[3]
             acc_max = sample_row[4] + sample_row[5] + sample_row[6]
             light = sample_row[7]
             screen = sample_row[8]
             debug_print('_id = ', _id, 'date = ', format_date(date))
 
             date_list.append(format_date(date))
-            max_list.append(max)
-            min_list.append(min)
+            max_list.append(_max)
+            min_list.append(_min)
             acc_list.append(acc_max)
             light_list.append(light)
             screen_list.append(screen)
 
-        # debug_print('max_list = ', str(max_list))
-        # debug_print('min_list = ', str(min_list))
-        # debug_print('acc_list = ', str(acc_list))
-        # draw(max_list)
         title_str = str(section_id) + ', ' + str(format_date(section_date)) + ', ' + str(format_date(section_end_date))
-        # draw_two(title_str, max_list, min_list)
-        draw_three(title_str, date_list, max_list, min_list, acc_list, light_list, screen_list)
+        light_min = min(light_list)
+        light_max = max(light_list)
+        screen_list = min_max_list(screen_list, light_min, light_max)
+        screen_list = up_down_list(screen_list)
+        draw_lists(title_str, date_list, max=max_list, min=min_list, acc=acc_list, screen=screen_list, light=light_list)
 
 
 if __name__ == '__main__':

date_util.py

@@ -1,16 +0,0 @@
-from datetime import datetime
-
-from numpy.compat import long
-
-
-def format_date(section_date):
-    # formatted_date = datetime.fromtimestamp(section_date).strftime('%Y-%m-%d %H:%M:%S')
-    return datetime.fromtimestamp(section_date / 1000)
-
-    # # 使用datetime.strptime解析原始日期字符串
-    # date_obj = datetime.strptime(section_date, "%Y%m%d%H%M")
-    #
-    # # 使用strftime将日期对象格式化为新的格式
-    # formatted_date = date_obj.strftime("%Y%m%d %H:%M")
-    #
-    # return formatted_date

draw_db.py

@@ -1,25 +1,8 @@
-import matplotlib.pyplot as plt
-
-import debug
-from debug import debug_print
-
-
-def draw(x_points=None, y_points=None):
-    plt.plot(x_points)
-
-    plt.ylim(ymin=0, ymax=120)
-    plt.show()
-
+import math
 
-def draw_two(title='', x_list1=None, x_list2=None):
-    fig, ax = plt.subplots()
-    ax.plot(x_list1)
-    ax.plot(x_list2)
-    ax.legend()
+import matplotlib.pyplot as plt
 
-    plt.ylim(ymin=0, ymax=120)
-    plt.title(title)
-    plt.show()
+from util.debug import debug_print
 
 
 def up_down_list(_list):
@@ -33,46 +16,30 @@ def min_max_list(src_list, tar_min, tar_max):
     src_max = max(src_list)
     src_range = abs(src_max - src_min)
     tar_range = abs(tar_max - tar_min)
-    scale_ratio = tar_range / src_range
+    scale_ratio = 0 if src_range == 0 else tar_range / src_range
     floor_up = [v - src_min for v in src_list]
     scale_to = [v * scale_ratio for v in floor_up]
     floor_down = [v + tar_min for v in scale_to]
     return floor_down
 
 
-def draw_three(title='', date_list=None, x_list1=None, x_list2=None, x_list3=None, light_list=None, screen_list=None):
+def draw_lists(title='', date_list=None, **kv_list):
     debug_print('draw_three, date_list = ', str(date_list))
-    debug_print('draw_three, light_list = ', str(light_list))
-
-    if screen_list is not None:
-        screen_list = [(x - 2) * 4 for x in screen_list]
-        screen_list = up_down_list(screen_list)
-        # screen_list = map(lambda x: (x - 2) * 4, screen_list)
-
-    if light_list is not None:
-        light_list2 = min_max_list(light_list, -20, -10)
-
-    fig, axs = plt.subplots(2, 1, sharex=True)
-    # axs[0].axes.get_xaxis().set_visible(False)
-    if date_list is None:
-        axs[0].plot(x_list1, label='max', color='blue')
-        axs[0].plot(x_list2, label='min', color='orange')
-        axs[0].plot(x_list3, label='acc', color='green')
-        axs[1].plot(screen_list, label='screen')
-        axs[1].plot(light_list, label='light')
-    else:
-        axs[0].plot(date_list, x_list1, label='max', color='blue')
-        axs[0].plot(date_list, x_list2, label='min', color='orange')
-        axs[0].plot(date_list, x_list3, label='acc', color='green')
-        axs[1].plot(date_list, screen_list, label='screen')
-        axs[1].plot(date_list, light_list, label='light')
-
-    plt.gcf().autofmt_xdate()
-    # plt.ylim(ymin=-30, ymax=20000)
-    # plt.title(title)
+    # debug_print('draw_three, light_list = ', str(light_list))
+
+    idx_list = 0
+    idx_axs = 0
+    rows = math.ceil(len(kv_list.items()) / 3)
+    fig, axs = plt.subplots(rows, 1, sharex=True)
+    for key, value in kv_list.items():
+        if type(key) is str and type(value) is list:
+            axs[idx_axs].plot(date_list, value, label=key)
+            axs[idx_axs].legend()
+        idx_list = idx_list + 1
+        idx_axs = int(idx_list / 3)
 
     if debug.DEBUG:
         plt.show()
     else:
         file_uri = '.doc/' + title + '.png'
-        plt.savefig(file_uri)
+        fig.savefig(file_uri)

util/date_util.py

@@ -1,11 +1,16 @@
 from datetime import datetime
 
+from numpy.compat import long
 
-def format_date(section_date):
-    # 使用datetime.strptime解析原始日期字符串
-    date_obj = datetime.strptime(section_date, "%Y%m%d%H%M")
 
-    # 使用strftime将日期对象格式化为新的格式
-    formatted_date = date_obj.strftime("%Y%m%d %H:%M")
+def format_date(section_date):
+    # formatted_date = datetime.fromtimestamp(section_date).strftime('%Y-%m-%d %H:%M:%S')
+    return datetime.fromtimestamp(section_date / 1000)
 
-    return formatted_date
+    # # 使用datetime.strptime解析原始日期字符串
+    # date_obj = datetime.strptime(section_date, "%Y%m%d%H%M")
+    #
+    # # 使用strftime将日期对象格式化为新的格式
+    # formatted_date = date_obj.strftime("%Y%m%d %H:%M")
+    #
+    # return formatted_date