upload

Former-commit-id: 3af1a19b5b0e0bb4dbc367468b36c62aa8762a91

main.py

@@ -5,8 +5,9 @@ import numpy as np
 import ch340
 import atexit
 import utils
-from utils import State, History
+from utils import State, History,login_to_platform,send_data_to_platform
 from scipy.signal import find_peaks
+import tkinter as tk
 
 
 class MAT:
@@ -121,14 +122,14 @@ class MAT:
                 self.control_logger.info(f"检测到about，进入about模式，当前体积: {val:.2f} ml")
         
         # 3. end：返回colored，置end_check标记开始检查
-        elif ret == "colored":
-            if not self.state.in_end_check:
-                self.state.enter_end_check(now)
-                if self.colored_volume is None:
-                    self.colored_volume = val
-                    self.colored_time = now
-                    self.colored_im = im.copy()
-                self.endpoint_logger.info(f"检测到colored，开始end检查，记录体积: {val:.2f} ml")
+        # elif ret == "colored":
+        #     if not self.state.in_end_check:
+        #         self.state.enter_end_check(now)
+        #         if self.colored_volume is None:
+        #             self.colored_volume = val
+        #             self.colored_time = now
+        #             self.colored_im = im.copy()
+        #         self.endpoint_logger.info(f"检测到colored，开始end检查，记录体积: {val:.2f} ml")
           # === 状态检查逻辑 ===
         
         # middle检查: 进入middle的bounce_time后，在最近bounce_time内middle比例<70%返回fast状态
@@ -172,14 +173,21 @@ class MAT:
         return ret
     
     def end_check(self,dep=0):
+        if not self.running:
+            return "colored"
+        if dep == 1:
+            suc,im = self.cap.read()
+            name = f"colored_{datetime.now().strftime('%Y%m%d_%H%M%S')}.jpg"
+            cv2.imwrite(name,im)
+            self.colored_im = name
         if dep > 5:
             # self.endpoint_logger.info(f"colored比例{.2%}>=70%，确认滴定终点")
             self.colored_volume = self.total_volume
             self.endpoint_logger.info(f"最终体积: {self.colored_volume:.2f} ml")
             self.running = False
             self.ch340.stop()
-            if self.colored_im is not None:
-                cv2.imwrite(f"colored_{datetime.now().strftime('%Y%m%d_%H%M%S')}.jpg", self.colored_im)
+            # if self.colored_im is not None:
+            #     cv2.imwrite(f"colored_{datetime.now().strftime('%Y%m%d_%H%M%S')}.jpg", self.colored_im)
             return "colored"
         suc,im = self.cap.read()
         hsv = cv2.cvtColor(im, cv2.COLOR_BGR2HSV)
@@ -208,7 +216,8 @@ class MAT:
                 cv2.imshow("Frame", im)
             return self.end_check(dep+1)
             # time.sleep(2)
-        else:  
+        else:
+            self.colored_im = None
             return dep
     
     def _display_status(self, im, detection_result, rate, volume):
@@ -258,7 +267,9 @@ class MAT:
         if hasattr(self, 'capFile') and self.capFile.isOpened():
             self.capFile.release()
         cv2.destroyAllWindows()
-        
+    
+    def format_date_time(self, timestamp):
+        return datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d %H:%M:%S")
 
     def run(self, quick_speed=0.2, slow_speed=0.05, end_speed=0.02, mid_time=0.5, about_time=1, cap_dir="Videos"):
         self.running = True
@@ -266,6 +277,8 @@ class MAT:
         self.speeds = [quick_speed, slow_speed, end_speed, 1.0]
         self.need_check = False
         self.edited = False
+        self.volume_list = []
+        self.color_list = []
         
         if cap_dir is not None:
             vid_name = f"{cap_dir}/{datetime.now().strftime('%Y%m%d_%H%M%S')}.mkv"
@@ -346,12 +359,23 @@ class MAT:
                         self.volume_logger.info(f"当前体积: {self.total_volume:.2f} ml, 加入速度: {speed:.2f} ml/次")
                         self.ch340_push(speed)
                         self.total_volume += speed
+                        self.volume_list.append(round(self.total_volume,2))
+                        try:
+                            self.color_list.append(self.state.mode.name)
+                        except Exception as e:
+                            self.control_logger.error(f"报表失败: {e}")
 
             # if (self.state.is_about_mode() and time.time() - self.ch340.start > end_time) or not self.state.is_about_mode():
             if self._pred() is None:
                 self.control_logger.error("预测失败，跳过当前帧")
                 continue
         
+        # try:
+        #     self.control_logger.info("推送安全体积")
+        #     self.ch340_push(0.15)
+        # except Exception as e:
+        #     self.control_logger.error(f"推送失败: {e}")
+        
         # 释放视频录制器
         if hasattr(self, 'capFile') and self.capFile.isOpened():
             self.capFile.release()
@@ -364,27 +388,42 @@ class MAT:
             "理论体积": f"{self.colored_volume:.2f} ml",
             "实验时长": f"{time.time() - self.start_time:.2f} 秒"
         }
+        upload_data = {
+            "start_time":self.format_date_time(self.start_time),
+            "end_time":self.format_date_time(time.time()),
+            "volume_record": f'{self.volume_list}',
+            'voltage_record': f'{[]}',
+            'color_record': f'{self.color_list}',
+            'final_volume': f'{self.colored_volume}',
+        }
         self.system_logger.info("实验结果:")
         for key, value in experiment_results.items():
             self.system_logger.info(f"  {key}: {value}")
 
+        return upload_data, self.colored_im
 
 if __name__ == "__main__":
+    token = login_to_platform("13504022184","password")
+    
     # 创建MAT类的实例并运行
     mat = MAT(
         videoSourceIndex = 1, 
         bounce_time=4,
         end_bounce_time=0.01,
-        k = 34
+        k = 27
     )
     
     mat.state.mode = State.Mode.FAST
     
-    mat.run(
+    final_data, finish_picture = mat.run(
         slow_speed = 0.05,
         quick_speed = 0.8,
         about_time=3,
         # cap_dir=None
     )
+    with open("log.json","w") as f:
+        import json
+        json.dump(final_data, f, indent=4)
+    send_data_to_platform(token, final_data, finish_picture)