개정판 f6f9aadf
id2 LineNoTracer fix test
Change-Id: I52be086c8271a7665aaedb4acd96bcf07e628f72
| DTI_PID/DTI_PID/LineNoTracer.py | ||
|---|---|---|
| 130 | 130 |
if not is_trim: |
| 131 | 131 |
line_matches = [x for x in self._lines if x.owner and \ |
| 132 | 132 |
line.is_connected(x, QEngineeringAbstractItem.CONNECTED_AT_BODY) and x not in end_break_components] |
| 133 |
symbol_matches = [x for x in self._symbols if |
|
| 134 |
x.owner and line.is_connected(x) and x.canBeSecondary(line)] |
|
| 133 |
symbol_matches = [x for x in self._symbols if x.owner and line.is_connected(x)]# and x.canBeSecondary(line)] |
|
| 135 | 134 |
else: |
| 136 | 135 |
line_matches = [x for x in self._lines if x.owner and type(x.owner) is QEngineeringTrimLineNoTextItem and \ |
| 137 | 136 |
line.is_connected(x, QEngineeringAbstractItem.CONNECTED_AT_BODY) and x not in end_break_components] |
| 138 |
symbol_matches = [x for x in self._symbols if x.owner and type( |
|
| 139 |
x.owner) is QEngineeringTrimLineNoTextItem and line.is_connected(x) and x.canBeSecondary(line)] |
|
| 137 |
symbol_matches = [x for x in self._symbols if x.owner and type(x.owner) is QEngineeringTrimLineNoTextItem and line.is_connected(x)]# and x.canBeSecondary(line)] |
|
| 140 | 138 |
|
| 141 | 139 |
if line_matches or symbol_matches: |
| 142 | 140 |
foundCount += 1 |
| ... | ... | |
| 384 | 382 |
x not in visited) and obj.is_connected(x, None)] |
| 385 | 383 |
nextMatches = symbolMatches + lineMatches |
| 386 | 384 |
|
| 387 |
if len(nextMatches) > 1: # choose one if connected items are more than 2
|
|
| 385 |
if visited: # symbol must pass straight
|
|
| 388 | 386 |
matches = [x for x in visited if obj.is_connected(x)] |
| 389 | 387 |
if matches: |
| 390 | 388 |
next_connected = [x for x in nextMatches if obj.next_connected(x, matches[0])] |
| ... | ... | |
| 392 | 390 |
if next_connected: |
| 393 | 391 |
nextMatches = next_connected |
| 394 | 392 |
else: |
| 395 |
nextMatches = [nextMatches[0]] |
|
| 396 |
#nextMatches = [] |
|
| 393 |
#nextMatches = [nextMatches[0]] |
|
| 394 |
nextMatches = [] |
|
| 395 |
else: |
|
| 396 |
if len(nextMatches) > 1: # choose one if connected items are more than 2 |
|
| 397 |
matches = [x for x in visited if obj.is_connected(x)] |
|
| 398 |
if matches: |
|
| 399 |
next_connected = [x for x in nextMatches if obj.next_connected(x, matches[0])] |
|
| 400 |
|
|
| 401 |
if next_connected: |
|
| 402 |
nextMatches = next_connected |
|
| 403 |
else: |
|
| 404 |
#nextMatches = [nextMatches[0]] |
|
| 405 |
nextMatches = [] |
|
| 397 | 406 |
|
| 398 | 407 |
# if obj symbol has break connector and nextMatch connected that connector than break line group |
| 399 | 408 |
if nextMatches and obj.break_connector and [index for index in obj.break_connector if |
내보내기 Unified diff
