diff --git a/Visual measurement-cameramodel/.idea/.name b/Visual measurement-cameramodel/.idea/.name new file mode 100644 index 0000000..7fe91ce --- /dev/null +++ b/Visual measurement-cameramodel/.idea/.name @@ -0,0 +1 @@ +get_data.py \ No newline at end of file diff --git a/Visual measurement-cameramodel/py/__pycache__/calc_way.cpython-312.pyc b/Visual measurement-cameramodel/py/__pycache__/calc_way.cpython-312.pyc index 8bee314..4daea12 100644 Binary files a/Visual measurement-cameramodel/py/__pycache__/calc_way.cpython-312.pyc and b/Visual measurement-cameramodel/py/__pycache__/calc_way.cpython-312.pyc differ diff --git a/Visual measurement-cameramodel/py/__pycache__/cameramodel.cpython-312.pyc b/Visual measurement-cameramodel/py/__pycache__/cameramodel.cpython-312.pyc index c078b52..54a6b4d 100644 Binary files a/Visual measurement-cameramodel/py/__pycache__/cameramodel.cpython-312.pyc and b/Visual measurement-cameramodel/py/__pycache__/cameramodel.cpython-312.pyc differ diff --git a/Visual measurement-cameramodel/py/__pycache__/get_data.cpython-312.pyc b/Visual measurement-cameramodel/py/__pycache__/get_data.cpython-312.pyc index ccc46ce..0396e2d 100644 Binary files a/Visual measurement-cameramodel/py/__pycache__/get_data.cpython-312.pyc and b/Visual measurement-cameramodel/py/__pycache__/get_data.cpython-312.pyc differ diff --git a/Visual measurement-cameramodel/py/cameramodel.py b/Visual measurement-cameramodel/py/cameramodel.py index 86e23d4..781fd06 100644 --- a/Visual measurement-cameramodel/py/cameramodel.py +++ b/Visual measurement-cameramodel/py/cameramodel.py @@ -28,11 +28,11 @@ class CameraModel: "rotation_camera": 0.03985022053087201, "filter": True, - "filt_percent": 0.1, + "filt_percent": 0.05, "outlier_num": 10, "ransac_residual_threshold": 2.5, "grid_downsample": True, - "cell_size": 20, + "cell_size": 10, } diff --git a/Visual measurement-cameramodel/py/get_data.py b/Visual measurement-cameramodel/py/get_data.py index 3a9ab14..d1950c6 100644 --- a/Visual measurement-cameramodel/py/get_data.py +++ b/Visual measurement-cameramodel/py/get_data.py @@ -71,10 +71,11 @@ def load_data(cameraModel, txt_name): y = cameraModel.camera_height - y if cameraModel.filter: mask = filter_middle_percent(x, y, cameraModel) + x_clean = x[mask] + y_clean = y[mask] else: - mask = filter_middle_percent(x, y, cameraModel) - x_clean = x[mask] - y_clean = y[mask] + x_clean = x + y_clean = y return x_clean.reshape(-1, 1), y_clean.reshape(-1, 1) except Exception as e: print(f"加载文件出错: {e}") diff --git a/Visual measurement-cameramodel/py/measure_lib.py b/Visual measurement-cameramodel/py/measure_lib.py index 629b505..d508487 100644 --- a/Visual measurement-cameramodel/py/measure_lib.py +++ b/Visual measurement-cameramodel/py/measure_lib.py @@ -55,4 +55,4 @@ def vs_measurement(txt_name, position=784, config_path: str = None): # print(result) # result = vs_measurement(r"C:\Users\Administrator\Desktop\BYD\0722\new13.19351136278192.txt", position=784, config_path="updated_config.json") -# # print(result) \ No newline at end of file +# print(result) \ No newline at end of file diff --git a/Visual measurement-cameramodel/py/updated_config.json b/Visual measurement-cameramodel/py/updated_config.json index d0f683d..7db2fd9 100644 --- a/Visual measurement-cameramodel/py/updated_config.json +++ b/Visual measurement-cameramodel/py/updated_config.json @@ -50,9 +50,9 @@ "position_offset_y": 32, "rotation_camera": 0.03985022053087201, "filter": true, - "filt_percent": 0.1, + "filt_percent": 0.05, "outlier_num": 10, "grid_downsample": true, - "cell_size": 20, + "cell_size": 10, "ransac_residual_threshold": 2.5 } \ No newline at end of file