Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da

modified:   .gitignore
	modified:   .vscode/tasks.json
	modified:   src/maintain/scripts/test.py
	modified:   src/vision_opencv/cv_bridge/python/cv_bridge/__pycache__/core.cpython-38.pyc

.vscode/tasks.json

@@ -5,8 +5,8 @@
             "command": "catkin",
             "args": [
                 "build",
-                // "-DPYTHON_EXECUTABLE=/home/da/miniconda3/envs/gsmini/bin/python",
-                "-DPYTHON_EXECUTABLE=${HOME}/.conda/envs/gsmini/bin/python"
+                "-DPYTHON_EXECUTABLE=/home/da/miniconda3/envs/gsmini/bin/python",
+                //"-DPYTHON_EXECUTABLE=${HOME}/.conda/envs/gsmini/bin/python"
             ],
             "problemMatcher": [
                 "$catkin-gcc"

src/maintain/scripts/test.py

@@ -1,12 +1,14 @@
-#! /home/wxchen/.conda/envs/gsmini/bin/python
+#! /home/da/miniconda3/envs/gsmini/bin/python
 
 import numpy as np
 import cv2 as cv
 from matplotlib import pyplot as plt
 import rospy
 import tf2_ros
+import tf2_ros
 from sensor_msgs.msg import Image , CameraInfo
 from geometry_msgs.msg import PoseStamped, TransformStamped
+from geometry_msgs.msg import PoseStamped, TransformStamped
 import message_filters
 from cv_bridge import CvBridge, CvBridgeError
 import rospkg