mod light_list with clamp_list

analysis_db.py

@@ -16,9 +16,9 @@ def read_db(db_file):
     return read_section(db_name, 'tb_section', '')
 
 
-def read_section(db_name, tb_name='tb_section', section_id=''):
+def read_section(db_name, tb_name='tb_section'):
     res_fig = None
-    debug_print('read_section, db_name = ', db_name, ', tb_name = ', tb_name, ', section_id = ', section_id)
+    debug_print('read_section, db_name = ', db_name, ', tb_name = ', tb_name)
     conn = sqlite3.connect(db_name)
 
     if not tb_name:
@@ -28,22 +28,34 @@ def read_section(db_name, tb_name='tb_section', section_id=''):
         print('table_names = ', str(table_names))
         return
 
-    if not section_id:
-        section_cursor = conn.execute(' SELECT section_id, section_date, section_end_date FROM ' + tb_name)
-        for section_row in section_cursor:
-            section_id = section_row[0]
-            section_date = section_row[1]
-            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))
+    section_cursor = conn.execute(' SELECT section_id, section_date, section_end_date, section_mark FROM ' + tb_name)
+    for section_row in section_cursor:
+        section_id = section_row[0]
+        section_date = section_row[1]
+        section_end_date = section_row[2]
+        section_mark = section_row[3]
+        if section_mark == -1:
+            print('section_id = ', section_id, ', section_date = ', str(section_date), ', section_end_date = ',
+                  str(section_end_date))
             res_fig = read_sample(conn, section_id, tb_name)
-    else:
-        res_fig = read_sample(conn, section_id, tb_name)
-
     conn.close()
+
     return res_fig
 
 
+def clamp(_value, _min, _max):
+    if _value < _min:
+        return _min
+    elif _value > _max:
+        return _max
+    else:
+        return _value
+
+
+def clamp_list(_list, _min, _max):
+    return [clamp(x, _min, _max) for x in _list]
+
+
 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)
@@ -86,12 +98,12 @@ def read_sample(conn, section_id, tb_name):
         title_str = str(section_id) + ', ' + str(format_date(section_date)) + ', ' + str(format_date(section_end_date))
 
         if len(light_list) > 0:
-            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)
-        return draw_lists(title_str, date_list, max=max_list, min=min_list, acc=acc_list, screen=screen_list,
-                          light=light_list)
+            light_list = clamp_list(light_list, 0, 100)
+
+        if len(screen_list) > 0:
+            screen_list = min_max_list(screen_list, 1, 11)
+
+        return draw_lists(title_str, date_list, max=max_list, min=min_list, acc=acc_list, light=light_list, screen=screen_list)
 
 
 if __name__ == '__main__':
@@ -105,5 +117,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_section(db_uri, tb_name, section_id)
+    read_section(db_uri, tb_name)