개정판 f90f9850
issue #49: fix code table, allowable space ignore
Change-Id: I943dbb2f8af755677d1791cad65590b893cd5bdc
| DTI_PID/DTI_PID/CodeTables.py | ||
|---|---|---|
| 14 | 14 |
def __init__(self, name, values): |
| 15 | 15 |
self.name = name |
| 16 | 16 |
if self.name != "NOMINALDIAMETER": |
| 17 |
self.values = [(x[0], x[1], x[2], x[3].split(',')) for x in values]
|
|
| 17 |
self.values = [(x[0], x[1], x[2], x[3].replace(' ', '').split(',')) for x in values]
|
|
| 18 | 18 |
else: |
| 19 | 19 |
self.values = values |
| 20 | 20 |
|
| ... | ... | |
| 25 | 25 |
""" uid, code, metric, inch, inchstr, allowable_inch_str, metricstr, allowable_metric_str """ |
| 26 | 26 |
for value in self.values: |
| 27 | 27 |
if size_unit.upper() == 'INCH': |
| 28 |
tokens = [x for x in value[5].split(',') if x and text.startswith(x)]
|
|
| 28 |
tokens = [x for x in value[5].replace(' ', '').split(',') if x and text.startswith(x)]
|
|
| 29 | 29 |
if text.startswidth(value[4]) or tokens: return value[4] |
| 30 | 30 |
elif size_unit.upper() == 'METRIC': |
| 31 |
tokens = [x for x in value[7].split(',') if x and text.startswith(x)]
|
|
| 31 |
tokens = [x for x in value[7].replace(' ', '').split(',') if x and text.startswith(x)]
|
|
| 32 | 32 |
if text.startswidth(value[6]) or tokens: return value[6] |
| 33 | 33 |
else: |
| 34 | 34 |
for value in self.values: |
내보내기 Unified diff
