개정판 e40aca11
fix run sorting
Change-Id: I412d17c3df28fc86076b00f132da7219749b9392
| DTI_PID/DTI_PID/ItemPropertyTableWidget.py | ||
|---|---|---|
| 92 | 92 |
if cell: |
| 93 | 93 |
data = cell.data(Qt.UserRole) |
| 94 | 94 |
if data is not None: |
| 95 |
if self.table._item: self.table._item.set_property(data.Attribute, self.isChecked()) |
|
| 96 |
|
|
| 95 |
if self.table._item: |
|
| 96 |
self.table._item.set_property(data.Attribute, self.isChecked()) |
|
| 97 |
if type(self.table._item) is QEngineeringLineItem: |
|
| 98 |
self.table._item.update_arrow() |
|
| 97 | 99 |
|
| 98 | 100 |
class QItemPropertyTableWidget(QTableWidget): |
| 99 | 101 |
def __init__(self, mainWindow): |
| DTI_PID/DTI_PID/LineNoTracer.py | ||
|---|---|---|
| 8 | 8 |
from AppDocData import AppDocData, MessageType |
| 9 | 9 |
from EngineeringLineItem import QEngineeringLineItem |
| 10 | 10 |
from EngineeringLineNoTextItem import QEngineeringLineNoTextItem |
| 11 |
from EngineeringAbstractItem import QEngineeringAbstractItem |
|
| 11 | 12 |
from QEngineeringFlowArrowItem import QEngineeringFlowArrowItem |
| 12 | 13 |
from SymbolSvgItem import SymbolSvgItem |
| 13 | 14 |
from EngineeringTextItem import QEngineeringTextItem |
| ... | ... | |
| 54 | 55 |
''' |
| 55 | 56 |
|
| 56 | 57 |
def find_primary_lines(self, lineno, include_signal=True): |
| 57 |
from EngineeringLineItem import QEngineeringLineItem |
|
| 58 | 58 |
from EngineeringRunItem import QEngineeringRunItem |
| 59 | 59 |
|
| 60 | 60 |
connected_items = [] |
| ... | ... | |
| 104 | 104 |
''' |
| 105 | 105 |
|
| 106 | 106 |
def find_secondary_lines(self, lines_and_symbols, include_signal=True, is_trim=False): |
| 107 |
from EngineeringAbstractItem import QEngineeringAbstractItem |
|
| 108 |
from EngineeringLineItem import QEngineeringLineItem |
|
| 109 | 107 |
from EngineeringRunItem import QEngineeringRunItem |
| 110 | 108 |
from QEngineeringTrimLineNoTextItem import QEngineeringTrimLineNoTextItem |
| 111 | 109 |
|
| ... | ... | |
| 179 | 177 |
''' |
| 180 | 178 |
|
| 181 | 179 |
def execute(self, displayMessage, updateProgress, toler=600): |
| 182 |
from EngineeringLineItem import QEngineeringLineItem |
|
| 183 | 180 |
from SymbolSvgItem import SymbolSvgItem |
| 184 | 181 |
from EngineeringRunItem import QEngineeringRunItem |
| 185 | 182 |
from QEngineeringTrimLineNoTextItem import QEngineeringTrimLineNoTextItem |
| ... | ... | |
| 454 | 451 |
humkyung 2018.06.22 order connected objects |
| 455 | 452 |
''' |
| 456 | 453 |
def find_connected_objects(self, start, to=None, primary=False, include_signal=True): |
| 457 |
from EngineeringLineItem import QEngineeringLineItem |
|
| 458 | 454 |
from EngineeringEquipmentItem import QEngineeringEquipmentItem |
| 459 | 455 |
from EngineeringInstrumentItem import QEngineeringInstrumentItem |
| 460 | 456 |
from SymbolSvgItem import SymbolSvgItem |
| ... | ... | |
| 629 | 625 |
import uuid |
| 630 | 626 |
from LineNoTracer import LineNoTracer |
| 631 | 627 |
from AppDocData import AppDocData |
| 632 |
from EngineeringAbstractItem import QEngineeringAbstractItem |
|
| 633 | 628 |
from EngineeringSpecBreakItem import QEngineeringSpecBreakItem |
| 634 | 629 |
from EngineeringInstrumentItem import QEngineeringInstrumentItem |
| 635 | 630 |
from EngineeringReducerItem import QEngineeringReducerItem |
| ... | ... | |
| 1511 | 1506 |
break |
| 1512 | 1507 |
elif len(fixed_run.items) > 1: |
| 1513 | 1508 |
# waiting_run is single line |
| 1514 |
if waiting_run.items[0].connectors[0].connectedItem is fixed_run.items[0]: |
|
| 1509 |
if waiting_run.items[0].connectors[0].connectedItem is fixed_run.items[0] and \ |
|
| 1510 |
waiting_run.items[0].connectors[0]._connected_at == QEngineeringAbstractItem.CONNECTED_AT_PT: |
|
| 1515 | 1511 |
waiting_run_info.reverse() |
| 1516 | 1512 |
fixed_run_infos.append(waiting_run_info) |
| 1517 | 1513 |
waiting_run_infos.pop(run_index) |
| 1518 | 1514 |
find = True |
| 1519 | 1515 |
break |
| 1520 |
elif waiting_run.items[0].connectors[0].connectedItem is fixed_run.items[-1]: |
|
| 1516 |
elif waiting_run.items[0].connectors[0].connectedItem is fixed_run.items[-1] and \ |
|
| 1517 |
waiting_run.items[0].connectors[0]._connected_at == QEngineeringAbstractItem.CONNECTED_AT_PT: |
|
| 1521 | 1518 |
fixed_run_infos.append(waiting_run_info) |
| 1522 | 1519 |
waiting_run_infos.pop(run_index) |
| 1523 | 1520 |
find = True |
| 1524 | 1521 |
break |
| 1525 |
elif waiting_run.items[0].connectors[1].connectedItem is fixed_run.items[-1]: |
|
| 1522 |
elif waiting_run.items[0].connectors[1].connectedItem is fixed_run.items[-1] and \ |
|
| 1523 |
waiting_run.items[0].connectors[1]._connected_at == QEngineeringAbstractItem.CONNECTED_AT_PT: |
|
| 1526 | 1524 |
waiting_run_info.reverse() |
| 1527 | 1525 |
fixed_run_infos.append(waiting_run_info) |
| 1528 | 1526 |
waiting_run_infos.pop(run_index) |
| 1529 | 1527 |
find = True |
| 1530 | 1528 |
break |
| 1531 |
elif waiting_run.items[0].connectors[1].connectedItem is fixed_run.items[0]: |
|
| 1529 |
elif waiting_run.items[0].connectors[1].connectedItem is fixed_run.items[0] and \ |
|
| 1530 |
waiting_run.items[0].connectors[1]._connected_at == QEngineeringAbstractItem.CONNECTED_AT_PT: |
|
| 1532 | 1531 |
fixed_run_infos.append(waiting_run_info) |
| 1533 | 1532 |
waiting_run_infos.pop(run_index) |
| 1534 | 1533 |
find = True |
| ... | ... | |
| 1841 | 1840 |
import uuid |
| 1842 | 1841 |
from LineNoTracer import LineNoTracer |
| 1843 | 1842 |
from AppDocData import AppDocData |
| 1844 |
from EngineeringAbstractItem import QEngineeringAbstractItem |
|
| 1845 | 1843 |
from EngineeringSpecBreakItem import QEngineeringSpecBreakItem |
| 1846 | 1844 |
from EngineeringInstrumentItem import QEngineeringInstrumentItem |
| 1847 | 1845 |
from EngineeringReducerItem import QEngineeringReducerItem |
내보내기 Unified diff
