개정판 3bbfbe44
issue #000: fix line no
Change-Id: Icd3db721d1fae13474971a1d99c583cb84264f0a
| DTI_PID/DTI_PID/NominalPipeSize.py | ||
|---|---|---|
| 68 | 68 |
import re |
| 69 | 69 |
|
| 70 | 70 |
if size_unit.upper() == 'INCH' or size_unit.upper() == 'IMPERIAL': |
| 71 |
''' |
|
| 71 |
|
|
| 72 | 72 |
# code |
| 73 | 73 |
if value == self.inchStr: |
| 74 | 74 |
return self.inchStr |
| ... | ... | |
| 104 | 104 |
match = re.search(self.inchStr, value, re.DOTALL) |
| 105 | 105 |
if match and match.start() is 0 and match.end() is len(value): |
| 106 | 106 |
return value |
| 107 |
''' |
|
| 107 | 108 |
|
| 108 | 109 |
elif size_unit.upper() == 'METRIC': |
| 109 | 110 |
# code |
| ... | ... | |
| 136 | 137 |
import re |
| 137 | 138 |
try: |
| 138 | 139 |
if size_unit.upper() == 'INCH' or size_unit.upper() == 'IMPERIAL': |
| 139 |
''' |
|
| 140 |
|
|
| 140 | 141 |
# code |
| 141 | 142 |
if value.startswith(self.inchStr): |
| 142 | 143 |
return self.inchStr, self.inchStr |
| ... | ... | |
| 172 | 173 |
match = re.search(self.inchStr, value, re.DOTALL) |
| 173 | 174 |
if match and match.start() is 0: |
| 174 | 175 |
return value[:match.end()], value[:match.end()] |
| 176 |
''' |
|
| 175 | 177 |
|
| 176 | 178 |
elif size_unit.upper() == 'METRIC': |
| 177 | 179 |
if value.startswith(self.metricStr): |
| DTI_PID/DTI_PID/RecognitionDialog.py | ||
|---|---|---|
| 2738 | 2738 |
else: |
| 2739 | 2739 |
if tilt: |
| 2740 | 2740 |
symGray = symGray_45 |
| 2741 |
else: |
|
| 2742 |
symbolRotatedAngle = (symbolRotatedAngle + 45) % 360 |
|
| 2743 |
continue |
|
| 2741 | 2744 |
|
| 2742 | 2745 |
sw, sh = symGray.shape[::-1] |
| 2743 | 2746 |
|
| ... | ... | |
| 2816 | 2819 |
for rect2 in symbols: |
| 2817 | 2820 |
if rect1 is rect2 or rect1[0] != rect2[0]: |
| 2818 | 2821 |
continue |
| 2819 |
l1, l2 = rect1[1], rect2[1] |
|
| 2820 |
r1, r2 = rect1[1] + rect1[3], rect2[1] + rect2[3] |
|
| 2822 |
rect1_x_gap = int(rect1[3] / 10) |
|
| 2823 |
rect1_y_gap = int(rect1[4] / 10) |
|
| 2824 |
rect2_x_gap = int(rect1[3] / 10) |
|
| 2825 |
rect2_y_gap = int(rect1[4] / 10) |
|
| 2826 |
|
|
| 2827 |
l1, l2 = rect1[1] + rect1_x_gap, rect2[1] + rect2_x_gap |
|
| 2828 |
r1, r2 = rect1[1] + rect1[3] - rect1_x_gap, rect2[1] + rect2[3] - rect2_x_gap |
|
| 2821 | 2829 |
l_x, s_x = [l1, r1], [l2, r2] |
| 2822 |
t1, t2 = rect1[2], rect2[2]
|
|
| 2823 |
b1, b2 = rect1[2] + rect1[4], rect2[2] + rect2[4]
|
|
| 2830 |
t1, t2 = rect1[2] + rect1_y_gap, rect2[2] + rect2_y_gap
|
|
| 2831 |
b1, b2 = rect1[2] + rect1[4] - rect1_y_gap, rect2[2] + rect2[4] - rect2_y_gap
|
|
| 2824 | 2832 |
l_y, s_y = [t1, b1], [t2, b2] |
| 2825 | 2833 |
if not (max(l_x) < min(s_x) or max(s_x) < min(l_x)) and \ |
| 2826 | 2834 |
not (max(l_y) < min(s_y) or max(s_y) < min(l_y)): |
| ... | ... | |
| 2905 | 2913 |
symGray = Worker.cvtGrayImage(sym) |
| 2906 | 2914 |
|
| 2907 | 2915 |
for symbol in symbols: |
| 2908 |
if symbol[0] == symbolName: |
|
| 2916 |
#if symbol[0] == symbolName: |
|
| 2917 |
if symbol[0] == 'check': |
|
| 2909 | 2918 |
searchedItemSp, symbolRotatedAngle, flipped, originalPoint, connectionPoint, sw, sh, score = \ |
| 2910 | 2919 |
Worker.calculate_exact_position(area, symGray, targetSymbol, symbol, worker) |
| 2911 | 2920 |
if not searchedItemSp: |
내보내기 Unified diff
