格式化代码
This commit is contained in:
parent
554c7e6083
commit
5095dbe6c0
@ -49,6 +49,10 @@ def Images_matching(img_base, img_target):
|
|||||||
"""
|
"""
|
||||||
start = time.time()
|
start = time.time()
|
||||||
orb = cv2.ORB_create()
|
orb = cv2.ORB_create()
|
||||||
|
|
||||||
|
# 对可见光图像进行对比度拉伸
|
||||||
|
# img_base = truncated_linear_stretch(img_base)
|
||||||
|
|
||||||
img_base = cv2.cvtColor(img_base, cv2.COLOR_BGR2GRAY)
|
img_base = cv2.cvtColor(img_base, cv2.COLOR_BGR2GRAY)
|
||||||
sift = cv2.SIFT_create()
|
sift = cv2.SIFT_create()
|
||||||
# 使用sift算子计算特征点和特征点周围的特征向量
|
# 使用sift算子计算特征点和特征点周围的特征向量
|
||||||
@ -56,7 +60,9 @@ def Images_matching(img_base, img_target):
|
|||||||
kp1, des1 = sift.detectAndCompute(img_base, None) # 1136 1136, 64
|
kp1, des1 = sift.detectAndCompute(img_base, None) # 1136 1136, 64
|
||||||
kp2, des2 = sift.detectAndCompute(img_target, None)
|
kp2, des2 = sift.detectAndCompute(img_target, None)
|
||||||
en1 = time.time()
|
en1 = time.time()
|
||||||
|
|
||||||
# print(en1 - st1, "特征提取")
|
# print(en1 - st1, "特征提取")
|
||||||
|
|
||||||
# 进行KNN特征匹配
|
# 进行KNN特征匹配
|
||||||
# FLANN_INDEX_KDTREE = 0 # 建立FLANN匹配器的参数
|
# FLANN_INDEX_KDTREE = 0 # 建立FLANN匹配器的参数
|
||||||
# indexParams = dict(algorithm=FLANN_INDEX_KDTREE, trees=5) # 配置索引,密度树的数量为5
|
# indexParams = dict(algorithm=FLANN_INDEX_KDTREE, trees=5) # 配置索引,密度树的数量为5
|
||||||
@ -68,6 +74,7 @@ def Images_matching(img_base, img_target):
|
|||||||
# search_params = dict(checks=50)
|
# search_params = dict(checks=50)
|
||||||
# flann = cv2.FlannBasedMatcher(index_params, search_params)
|
# flann = cv2.FlannBasedMatcher(index_params, search_params)
|
||||||
# matches = flann.knnMatch(des1, des2, k=2)
|
# matches = flann.knnMatch(des1, des2, k=2)
|
||||||
|
|
||||||
st2 = time.time()
|
st2 = time.time()
|
||||||
matcher = cv2.BFMatcher()
|
matcher = cv2.BFMatcher()
|
||||||
matches = matcher.knnMatch(des1, des2, k=2)
|
matches = matcher.knnMatch(des1, des2, k=2)
|
||||||
@ -143,7 +150,7 @@ def main(matchimg_vi, matchimg_in):
|
|||||||
return 0, None, 0
|
return 0, None, 0
|
||||||
else:
|
else:
|
||||||
matched_ni = cv2.warpPerspective(orimg_in, H, (w, h))
|
matched_ni = cv2.warpPerspective(orimg_in, H, (w, h))
|
||||||
# matched_ni,left,right,top,bottom=removeBlackBorder(matched_ni)
|
matched_ni,left,right,top,bottom=removeBlackBorder(matched_ni)
|
||||||
# fusion = fusions(orimg_vi[left:right, top:bottom], matched_ni)
|
# fusion = fusions(orimg_vi[left:right, top:bottom], matched_ni)
|
||||||
fusion = fusions(orimg_vi, matched_ni)
|
fusion = fusions(orimg_vi, matched_ni)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user