aidlab/AiDA_Python
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 印花逻辑修改 默认不处理除overall以外所有印花类型

Browse Source 
fix:
This commit is contained in:
zcr
2026-02-03 16:43:33 +08:00
parent f017d7e212
commit 9a00fce0eb
3 changed files with 17 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/service/design_fast/pipeline/no_seg_print_painting.py
View File

@@ -12,9 +12,13 @@ class NoSegPrintPainting:
self.minio_client = minio_client
def __call__(self, result):
single_print = result['print']['single']
# single_print = [result['print']['single']]
overall_print = result['print']['overall']
element_print = result['print']['element']
# element_print = result['print']['element'
single_print = None
element_print = None
result['single_image'] = None
result['print_image'] = None
@@ -25,7 +29,7 @@ class NoSegPrintPainting:
result['no_seg_sketch_overall'] = result['no_seg_sketch_print'] = self.printpaint(result, painting_dict, print_=True)
result['pattern_image'] = result['no_seg_sketch_overall']
if single_print['print_path_list']:
if single_print:
print_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8)
mask_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8)
for i in range(len(single_print['print_path_list'])):
@@ -65,7 +69,7 @@ class NoSegPrintPainting:
single_image = cv2.add(tmp1, tmp2)
result['no_seg_sketch_print'] = single_image
if element_print['element_path_list']:
if element_print:
print_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8)
mask_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8)
for i in range(len(element_print['element_path_list'])):

14
app/service/design_fast/pipeline/print_painting.py
View File

@@ -12,10 +12,14 @@ class PrintPainting:
self.minio_client = minio_client
def __call__(self, result):
single_print = result['print']['single']
# single_print = result['print']['single']
overall_print = result['print']['overall']
element_print = result['print']['element']
partial_path = result['print']['partial'] if 'partial' in result['print'] else None
# element_print = result['print']['element']
# partial_path = result['print']['partial'] if 'partial' in result['print'] else None
single_print = None
element_print = None
partial_path = None
result['single_image'] = None
result['print_image'] = None
# TODO 给result['pattern_image'] resize 到resize_scale的大小
@@ -43,7 +47,7 @@ class PrintPainting:
result['print_image'] = self.printpaint(result, painting_dict, print_=True)
result['single_image'] = result['final_image'] = result['pattern_image'] = result['print_image']
if single_print['print_path_list']:
if single_print:
# 2025-9-19 印花调整 印花坐标按照sketch的缩放比调整
sketch_resize_scale = result['resize_scale']
print_background = np.zeros((result['pattern_image'].shape[0], result['pattern_image'].shape[1], 3), dtype=np.uint8)
@@ -84,7 +88,7 @@ class PrintPainting:
tmp2 = (result['final_image'] * (temp_fg / 255)).astype(np.uint8)
result['single_image'] = cv2.add(tmp1, tmp2)
if element_print['element_path_list']:
if element_print:
# 2025-9-19 印花调整 印花坐标按照sketch的缩放比调整
sketch_resize_scale = result['resize_scale']
print_background = np.zeros((result['final_image'].shape[0], result['final_image'].shape[1], 3), dtype=np.uint8)