Procházet zdrojové kódy

fix(修复两个bug)

wzh před 4 měsíci
rodič
revize
0db2c98248
2 změnil soubory, kde provedl 17 přidání a 17 odebrání
  1. 12 12
      app.py
  2. 5 5
      pixel_to_lonlat.py

+ 12 - 12
app.py

@@ -14,19 +14,19 @@ from video_location import process_geojson_for_frontend
 from pixel_to_lonlat import pixel_to_lonlat
 import logging
 # 配置全局日志
-logging.basicConfig(
-    filename='app.log',  # 日志文件
-    level=logging.INFO,  # 记录 DEBUG 及以上级别日志
-    format='%(asctime)s [%(levelname)s] %(name)s: %(message)s'
-)
 # logging.basicConfig(
-#     level=logging.INFO,
-#     format='%(asctime)s [%(levelname)s] %(name)s: %(message)s',
-#     handlers=[
-#         logging.FileHandler('app.log'),  # 日志文件
-#         logging.StreamHandler()  # 控制台输出
-#     ]
+#     filename='app.log',  # 日志文件
+#     level=logging.INFO,  # 记录 DEBUG 及以上级别日志
+#     format='%(asctime)s [%(levelname)s] %(name)s: %(message)s'
 # )
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s [%(levelname)s] %(name)s: %(message)s',
+    handlers=[
+        logging.FileHandler('app.log'),  # 日志文件
+        logging.StreamHandler()  # 控制台输出
+    ]
+)
 
 print("app init")
 
@@ -80,7 +80,7 @@ def parseLocation():
     camera_params = data.get("camera_params")
     current_ptz_params = data.get("current_ptz_params")
     for point in all_calibration_data:
-        res = pixel_to_lonlat(point['u'], point['v'], camera_params, current_ptz_params)
+        res = pixel_to_lonlat(int(point['u']), int(point['v']), camera_params, current_ptz_params)
         points.append(res)
     code = 0
     return jsonify({"code" : code,"points" : points})

+ 5 - 5
pixel_to_lonlat.py

@@ -24,11 +24,11 @@ def pixel_to_lonlat(u, v, camera_params, ptz_params):
         tuple: (经度, 纬度) 或 (None, None) 如果计算失败
     """
     # --- 1. 解包所有已知参数 ---
-    res_w, res_h = camera_params['resolution_w'], camera_params['resolution_h']
-    cam_lon, cam_lat = camera_params['cam_lon'], camera_params['cam_lat']
-    cam_height, hfov = camera_params['height'], camera_params['hfov']
-    north_p = camera_params['north_p_value']
-    p, t = ptz_params['pan'], ptz_params['tilt']
+    res_w, res_h = int(camera_params['resolution_w']), int(camera_params['resolution_h'])
+    cam_lon, cam_lat = float(camera_params['cam_lon']), float(camera_params['cam_lat'])
+    cam_height, hfov =float( camera_params['height']), float(camera_params['hfov'])
+    north_p = float(camera_params['north_p_value'])
+    p, t = float(ptz_params['pan']), float(ptz_params['tilt'])
 
     # --- 2. 相机内参模型:将像素(u,v)转换为相机坐标系下的方向向量 ---
     # (相机坐标系定义: x向右, y向下, z向前)