개정판 6655a2ff
add eq b binding option
Change-Id: I8246d1b12bce00d1d19f0446db37e59f465e9af5
DTI_PID/DTI_PID/ConfigurationDialog.py | ||
---|---|---|
258 | 258 |
self.ui.radioButtonOPCModeYes.setChecked(True) |
259 | 259 |
self.ui.radioButtonOPCModeNo.setChecked(False) |
260 | 260 |
|
261 |
configs = docData.getConfigs('Symbol', 'EQ binding') |
|
262 |
if configs: |
|
263 |
size = int(configs[0].value) |
|
264 |
self.ui.radioButtonEQBindingOn.setChecked(True if size == 1 else False) |
|
265 |
self.ui.radioButtonEQbindingOff.setChecked(True if size == -1 else False) |
|
266 |
else: |
|
267 |
self.ui.radioButtonEQbindingOff.setChecked(True) |
|
268 |
self.ui.radioButtonEQBindingOn.setChecked(False) |
|
269 |
|
|
261 | 270 |
configs = docData.getConfigs('Line No', 'Space') |
262 | 271 |
if configs: |
263 | 272 |
size = int(configs[0].value) |
... | ... | |
1267 | 1276 |
configs.append(Config('Text', 'Background', '1' if self.ui.radioButtonBackTextYes.isChecked() else '-1')) |
1268 | 1277 |
configs.append(Config('Symbol', 'Detect Inside Package', '1' if self.ui.radioButtonDetectPackageYes.isChecked() else '-1')) |
1269 | 1278 |
configs.append(Config('Symbol', 'OPC', '1' if self.ui.radioButtonOPCModeYes.isChecked() else '-1')) |
1279 |
configs.append(Config('Symbol', 'EQ binding', '1' if self.ui.radioButtonEQBindingOn.isChecked() else '-1')) |
|
1270 | 1280 |
configs.append(Config('Line No', 'Space', '1' if self.ui.radioButtonAllowLineNoSpaceYes.isChecked() else '-1')) |
1271 | 1281 |
configs.append(Config('Note No Tag Rule', 'Note No Expression', self.ui.lineEditNoteNoExpression.text())) |
1272 | 1282 |
configs.append(Config('Note No Tag Rule', 'Note No Symbol Name', self.ui.lineEditNoteNoSymbolName.text())) |
DTI_PID/DTI_PID/Configuration_UI.py | ||
---|---|---|
511 | 511 |
self.gridLayout_40.setObjectName("gridLayout_40") |
512 | 512 |
self.gridLayout_39 = QtWidgets.QGridLayout() |
513 | 513 |
self.gridLayout_39.setObjectName("gridLayout_39") |
514 |
self.lineEditFlange = QtWidgets.QLineEdit(self.groupBoxSymbol) |
|
515 |
self.lineEditFlange.setObjectName("lineEditFlange") |
|
516 |
self.gridLayout_39.addWidget(self.lineEditFlange, 2, 1, 1, 1) |
|
517 | 514 |
self.label_52 = QtWidgets.QLabel(self.groupBoxSymbol) |
518 | 515 |
self.label_52.setObjectName("label_52") |
519 | 516 |
self.gridLayout_39.addWidget(self.label_52, 2, 0, 1, 1) |
520 |
self.lineEditBlind = QtWidgets.QLineEdit(self.groupBoxSymbol) |
|
521 |
self.lineEditBlind.setObjectName("lineEditBlind") |
|
522 |
self.gridLayout_39.addWidget(self.lineEditBlind, 3, 1, 1, 1) |
|
523 |
spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) |
|
524 |
self.gridLayout_39.addItem(spacerItem4, 2, 2, 1, 1) |
|
517 |
self.label_59 = QtWidgets.QLabel(self.groupBoxSymbol) |
|
518 |
self.label_59.setObjectName("label_59") |
|
519 |
self.gridLayout_39.addWidget(self.label_59, 4, 0, 1, 1) |
|
525 | 520 |
self.horizontalLayout_10 = QtWidgets.QHBoxLayout() |
526 | 521 |
self.horizontalLayout_10.setObjectName("horizontalLayout_10") |
527 | 522 |
self.radioButtonDetectPackageYes = QtWidgets.QRadioButton(self.groupBoxSymbol) |
... | ... | |
535 | 530 |
self.buttonGroup_8.addButton(self.radioButtonDetectPackageNo) |
536 | 531 |
self.horizontalLayout_10.addWidget(self.radioButtonDetectPackageNo) |
537 | 532 |
self.gridLayout_39.addLayout(self.horizontalLayout_10, 1, 1, 1, 1) |
538 |
self.label_56 = QtWidgets.QLabel(self.groupBoxSymbol) |
|
539 |
self.label_56.setObjectName("label_56") |
|
540 |
self.gridLayout_39.addWidget(self.label_56, 3, 0, 1, 1) |
|
533 |
self.lineEditBlind = QtWidgets.QLineEdit(self.groupBoxSymbol) |
|
534 |
self.lineEditBlind.setObjectName("lineEditBlind") |
|
535 |
self.gridLayout_39.addWidget(self.lineEditBlind, 3, 1, 1, 1) |
|
536 |
self.lineEditFlange = QtWidgets.QLineEdit(self.groupBoxSymbol) |
|
537 |
self.lineEditFlange.setObjectName("lineEditFlange") |
|
538 |
self.gridLayout_39.addWidget(self.lineEditFlange, 2, 1, 1, 1) |
|
539 |
spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) |
|
540 |
self.gridLayout_39.addItem(spacerItem4, 2, 2, 1, 1) |
|
541 | 541 |
self.label_53 = QtWidgets.QLabel(self.groupBoxSymbol) |
542 | 542 |
self.label_53.setObjectName("label_53") |
543 | 543 |
self.gridLayout_39.addWidget(self.label_53, 1, 0, 1, 1) |
544 |
self.label_59 = QtWidgets.QLabel(self.groupBoxSymbol) |
|
545 |
self.label_59.setObjectName("label_59") |
|
546 |
self.gridLayout_39.addWidget(self.label_59, 4, 0, 1, 1) |
|
547 | 544 |
self.horizontalLayout_15 = QtWidgets.QHBoxLayout() |
548 | 545 |
self.horizontalLayout_15.setObjectName("horizontalLayout_15") |
549 | 546 |
self.radioButtonOPCModeYes = QtWidgets.QRadioButton(self.groupBoxSymbol) |
... | ... | |
557 | 554 |
self.buttonGroup_12.addButton(self.radioButtonOPCModeNo) |
558 | 555 |
self.horizontalLayout_15.addWidget(self.radioButtonOPCModeNo) |
559 | 556 |
self.gridLayout_39.addLayout(self.horizontalLayout_15, 4, 1, 1, 1) |
557 |
self.label_56 = QtWidgets.QLabel(self.groupBoxSymbol) |
|
558 |
self.label_56.setObjectName("label_56") |
|
559 |
self.gridLayout_39.addWidget(self.label_56, 3, 0, 1, 1) |
|
560 |
self.label_70 = QtWidgets.QLabel(self.groupBoxSymbol) |
|
561 |
self.label_70.setObjectName("label_70") |
|
562 |
self.gridLayout_39.addWidget(self.label_70, 5, 0, 1, 1) |
|
563 |
self.horizontalLayout_21 = QtWidgets.QHBoxLayout() |
|
564 |
self.horizontalLayout_21.setObjectName("horizontalLayout_21") |
|
565 |
self.radioButtonEQBindingOn = QtWidgets.QRadioButton(self.groupBoxSymbol) |
|
566 |
self.radioButtonEQBindingOn.setObjectName("radioButtonEQBindingOn") |
|
567 |
self.buttonGroup_18 = QtWidgets.QButtonGroup(ConfigurationDialog) |
|
568 |
self.buttonGroup_18.setObjectName("buttonGroup_18") |
|
569 |
self.buttonGroup_18.addButton(self.radioButtonEQBindingOn) |
|
570 |
self.horizontalLayout_21.addWidget(self.radioButtonEQBindingOn) |
|
571 |
self.radioButtonEQbindingOff = QtWidgets.QRadioButton(self.groupBoxSymbol) |
|
572 |
self.radioButtonEQbindingOff.setObjectName("radioButtonEQbindingOff") |
|
573 |
self.buttonGroup_18.addButton(self.radioButtonEQbindingOff) |
|
574 |
self.horizontalLayout_21.addWidget(self.radioButtonEQbindingOff) |
|
575 |
self.gridLayout_39.addLayout(self.horizontalLayout_21, 5, 1, 1, 1) |
|
560 | 576 |
self.gridLayout_40.addLayout(self.gridLayout_39, 0, 0, 1, 1) |
561 | 577 |
self.gridLayout_21.addWidget(self.groupBoxSymbol, 1, 1, 1, 1) |
562 | 578 |
self.tabWidget.addTab(self.Recognition2, "") |
... | ... | |
1221 | 1237 |
self.radioButtonLineDrawingFollowing.setText(_translate("ConfigurationDialog", "Following")) |
1222 | 1238 |
self.groupBoxSymbol.setTitle(_translate("ConfigurationDialog", "Symbol")) |
1223 | 1239 |
self.label_52.setText(_translate("ConfigurationDialog", "Default Flange Name : ")) |
1240 |
self.label_59.setText(_translate("ConfigurationDialog", "OPC Detection Mode : ")) |
|
1224 | 1241 |
self.radioButtonDetectPackageYes.setText(_translate("ConfigurationDialog", "Yes")) |
1225 | 1242 |
self.radioButtonDetectPackageNo.setText(_translate("ConfigurationDialog", "No")) |
1226 |
self.label_56.setText(_translate("ConfigurationDialog", "Default Blind Flange Name : ")) |
|
1227 | 1243 |
self.label_53.setText(_translate("ConfigurationDialog", "Detect Inside Equipment Package : ")) |
1228 |
self.label_59.setText(_translate("ConfigurationDialog", "OPC Detection Mode : ")) |
|
1229 | 1244 |
self.radioButtonOPCModeYes.setText(_translate("ConfigurationDialog", "Yes")) |
1230 | 1245 |
self.radioButtonOPCModeNo.setText(_translate("ConfigurationDialog", "No")) |
1246 |
self.label_56.setText(_translate("ConfigurationDialog", "Default Blind Flange Name : ")) |
|
1247 |
self.label_70.setText(_translate("ConfigurationDialog", "Equipment Binding Function : ")) |
|
1248 |
self.radioButtonEQBindingOn.setText(_translate("ConfigurationDialog", "On")) |
|
1249 |
self.radioButtonEQbindingOff.setText(_translate("ConfigurationDialog", "Off")) |
|
1231 | 1250 |
self.tabWidget.setTabText(self.tabWidget.indexOf(self.Recognition2), _translate("ConfigurationDialog", "Recognition")) |
1232 | 1251 |
self.groupBox_4.setTitle(_translate("ConfigurationDialog", "Note No Tag Rule")) |
1233 | 1252 |
self.checkBoxNoteNoSymbolName.setText(_translate("ConfigurationDialog", "Note No Symbol Name : ")) |
DTI_PID/DTI_PID/QtImageViewerScene.py | ||
---|---|---|
73 | 73 |
from EngineeringSpecBreakItem import QEngineeringSpecBreakItem |
74 | 74 |
from EngineeringVendorItem import QEngineeringVendorItem |
75 | 75 |
from EngineeringConnectorItem import QEngineeringConnectorItem |
76 |
from EngineeringEquipmentItem import QEngineeringEquipmentItem |
|
76 | 77 |
from DeleteCommand import DeleteCommand |
77 | 78 |
from RotateCommand import RotateCommand |
78 | 79 |
from FlipCommand import FlipCommand |
... | ... | |
118 | 119 |
items = [item for item in self.selectedItems() if issubclass(type(item), SymbolSvgItem)] |
119 | 120 |
if items: |
120 | 121 |
for item in items: |
121 |
item.keyPressEvent(event) |
|
122 |
if len(items) == 1 or (len(items) != 1 and type(item) is not QEngineeringEquipmentItem): |
|
123 |
item.keyPressEvent(event) |
|
122 | 124 |
event.accept() |
123 | 125 |
return |
124 | 126 |
|
DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py | ||
---|---|---|
1229 | 1229 |
from shapely.geometry import Point |
1230 | 1230 |
|
1231 | 1231 |
scene = self.scene() |
1232 |
app_doc_data = AppDocData.instance() |
|
1232 | 1233 |
if scene: |
1233 |
configs = AppDocData.instance().getConfigs('Line Detector', 'Length to connect line')
|
|
1234 |
configs = app_doc_data.getConfigs('Line Detector', 'Length to connect line')
|
|
1234 | 1235 |
toler = int(configs[0].value) if configs else 20 |
1235 | 1236 |
|
1236 | 1237 |
items = [item for item in scene.items() if hasattr(item, 'connectors') and item is not self] |
... | ... | |
1267 | 1268 |
break |
1268 | 1269 |
|
1269 | 1270 |
if type(self) is QEngineeringEquipmentItem: |
1271 |
configs = app_doc_data.getConfigs('Symbol', 'EQ binding') |
|
1272 |
eq_binding = int(configs[0].value) if configs else -1 |
|
1270 | 1273 |
for item in items: |
1271 |
if False:# type(item) is QEngineeringLineItem and item.is_piping(True):
|
|
1272 |
for i_connector in item.connectors:
|
|
1273 |
if i_connector.connectedItem:
|
|
1274 |
if eq_binding == 1 and (type(item) is QEngineeringLineItem and item.is_piping(True) or issubclass(type(item), SymbolSvgItem)):
|
|
1275 |
for index in range(len(item.connectors)):
|
|
1276 |
if item.connectors[index].connectedItem:
|
|
1274 | 1277 |
continue |
1275 | 1278 |
|
1276 |
if self.includes(i_connector, margin=100): |
|
1277 |
i_connector.connect(self) |
|
1279 |
if type(item) is QEngineeringLineItem or QEngineeringLineItem.check_piping(item.conn_type[index], True): |
|
1280 |
if self.includes(item.connectors[index], margin=100): |
|
1281 |
item.connectors[index].connect(self) |
|
1278 | 1282 |
|
1279 | 1283 |
elif issubclass(type(item), QEngineeringNozzleItem) and item.has_connection: |
1280 | 1284 |
for index in range(len(item.connectors)): |
DTI_PID/DTI_PID/UI/Configuration.ui | ||
---|---|---|
1062 | 1062 |
<layout class="QGridLayout" name="gridLayout_40"> |
1063 | 1063 |
<item row="0" column="0"> |
1064 | 1064 |
<layout class="QGridLayout" name="gridLayout_39"> |
1065 |
<item row="2" column="1"> |
|
1066 |
<widget class="QLineEdit" name="lineEditFlange"/> |
|
1067 |
</item> |
|
1068 | 1065 |
<item row="2" column="0"> |
1069 | 1066 |
<widget class="QLabel" name="label_52"> |
1070 | 1067 |
<property name="text"> |
... | ... | |
1072 | 1069 |
</property> |
1073 | 1070 |
</widget> |
1074 | 1071 |
</item> |
1072 |
<item row="4" column="0"> |
|
1073 |
<widget class="QLabel" name="label_59"> |
|
1074 |
<property name="text"> |
|
1075 |
<string>OPC Detection Mode : </string> |
|
1076 |
</property> |
|
1077 |
</widget> |
|
1078 |
</item> |
|
1079 |
<item row="1" column="1"> |
|
1080 |
<layout class="QHBoxLayout" name="horizontalLayout_10"> |
|
1081 |
<item> |
|
1082 |
<widget class="QRadioButton" name="radioButtonDetectPackageYes"> |
|
1083 |
<property name="text"> |
|
1084 |
<string>Yes</string> |
|
1085 |
</property> |
|
1086 |
<attribute name="buttonGroup"> |
|
1087 |
<string notr="true">buttonGroup_8</string> |
|
1088 |
</attribute> |
|
1089 |
</widget> |
|
1090 |
</item> |
|
1091 |
<item> |
|
1092 |
<widget class="QRadioButton" name="radioButtonDetectPackageNo"> |
|
1093 |
<property name="text"> |
|
1094 |
<string>No</string> |
|
1095 |
</property> |
|
1096 |
<attribute name="buttonGroup"> |
|
1097 |
<string notr="true">buttonGroup_8</string> |
|
1098 |
</attribute> |
|
1099 |
</widget> |
|
1100 |
</item> |
|
1101 |
</layout> |
|
1102 |
</item> |
|
1075 | 1103 |
<item row="3" column="1"> |
1076 | 1104 |
<widget class="QLineEdit" name="lineEditBlind"/> |
1077 | 1105 |
</item> |
1106 |
<item row="2" column="1"> |
|
1107 |
<widget class="QLineEdit" name="lineEditFlange"/> |
|
1108 |
</item> |
|
1078 | 1109 |
<item row="2" column="2"> |
1079 | 1110 |
<spacer name="horizontalSpacer_7"> |
1080 | 1111 |
<property name="orientation"> |
... | ... | |
1088 | 1119 |
</property> |
1089 | 1120 |
</spacer> |
1090 | 1121 |
</item> |
1091 |
<item row="1" column="1"> |
|
1092 |
<layout class="QHBoxLayout" name="horizontalLayout_10"> |
|
1122 |
<item row="1" column="0"> |
|
1123 |
<widget class="QLabel" name="label_53"> |
|
1124 |
<property name="text"> |
|
1125 |
<string>Detect Inside Equipment Package : </string> |
|
1126 |
</property> |
|
1127 |
</widget> |
|
1128 |
</item> |
|
1129 |
<item row="4" column="1"> |
|
1130 |
<layout class="QHBoxLayout" name="horizontalLayout_15"> |
|
1093 | 1131 |
<item> |
1094 |
<widget class="QRadioButton" name="radioButtonDetectPackageYes">
|
|
1132 |
<widget class="QRadioButton" name="radioButtonOPCModeYes">
|
|
1095 | 1133 |
<property name="text"> |
1096 | 1134 |
<string>Yes</string> |
1097 | 1135 |
</property> |
1098 | 1136 |
<attribute name="buttonGroup"> |
1099 |
<string notr="true">buttonGroup_8</string>
|
|
1137 |
<string notr="true">buttonGroup_12</string>
|
|
1100 | 1138 |
</attribute> |
1101 | 1139 |
</widget> |
1102 | 1140 |
</item> |
1103 | 1141 |
<item> |
1104 |
<widget class="QRadioButton" name="radioButtonDetectPackageNo">
|
|
1142 |
<widget class="QRadioButton" name="radioButtonOPCModeNo">
|
|
1105 | 1143 |
<property name="text"> |
1106 | 1144 |
<string>No</string> |
1107 | 1145 |
</property> |
1108 | 1146 |
<attribute name="buttonGroup"> |
1109 |
<string notr="true">buttonGroup_8</string>
|
|
1147 |
<string notr="true">buttonGroup_12</string>
|
|
1110 | 1148 |
</attribute> |
1111 | 1149 |
</widget> |
1112 | 1150 |
</item> |
... | ... | |
1119 | 1157 |
</property> |
1120 | 1158 |
</widget> |
1121 | 1159 |
</item> |
1122 |
<item row="1" column="0"> |
|
1123 |
<widget class="QLabel" name="label_53"> |
|
1124 |
<property name="text"> |
|
1125 |
<string>Detect Inside Equipment Package : </string> |
|
1126 |
</property> |
|
1127 |
</widget> |
|
1128 |
</item> |
|
1129 |
<item row="4" column="0"> |
|
1130 |
<widget class="QLabel" name="label_59"> |
|
1160 |
<item row="5" column="0"> |
|
1161 |
<widget class="QLabel" name="label_70"> |
|
1131 | 1162 |
<property name="text"> |
1132 |
<string>OPC Detection Mode : </string>
|
|
1163 |
<string>Equipment Binding Function : </string>
|
|
1133 | 1164 |
</property> |
1134 | 1165 |
</widget> |
1135 | 1166 |
</item> |
1136 |
<item row="4" column="1">
|
|
1137 |
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
|
1167 |
<item row="5" column="1">
|
|
1168 |
<layout class="QHBoxLayout" name="horizontalLayout_21">
|
|
1138 | 1169 |
<item> |
1139 |
<widget class="QRadioButton" name="radioButtonOPCModeYes">
|
|
1170 |
<widget class="QRadioButton" name="radioButtonEQBindingOn">
|
|
1140 | 1171 |
<property name="text"> |
1141 |
<string>Yes</string>
|
|
1172 |
<string>On</string>
|
|
1142 | 1173 |
</property> |
1143 | 1174 |
<attribute name="buttonGroup"> |
1144 |
<string notr="true">buttonGroup_12</string>
|
|
1175 |
<string notr="true">buttonGroup_18</string>
|
|
1145 | 1176 |
</attribute> |
1146 | 1177 |
</widget> |
1147 | 1178 |
</item> |
1148 | 1179 |
<item> |
1149 |
<widget class="QRadioButton" name="radioButtonOPCModeNo">
|
|
1180 |
<widget class="QRadioButton" name="radioButtonEQbindingOff">
|
|
1150 | 1181 |
<property name="text"> |
1151 |
<string>No</string>
|
|
1182 |
<string>Off</string>
|
|
1152 | 1183 |
</property> |
1153 | 1184 |
<attribute name="buttonGroup"> |
1154 |
<string notr="true">buttonGroup_12</string>
|
|
1185 |
<string notr="true">buttonGroup_18</string>
|
|
1155 | 1186 |
</attribute> |
1156 | 1187 |
</widget> |
1157 | 1188 |
</item> |
... | ... | |
2356 | 2387 |
</connection> |
2357 | 2388 |
</connections> |
2358 | 2389 |
<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"/> |
|
2364 | 2390 |
<buttongroup name="buttonGroup_5"/> |
2365 | 2391 |
<buttongroup name="buttonGroup"/> |
2392 |
<buttongroup name="buttonGroup_8"/> |
|
2393 |
<buttongroup name="buttonGroup_15"/> |
|
2394 |
<buttongroup name="buttonGroup_10"/> |
|
2366 | 2395 |
<buttongroup name="buttonGroup_12"/> |
2396 |
<buttongroup name="buttonGroup_16"/> |
|
2397 |
<buttongroup name="buttonGroup_3"/> |
|
2398 |
<buttongroup name="buttonGroup_6"/> |
|
2367 | 2399 |
<buttongroup name="buttonGroup_2"/> |
2368 |
<buttongroup name="buttonGroup_4"/> |
|
2369 |
<buttongroup name="buttonGroup_17"/> |
|
2370 | 2400 |
<buttongroup name="buttonGroup_9"/> |
2401 |
<buttongroup name="buttonGroup_7"/> |
|
2371 | 2402 |
<buttongroup name="buttonGroup_14"/> |
2372 |
<buttongroup name="buttonGroup_15"/>
|
|
2403 |
<buttongroup name="buttonGroup_4"/>
|
|
2373 | 2404 |
<buttongroup name="buttonGroup_11"/> |
2374 |
<buttongroup name="buttonGroup_3"/> |
|
2375 | 2405 |
<buttongroup name="buttonGroup_13"/> |
2406 |
<buttongroup name="buttonGroup_17"/> |
|
2407 |
<buttongroup name="buttonGroup_18"/> |
|
2376 | 2408 |
</buttongroups> |
2377 | 2409 |
</ui> |
내보내기 Unified diff