v04 update

README.md

@@ -4,7 +4,7 @@
 </a>
 <h3 align="center">OpenCV Webcam Script</h3>
 <p align="center">
-    基于OpenCV的Webcam程序，适用于视频帧采集、计算机视觉数据收集等。具有安装便捷、操作简单、跨平台等特点
+    基于OpenCV的Webcam程序，适用于实时视频帧采集、计算机视觉数据收集等。具有安装便捷、操作简单、跨平台等特点
 </p>
 </p>
 

opencv_webcam.py

@@ -189,7 +189,7 @@ def webcam_opencv(device_index="0",
     print(f'程序结束！')
     e_time = time.time()  # 终止时间
     total_time = e_time - s_time  # 程序用时
-    outTimeMsg = f'用时：{round(total_time/time_list[0], 3)}秒, {round(total_time/time_list[1], 3)}分, {round(total_time/time_list[2], 3)}小时'
+    outTimeMsg = f'用时：{total_time/time_list[0]:.3f}秒, {total_time/time_list[1]:.3f}分, {total_time/time_list[2]:.3f}小时'
     print(outTimeMsg)
     log_management(f'{outTimeMsg}\n', logName, logMode)  # 记录用时
 

utils/compress.py

@@ -33,7 +33,7 @@ def webcam_compress(compressStyle, is_autoCompressName, compressName, preCompres
     file_tqdm = tqdm(file_list)  # 获取进度条
 
     # ----------压缩开始----------
-    compress_startTime = time.time() # 压缩开始时间
+    compress_startTime = time.time()  # 压缩开始时间
     if (compressStyle == COMPRESS_SUFFIX[0]):
         # zip压缩
         compress_file = zipfile.ZipFile(compressName, compressMode)
@@ -52,7 +52,7 @@ def webcam_compress(compressStyle, is_autoCompressName, compressName, preCompres
 
     # ----------压缩结束----------
     compress_file.close()
-    compress_endTime = time.time() # 压缩结束时间
+    compress_endTime = time.time()  # 压缩结束时间
     compress_totalTime = compress_endTime - compress_startTime
     # print(f'文件压缩成功！用时：{time_format(compress_totalTime)}，已保存在：{compressName}')
-    print(f'文件压缩成功！用时：{round(compress_totalTime, 3)}秒，已保存在：{compressName}')
+    print(f'文件压缩成功！用时：{compress_totalTime:.3f}秒，已保存在：{compressName}')

utils/time_format.py

@@ -1,34 +1,58 @@
-# # 时间格式化
-# # 创建人：曾逸夫
-# # 创建时间：2022-01-19
+# 时间格式化
+# 创建人：曾逸夫
+# 创建时间：2022-01-19
 
-# import sys
+import sys
 
 
-# def is_time(preTime):
-#     if (preTime <= 0):
-#         print(f'时间格式不正确！程序结束！')
-#         sys.exit()
+# 判断时间格式
+def is_time(preTime):
+    if (preTime <= 0):
+        print(f'时间格式不正确！程序结束！')
+        sys.exit()
 
 
-# def time_format(preTime):
-#     is_time(preTime)
-#     m, s = divmod(preTime, 60)
-#     h, m = divmod(m, 60)
-#     s = round(s, 3)
-#     time_dict = {s:'秒', m:'分', h:'时'}
-#     aaa = ""
-#     for k, v in time_dict.items():
-#         if (k != 0):
-#            aaa += f'{k}{v} ' 
-#     # print(f'{h}小时{m}分{s}秒')
-#     for i in range(len(time_list)):
-        
-#     return f'{time_list[2]}小时{time_list[1]}分{time_list[0]}秒'
+# 时间格式化
+def time_format(preTime):
+    is_time(preTime)
+    m, s = divmod(preTime, 60)
+    h, m = divmod(m, 60)
+    s = round(s, 3)
+
+    if (0 < s < 1):
+        time_str = f'{s:.3f}秒'
+        print(time_str)
+        return time_str
+    elif (h == 0 and m == 0 and s >= 1):
+        time_str = f'{s}秒'
+        print(time_str)
+        return time_str
+    elif (h == 0 and m > 0):
+        time_str = f'{m}分{s}秒'
+        print(time_str)
+        return time_str
+    elif (h > 0):
+        if (h >= 24):
+            h = int(h / 24)
+            time_str = f'{h}天{m}分{s}秒'
+        else:
+            time_str = f'{h}时{m}分{s}秒'
+        print(time_str)
+        return time_str
+    else:
+        print(f'时间格式化失败！程序结束！')
+        sys.exit()
 
 
-# if __name__ == '__main__':
-#     # time_test = 3600*24 + 1000
-#     time_test = 0.52312
-#     # time_test = 5000
-#     time_format(time_test)
+if __name__ == '__main__':
+    # time_test = 0.52362
+    # time_test = 50
+    # time_test = 90
+    # time_test = 5000
+    # time_test = 3600*24 + 1000
+
+    time_format(0.52362)
+    time_format(50)
+    time_format(90)
+    time_format(5000)
+    time_format(3600*24 + 1000)