개정판 546b8a4f
fix size
Change-Id: Ifd5ef50c89df80e742a90e93f3afacd3329bcaab
DTI_PID/DTI_PID/Configuration_UI.py | ||
---|---|---|
1215 | 1215 |
self.label_4.setText(_translate("ConfigurationDialog", "Small Object Ignore Size : ")) |
1216 | 1216 |
self.label_9.setText(_translate("ConfigurationDialog", "Line Connection Length : ")) |
1217 | 1217 |
self.label_45.setText(_translate("ConfigurationDialog", "Detect Without Symbol : ")) |
1218 |
self.label_69.setText(_translate("ConfigurationDialog", "Line Drafting Mode : "))
|
|
1218 |
self.label_69.setText(_translate("ConfigurationDialog", "Line Drafting Mode : ")) |
|
1219 | 1219 |
self.radioButtonLineDrawingAuto.setText(_translate("ConfigurationDialog", "Auto")) |
1220 | 1220 |
self.radioButtonLineDrawingManual.setText(_translate("ConfigurationDialog", "Manual")) |
1221 | 1221 |
self.radioButtonLineDrawingFollowing.setText(_translate("ConfigurationDialog", "Following")) |
DTI_PID/DTI_PID/Shapes/EngineeringAbstractItem.py | ||
---|---|---|
435 | 435 |
visited.append(match) |
436 | 436 |
# up to here |
437 | 437 |
|
438 |
if len(visited) > 1: |
|
439 |
fixed = False |
|
440 |
for index in range(len(visited) - 1): |
|
441 |
if issubclass(type(visited[index]), QEngineeringLineItem) and (not visited[index].connectors[1].connectedItem or visited[index].connectors[1].connectedItem is not visited[index + 1]): |
|
442 |
visited.reverse() |
|
443 |
fixed = True |
|
444 |
break |
|
445 |
|
|
446 |
if not fixed: |
|
447 |
for index in range(len(visited)): |
|
448 |
if index == 0: |
|
449 |
continue |
|
450 |
|
|
451 |
if issubclass(type(visited[index]), QEngineeringLineItem) and (not visited[index].connectors[0].connectedItem or visited[index].connectors[0].connectedItem is not visited[index - 1]): |
|
452 |
visited.reverse() |
|
453 |
fixed = True |
|
454 |
break |
|
455 |
|
|
456 |
# need check pipe run order later |
|
457 |
#if not fixed: |
|
458 |
|
|
459 |
|
|
438 | 460 |
except Exception as ex: |
439 | 461 |
from App import App |
440 | 462 |
from AppDocData import MessageType |
... | ... | |
498 | 520 |
return item.Size |
499 | 521 |
prev = item |
500 | 522 |
|
501 |
downstream = matches[0].items[at:] |
|
523 |
downstream = matches[0].items[at + 1:]
|
|
502 | 524 |
prev = self |
503 | 525 |
for item in downstream: |
504 | 526 |
if type(item) is QEngineeringReducerItem: |
... | ... | |
551 | 573 |
return item.Size |
552 | 574 |
prev = item |
553 | 575 |
|
554 |
downstream = connected_items[at:] |
|
576 |
downstream = connected_items[at + 1:]
|
|
555 | 577 |
prev = self |
556 | 578 |
for item in downstream: |
557 | 579 |
if type(item) is QEngineeringReducerItem: |
DTI_PID/DTI_PID/UI/Configuration.ui | ||
---|---|---|
1024 | 1024 |
<item row="7" column="0"> |
1025 | 1025 |
<widget class="QLabel" name="label_69"> |
1026 | 1026 |
<property name="text"> |
1027 |
<string>Line Drafting Mode : </string>
|
|
1027 |
<string>Line Drafting Mode : </string> |
|
1028 | 1028 |
</property> |
1029 | 1029 |
</widget> |
1030 | 1030 |
</item> |
... | ... | |
2356 | 2356 |
</connection> |
2357 | 2357 |
</connections> |
2358 | 2358 |
<buttongroups> |
2359 |
<buttongroup name="buttonGroup_7"/> |
|
2360 |
<buttongroup name="buttonGroup_10"/> |
|
2361 |
<buttongroup name="buttonGroup_6"/> |
|
2362 |
<buttongroup name="buttonGroup_8"/> |
|
2363 |
<buttongroup name="buttonGroup_16"/> |
|
2359 | 2364 |
<buttongroup name="buttonGroup_5"/> |
2360 |
<buttongroup name="buttonGroup_3"/> |
|
2361 |
<buttongroup name="buttonGroup_15"/> |
|
2362 | 2365 |
<buttongroup name="buttonGroup"/> |
2366 |
<buttongroup name="buttonGroup_12"/> |
|
2367 |
<buttongroup name="buttonGroup_2"/> |
|
2363 | 2368 |
<buttongroup name="buttonGroup_4"/> |
2364 | 2369 |
<buttongroup name="buttonGroup_17"/> |
2365 |
<buttongroup name="buttonGroup_2"/> |
|
2366 |
<buttongroup name="buttonGroup_16"/> |
|
2367 |
<buttongroup name="buttonGroup_6"/> |
|
2368 |
<buttongroup name="buttonGroup_11"/> |
|
2369 |
<buttongroup name="buttonGroup_12"/> |
|
2370 |
<buttongroup name="buttonGroup_7"/> |
|
2371 | 2370 |
<buttongroup name="buttonGroup_9"/> |
2372 |
<buttongroup name="buttonGroup_13"/> |
|
2373 |
<buttongroup name="buttonGroup_10"/> |
|
2374 |
<buttongroup name="buttonGroup_8"/> |
|
2375 | 2371 |
<buttongroup name="buttonGroup_14"/> |
2372 |
<buttongroup name="buttonGroup_15"/> |
|
2373 |
<buttongroup name="buttonGroup_11"/> |
|
2374 |
<buttongroup name="buttonGroup_3"/> |
|
2375 |
<buttongroup name="buttonGroup_13"/> |
|
2376 | 2376 |
</buttongroups> |
2377 | 2377 |
</ui> |
내보내기 Unified diff