change args method

dyfcalid · Jun 22, 2021 · b9fb10c · b9fb10c
1 parent 1c38a54
commit b9fb10c
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 39 deletions.
diff --git a/ExtrinsicCalibration/__init__.py b/ExtrinsicCalibration/__init__.py
@@ -13,7 +13,6 @@
 You can edit parameters in the original file, or
     args = ExCalibrator.get_args()
     args.INPUT_PATH = './ExtrinsicCalibration/data/'
-    ExCalibrator.edit_args(args)
     exCalib = ExCalibrator()
 """
 
diff --git a/ExtrinsicCalibration/extrinsicCalib.ipynb b/ExtrinsicCalibration/extrinsicCalib.ipynb
@@ -39,6 +39,27 @@
     "args = parser.parse_args([])"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# args.CAMERA_ID = 1                         # 相机编号\n",
+    "# args.INPUT_PATH = './data/'                # 图片、视频输入路径\n",
+    "# args.BORAD_WIDTH = 7                       # 棋盘宽度 【内角点数】\n",
+    "# args.BORAD_HEIGHT = 6                      # 棋盘高度 【内角点数】\n",
+    "# args.SOURCE_IMAGE = 'img_src'              # 源图像文件名前缀\n",
+    "# args.DEST_IMAGE = 'img_dst'                # 目标图像文件名前缀\n",
+    "# args.SQUARE_SIZE = 10                      # 缩放后棋盘每小格边长占据图中的像素尺寸\n",
+    "# args.SUBPIX_REGION_SRC = 3                 # 源图像亚像素优化的搜索像素范围(根据图像分辨率调整)\n",
+    "# args.SUBPIX_REGION_DST = 3                 # 目标图像亚像素优化的搜索像素范围(根据图像分辨率调整)\n",
+    "# args.CENTER_FLAG = True                    # 是否对目标图像进行居中\n",
+    "# args.SCALE_FLAG = True                     # 是否对目标图像进行缩放\n",
+    "# args.STORE_FLAG = True                     # 是否储存目标图像（居中缩放后）\n",
+    "# args.STORE_PATH = './data/'                # 目标图像（居中缩放后）保存路径"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -184,7 +205,12 @@
     "    def __init__(self):\n",
     "        self.src_corners_total = np.empty([0,1,2])\n",
     "        self.dst_corners_total = np.empty([0,1,2])\n",
-    "        \n",
+    "    \n",
+    "    # 获取args参数，供外部调用修改参数\n",
+    "    @staticmethod\n",
+    "    def get_args():\n",
+    "        return args\n",
+    "    \n",
     "    def imgPreprocess(self, img, center, scale):\n",
     "        # 俯视图图像居中\n",
     "        if center:\n",

diff --git a/ExtrinsicCalibration/extrinsicCalib.py b/ExtrinsicCalibration/extrinsicCalib.py
@@ -138,11 +138,6 @@ def __init__(self):
     def get_args():
         return args
 
-    @staticmethod
-    def edit_args(new_args):
-        global args
-        args = new_args
-
     def imgPreprocess(self, img, center, scale):
         if center:
             centerImg = CenterImage()

diff --git a/IntrinsicCalibration/__init__.py b/IntrinsicCalibration/__init__.py
@@ -19,6 +19,5 @@
 You can edit parameters in the original file, or
     args = InCalibrator.get_args()
     args.INPUT_PATH = './IntrinsicCalibration/data/'
-    InCalibrator.edit_args(args)
     calibrator = InCalibrator(camera_type)
 """
diff --git a/IntrinsicCalibration/intrinsicCalib.ipynb b/IntrinsicCalibration/intrinsicCalib.ipynb
@@ -384,6 +384,11 @@
     "            raise Exception(\"camera should be fisheye/normal\")\n",
     "        self.corners = []\n",
     "    \n",
+    "    # 获取args参数，供外部调用修改参数\n",
+    "    @staticmethod\n",
+    "    def get_args():\n",
+    "        return args\n",
+    "    \n",
     "    # 获取棋盘格角点坐标\n",
     "    def get_corners(self, img):\n",
     "        ok, corners = cv2.findChessboardCorners(img, (args.BORAD_WIDTH, args.BORAD_HEIGHT),\n",

diff --git a/IntrinsicCalibration/intrinsicCalib.py b/IntrinsicCalibration/intrinsicCalib.py
@@ -176,11 +176,6 @@ def __init__(self, camera):
     def get_args():
         return args
 
-    @staticmethod
-    def edit_args(new_args):
-        global args
-        args = new_args
-
     def get_corners(self, img):
         ok, corners = cv2.findChessboardCorners(img, (args.BORAD_WIDTH, args.BORAD_HEIGHT),
                       flags = cv2.CALIB_CB_ADAPTIVE_THRESH|cv2.CALIB_CB_NORMALIZE_IMAGE|cv2.CALIB_CB_FAST_CHECK)

diff --git a/README.md b/README.md
@@ -88,11 +88,10 @@ calibrator = InCalibrator(camera_type)              # 初始化内参标定器
 calib = CalibMode(calibrator, input_type, mode)     # 选择标定模式
 result = calib()                                    # 开始标定
 ```
-可以直接修改原文件中的各参数，或使用`get_args()`和`edit_args()`方法修改
+可以直接修改原文件中的各参数，或使用`get_args()`方法获取参数并修改
 ```
 args = InCalibrator.get_args()                      # 获取args参数
-args.INPUT_PATH = './IntrinsicCalibration/data/'
-InCalibrator.edit_args(args)                        # 修改args参数
+args.INPUT_PATH = './IntrinsicCalibration/data/'    # 修改args参数
 calibrator = InCalibrator(camera_type)              # 初始化内参标定器
 ```  
 
@@ -122,11 +121,10 @@ exCalib = ExCalibrator()                            # 初始化外参标定器
 homography = exCalib(src_raw, dst_raw)              # 输入对应的两张去畸变图像 得到单应性矩阵
 src_warp = exCalib.warp()                           # 使用warp方法得到原始图像的变换结果
 ```    
-可以直接修改原文件中的各参数，或使用`get_args()`和`edit_args()`方法修改  
+可以直接修改原文件中的各参数，或使用`get_args()`方法获取参数并修改  
 ```
 args = ExCalibrator.get_args()                      # 获取args参数
-args.INPUT_PATH = './ExtrinsicCalibration/data/'
-ExCalibrator.edit_args(args)                        # 修改args参数
+args.INPUT_PATH = './ExtrinsicCalibration/data/'    # 修改args参数
 exCalib = ExCalibrator()                            # 初始化外参标定器
 ```    
 
@@ -158,12 +156,11 @@ surround = bev(front,back,left,right)               # 输入前后左右四张
 bev = BevGenerator(blend=True, balance=True)        # 使用图像融合以及平衡
 surround = bev(front,back,left,right,car)           # 可以加入车辆图片
 ```
-可以直接修改原文件中的各参数，或使用`get_args()`和`edit_args()`方法修改  
+可以直接修改原文件中的各参数，或使用`get_args()`方法获取参数并修改  
 ```
 args = BevGenerator.get_args()                      # 获取环视鸟瞰args参数
 args.CAR_WIDTH = 200
-args.CAR_HEIGHT = 350
-BevGenerator.edit_args(args)                        # 修改为新的参数
+args.CAR_HEIGHT = 350                               # 修改为新的参数
 bev = BevGenerator()                                # 初始化环视鸟瞰生成器
 ```    
 

diff --git a/SurroundBirdEyeView/__init__.py b/SurroundBirdEyeView/__init__.py
@@ -16,6 +16,5 @@
     args = BevGenerator.get_args()
     args.CAR_WIDTH = 200
     args.CAR_HEIGHT = 350
-    BevGenerator.edit_args(args)
     bev = BevGenerator()
 """
diff --git a/SurroundBirdEyeView/surroundBEV.ipynb b/SurroundBirdEyeView/surroundBEV.ipynb
@@ -402,16 +402,10 @@
     "            self.masks = [BlendMask('front'), BlendMask('back'), \n",
     "                      BlendMask('left'), BlendMask('right')]\n",
     "    \n",
-    "    # 获取args参数，供外部调用\n",
+    "    # 获取args参数，供外部调用修改参数\n",
     "    @staticmethod\n",
     "    def get_args():\n",
     "        return args\n",
-    "    \n",
-    "    # 修改args参数，供外部调用\n",
-    "    @staticmethod\n",
-    "    def edit_args(new_args):\n",
-    "        global args\n",
-    "        args = new_args\n",
     "        \n",
     "    # 重新赋值args参数\n",
     "    def init_args(self):\n",

diff --git a/SurroundBirdEyeView/surroundBEV.py b/SurroundBirdEyeView/surroundBEV.py
@@ -297,11 +297,6 @@ def __init__(self, blend=args.BLEND_FLAG, balance=args.BALANCE_FLAG):
     def get_args():
         return args
 
-    @staticmethod
-    def edit_args(new_args):
-        global args
-        args = new_args
-
     def init_args(self):
         global FRAME_WIDTH, FRAME_HEIGHT, BEV_WIDTH, BEV_HEIGHT
         global CAR_WIDTH, CAR_HEIGHT, FOCAL_SCALE, SIZE_SCALE

diff --git a/main.py b/main.py
@@ -30,8 +30,7 @@ def runInCalib_1():
 def runInCalib_2():
     print("Intrinsic Calibration ......")
     args = InCalibrator.get_args()                      # 获取内参标定args参数
-    args.INPUT_PATH = './IntrinsicCalibration/data/'
-    InCalibrator.edit_args(args)                        # 修改为新的参数
+    args.INPUT_PATH = './IntrinsicCalibration/data/'    # 修改为新的参数
     calibrator = InCalibrator('fisheye')                # 初始化内参标定器
     calib = CalibMode(calibrator, 'image', 'auto')      # 选择标定模式
     result = calib()                                    # 开始标定
@@ -79,8 +78,7 @@ def runBEV():
 
     args = BevGenerator.get_args()                      # 获取环视鸟瞰args参数
     args.CAR_WIDTH = 200
-    args.CAR_HEIGHT = 350
-    BevGenerator.edit_args(args)                        # 修改为新的参数
+    args.CAR_HEIGHT = 350                               # 修改为新的参数
 
     bev = BevGenerator(blend=True, balance=True)        # 初始化环视鸟瞰图生成器
     surround = bev(front, back, left, right)            # 输入前后左右四张原始相机图像 得到拼接后的鸟瞰图