Merge commit 'dcbc2f49eb3a6ddbeb914f6b62aecdd8702ed058'

This commit is contained in:
li.zhenye 2022-08-06 11:40:25 +08:00
commit f561e631dd
2 changed files with 7 additions and 2 deletions

View File

@ -77,7 +77,7 @@ def main(only_spec=False, only_color=False):
mask_spec = spec_detector.predict(img_data) mask_spec = spec_detector.predict(img_data)
mask_rgb = rgb_detector.predict(rgb_data) mask_rgb = rgb_detector.predict(rgb_data)
# 进行喷阀的合并 # 进行喷阀的合并
masks = [utils.valve_merge(mask, merge_size=Config.valve_merge_size) for mask in [mask_spec, mask_rgb]] masks = [utils.valve_expend(mask) for mask in [mask_spec, mask_rgb]]
# control the size of the output masks, 在resize前图像的宽度是和喷阀对应的 # control the size of the output masks, 在resize前图像的宽度是和喷阀对应的
masks = [cv2.resize(mask.astype(np.uint8), Config.target_size) for mask in masks] masks = [cv2.resize(mask.astype(np.uint8), Config.target_size) for mask in masks]
# 写出 # 写出

View File

@ -160,6 +160,11 @@ def valve_merge(img: np.ndarray, merge_size: int = 2) -> np.ndarray:
return img return img
def valve_expend(img: np.ndarray) -> np.ndarray:
kernel = np.ones((1, 3), np.uint8)
return cv2.dilate(img, kernel)
def read_envi_ascii(file_name, save_xy=False, hdr_file_name=None): def read_envi_ascii(file_name, save_xy=False, hdr_file_name=None):
""" """
Read envi ascii file. Use ENVI ROI Tool -> File -> output ROIs to ASCII... Read envi ascii file. Use ENVI ROI Tool -> File -> output ROIs to ASCII...