draw screen_list with up_down_list

.gitignore

@@ -1,2 +1,3 @@
 /.idea
+/.doc
 /__pycache__

analysis_db.py

@@ -6,7 +6,7 @@ from draw_db import draw, draw_two, draw_three
 from date_util import format_date
 
 
-def read_db(db_name, tb_name='tb_section', section_id=''):
+def read_section(db_name, tb_name='tb_section', section_id=''):
     debug_print('read_db, db_name = ', db_name, ', tb_name = ', tb_name, ', section_id = ', section_id)
     conn = sqlite3.connect(db_name)
 
@@ -25,9 +25,15 @@ def read_db(db_name, tb_name='tb_section', section_id=''):
             section_end_date = section_row[2]
             print('section_id = ', section_id, ', section_date = ', format_date(section_date), ', section_end_date = ',
                   format_date(section_end_date))
-        return
+            read_sample(conn, section_id, tb_name)
+    else:
+        read_sample(conn, section_id, tb_name)
+
+    conn.close()
 
-    sql_str = ' SELECT section_id, _sample_id, _sample_end_id, section_date, section_end_date FROM ' + tb_name + ' WHERE section_id == ' + 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)
     section_cursor = conn.execute(sql_str)
     for section_row in section_cursor:
         section_id = section_row[0]
@@ -42,7 +48,10 @@ def read_db(db_name, tb_name='tb_section', section_id=''):
         max_list = []
         min_list = []
         acc_list = []
-        sample_sql = "SELECT _id, date, max, min, acc_max_dx, acc_max_dy, acc_max_dz FROM sample_table WHERE _id >= " + str(_sample_id) + ' AND ' + ' _id <= ' + str(_sample_end_id)
+        light_list = []
+        screen_list = []
+        sample_sql = "SELECT _id, date, max, min, acc_max_dx, acc_max_dy, acc_max_dz, avg, max_snoring FROM sample_table WHERE _id >= " + str(
+            _sample_id) + ' AND ' + ' _id <= ' + str(_sample_end_id)
         sample_cursor = conn.execute(sample_sql)
         for sample_row in sample_cursor:
             _id = sample_row[0]
@@ -50,12 +59,16 @@ def read_db(db_name, tb_name='tb_section', section_id=''):
             max = sample_row[2]
             min = sample_row[3]
             acc_max = sample_row[4] + sample_row[5] + sample_row[6]
-            debug_print('_id = ', _id,  'date = ', format_date(date))
+            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)
             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))
@@ -63,9 +76,7 @@ def read_db(db_name, tb_name='tb_section', section_id=''):
         # 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)
-
-    conn.close()
+        draw_three(title_str, date_list, max_list, min_list, acc_list, light_list, screen_list)
 
 
 if __name__ == '__main__':
@@ -80,4 +91,4 @@ if __name__ == '__main__':
     db_uri = argv[0] if argc >= 1 else ''
     tb_name = argv[1] if argc >= 2 else ''
     section_id = argv[2] if argc >= 3 else ''
-    read_db(db_uri, tb_name, section_id)
+    read_section(db_uri, tb_name, section_id)

debug.py

@@ -1,5 +1,5 @@
-# DEBUG = True
-DEBUG = False
+DEBUG = True
+# DEBUG = False
 
 
 def debug_print(self, *args, sep=' ', end='\n', file=None):

draw_db.py

@@ -1,4 +1,6 @@
 import matplotlib.pyplot as plt
+
+import debug
 from debug import debug_print
 
 
@@ -20,24 +22,41 @@ def draw_two(title='', x_list1=None, x_list2=None):
     plt.show()
 
 
-def draw_three(title='', date_list=None, x_list1=None, x_list2=None, x_list3=None):
+def up_down_list(list):
+    min_value = min(list)
+    max_value = max(list)
+    return [-(x - min_value) + max_value for x in list]
+
+
+def draw_three(title='', date_list=None, x_list1=None, x_list2=None, x_list3=None, light_list=None, screen_list=None):
     debug_print('draw_three, date_list = ', str(date_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)
+
     fig, ax = plt.subplots()
     if date_list is None:
-        ax.plot(x_list1)
-        ax.plot(x_list2)
-        ax.plot(x_list3)
+        ax.plot(screen_list, label='screen', color='darkgrey')
+        ax.plot(light_list, label='light', color='lightgrey')
+        ax.plot(x_list1, label='max', color='blue')
+        ax.plot(x_list2, label='min', color='orange')
+        ax.plot(x_list3, label='acc', color='green')
     else:
-        ax.plot(date_list, x_list1)
-        ax.plot(date_list, x_list2)
-        ax.plot(date_list, x_list3)
+        ax.plot(date_list, screen_list, label='screen', color='darkgrey')
+        ax.plot(date_list, light_list, label='light', color='lightgrey')
+        ax.plot(date_list, x_list1, label='max', color='blue')
+        ax.plot(date_list, x_list2, label='min', color='orange')
+        ax.plot(date_list, x_list3, label='acc', color='green')
     ax.legend()
     plt.gcf().autofmt_xdate()
 
-    plt.ylim(ymin=0, ymax=120)
+    plt.ylim(ymin=-10, ymax=130)
     plt.title(title)
-    # plt.show()
 
-    file_uri = '.doc/' + title + '.png'
-    plt.savefig(file_uri)
+    if debug.DEBUG:
+        plt.show()
+    else:
+        file_uri = '.doc/' + title + '.png'
+        plt.savefig(file_uri)