개정판 d5d3fc59
issue #622: fix and test line bug
Change-Id: I21a96ba5c8a6169652067a2c5c0ce68fdef8e0d2
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 62 | 62 |
class MessageType(Enum): |
| 63 | 63 |
Normal = 1 |
| 64 | 64 |
Error = 2 |
| 65 |
Check = 3 |
|
| 65 | 66 |
|
| 66 | 67 |
|
| 67 | 68 |
class AppDocData(SingletonInstance): |
| DTI_PID/DTI_PID/ConfigurationDialog.py | ||
|---|---|---|
| 122 | 122 |
self.ui.radioButtonDiagonalYes.setChecked(True if size == 1 else False) |
| 123 | 123 |
self.ui.radioButtonDiagonalNo.setChecked(True if size == -1 else False) |
| 124 | 124 |
else: |
| 125 |
self.ui.radioButtonDiagonalYes.setChecked(True) |
|
| 126 |
self.ui.radioButtonDiagonalNo.setChecked(False) |
|
| 125 |
self.ui.radioButtonDiagonalYes.setChecked(False) |
|
| 126 |
self.ui.radioButtonDiagonalNo.setChecked(True) |
|
| 127 |
|
|
| 128 |
#configs = docData.getConfigs('Text', 'Back')
|
|
| 129 |
if configs: |
|
| 130 |
size = int(configs[0].value) |
|
| 131 |
self.ui.radioButtonDiagonalYes.setChecked(True if size == 1 else False) |
|
| 132 |
self.ui.radioButtonDiagonalNo.setChecked(True if size == -1 else False) |
|
| 133 |
else: |
|
| 134 |
self.ui.radioButtonDiagonalYes.setChecked(False) |
|
| 135 |
self.ui.radioButtonDiagonalNo.setChecked(True) |
|
| 127 | 136 |
|
| 128 | 137 |
properties = docData.getLineProperties() |
| 129 | 138 |
if properties: |
| DTI_PID/DTI_PID/Configuration_UI.py | ||
|---|---|---|
| 11 | 11 |
class Ui_ConfigurationDialog(object): |
| 12 | 12 |
def setupUi(self, ConfigurationDialog): |
| 13 | 13 |
ConfigurationDialog.setObjectName("ConfigurationDialog")
|
| 14 |
ConfigurationDialog.resize(704, 925)
|
|
| 14 |
ConfigurationDialog.resize(704, 997)
|
|
| 15 | 15 |
font = QtGui.QFont() |
| 16 | 16 |
font.setFamily("맑은 고딕")
|
| 17 | 17 |
ConfigurationDialog.setFont(font) |
| ... | ... | |
| 561 | 561 |
self.gridLayout_22.setObjectName("gridLayout_22")
|
| 562 | 562 |
self.gridLayout_21 = QtWidgets.QGridLayout() |
| 563 | 563 |
self.gridLayout_21.setObjectName("gridLayout_21")
|
| 564 |
self.groupBox_12 = QtWidgets.QGroupBox(self.tabETC) |
|
| 565 |
self.groupBox_12.setObjectName("groupBox_12")
|
|
| 566 |
self.gridLayout_24 = QtWidgets.QGridLayout(self.groupBox_12) |
|
| 567 |
self.gridLayout_24.setObjectName("gridLayout_24")
|
|
| 568 |
self.verticalLayout_7 = QtWidgets.QVBoxLayout() |
|
| 569 |
self.verticalLayout_7.setObjectName("verticalLayout_7")
|
|
| 570 |
self.horizontalLayout_25 = QtWidgets.QHBoxLayout() |
|
| 571 |
self.horizontalLayout_25.setObjectName("horizontalLayout_25")
|
|
| 572 |
self.label_36 = QtWidgets.QLabel(self.groupBox_12) |
|
| 573 |
self.label_36.setObjectName("label_36")
|
|
| 574 |
self.horizontalLayout_25.addWidget(self.label_36) |
|
| 575 |
self.radioButtonBackTextYes = QtWidgets.QRadioButton(self.groupBox_12) |
|
| 576 |
self.radioButtonBackTextYes.setObjectName("radioButtonBackTextYes")
|
|
| 577 |
self.buttonGroup_4 = QtWidgets.QButtonGroup(ConfigurationDialog) |
|
| 578 |
self.buttonGroup_4.setObjectName("buttonGroup_4")
|
|
| 579 |
self.buttonGroup_4.addButton(self.radioButtonBackTextYes) |
|
| 580 |
self.horizontalLayout_25.addWidget(self.radioButtonBackTextYes) |
|
| 581 |
self.radioButtonBackTextNo = QtWidgets.QRadioButton(self.groupBox_12) |
|
| 582 |
self.radioButtonBackTextNo.setObjectName("radioButtonBackTextNo")
|
|
| 583 |
self.buttonGroup_4.addButton(self.radioButtonBackTextNo) |
|
| 584 |
self.horizontalLayout_25.addWidget(self.radioButtonBackTextNo) |
|
| 585 |
self.verticalLayout_7.addLayout(self.horizontalLayout_25) |
|
| 586 |
self.gridLayout_24.addLayout(self.verticalLayout_7, 0, 0, 1, 1) |
|
| 587 |
self.gridLayout_21.addWidget(self.groupBox_12, 1, 0, 1, 1) |
|
| 564 | 588 |
self.groupBox_11 = QtWidgets.QGroupBox(self.tabETC) |
| 565 | 589 |
self.groupBox_11.setObjectName("groupBox_11")
|
| 566 | 590 |
self.gridLayout_23 = QtWidgets.QGridLayout(self.groupBox_11) |
| ... | ... | |
| 716 | 740 |
self.radioButtonRandom.setText(_translate("ConfigurationDialog", "Random"))
|
| 717 | 741 |
self.radioButtonProperty.setText(_translate("ConfigurationDialog", "Property"))
|
| 718 | 742 |
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabLineColor), _translate("ConfigurationDialog", "Line No Color"))
|
| 743 |
self.groupBox_12.setTitle(_translate("ConfigurationDialog", "Visual"))
|
|
| 744 |
self.label_36.setText(_translate("ConfigurationDialog", "Background Text Transparency"))
|
|
| 745 |
self.radioButtonBackTextYes.setText(_translate("ConfigurationDialog", "Yes"))
|
|
| 746 |
self.radioButtonBackTextNo.setText(_translate("ConfigurationDialog", "No"))
|
|
| 719 | 747 |
self.groupBox_11.setTitle(_translate("ConfigurationDialog", "Program Data"))
|
| 720 | 748 |
self.label_30.setText(_translate("ConfigurationDialog", "Load Data From XML First"))
|
| 721 | 749 |
self.radioButtonLoadXmlYes.setText(_translate("ConfigurationDialog", "Yes"))
|
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 716 | 716 |
if disappear_lines: |
| 717 | 717 |
app_doc_data.allItems.extend(disappear_lines) |
| 718 | 718 |
for dis_line in disappear_lines: |
| 719 |
self.addMessage.emit('check', f"disapper line from scene : {str(dis_line)}")
|
|
| 719 |
self.addMessage.emit(MessageType.Check, f"disapper line from scene : {str(dis_line)}")
|
|
| 720 | 720 |
|
| 721 | 721 |
itemTypes = [] |
| 722 | 722 |
for item in items: |
| ... | ... | |
| 1947 | 1947 |
app_doc_data.tracerLineNos.pop(app_doc_data.tracerLineNos.index(item)) |
| 1948 | 1948 |
|
| 1949 | 1949 |
if type(item) is QEngineeringLineItem: |
| 1950 |
app_doc_data.lines.pop(item)
|
|
| 1950 |
app_doc_data.lines.remove(item)
|
|
| 1951 | 1951 |
|
| 1952 | 1952 |
matches = [_item for _item in self.graphicsView.scene.items() if type(_item) is QEngineeringLineNoTextItem] |
| 1953 | 1953 |
matches.extend([lineNo for lineNo in app_doc_data.tracerLineNos if |
| DTI_PID/DTI_PID/UI/Configuration.ui | ||
|---|---|---|
| 7 | 7 |
<x>0</x> |
| 8 | 8 |
<y>0</y> |
| 9 | 9 |
<width>704</width> |
| 10 |
<height>925</height>
|
|
| 10 |
<height>997</height>
|
|
| 11 | 11 |
</rect> |
| 12 | 12 |
</property> |
| 13 | 13 |
<property name="font"> |
| ... | ... | |
| 1173 | 1173 |
<layout class="QGridLayout" name="gridLayout_22"> |
| 1174 | 1174 |
<item row="0" column="0"> |
| 1175 | 1175 |
<layout class="QGridLayout" name="gridLayout_21"> |
| 1176 |
<item row="1" column="0"> |
|
| 1177 |
<widget class="QGroupBox" name="groupBox_12"> |
|
| 1178 |
<property name="title"> |
|
| 1179 |
<string>Visual</string> |
|
| 1180 |
</property> |
|
| 1181 |
<layout class="QGridLayout" name="gridLayout_24"> |
|
| 1182 |
<item row="0" column="0"> |
|
| 1183 |
<layout class="QVBoxLayout" name="verticalLayout_7"> |
|
| 1184 |
<item> |
|
| 1185 |
<layout class="QHBoxLayout" name="horizontalLayout_25"> |
|
| 1186 |
<item> |
|
| 1187 |
<widget class="QLabel" name="label_36"> |
|
| 1188 |
<property name="text"> |
|
| 1189 |
<string>Background Text Transparency</string> |
|
| 1190 |
</property> |
|
| 1191 |
</widget> |
|
| 1192 |
</item> |
|
| 1193 |
<item> |
|
| 1194 |
<widget class="QRadioButton" name="radioButtonBackTextYes"> |
|
| 1195 |
<property name="text"> |
|
| 1196 |
<string>Yes</string> |
|
| 1197 |
</property> |
|
| 1198 |
<attribute name="buttonGroup"> |
|
| 1199 |
<string notr="true">buttonGroup_4</string> |
|
| 1200 |
</attribute> |
|
| 1201 |
</widget> |
|
| 1202 |
</item> |
|
| 1203 |
<item> |
|
| 1204 |
<widget class="QRadioButton" name="radioButtonBackTextNo"> |
|
| 1205 |
<property name="text"> |
|
| 1206 |
<string>No</string> |
|
| 1207 |
</property> |
|
| 1208 |
<attribute name="buttonGroup"> |
|
| 1209 |
<string notr="true">buttonGroup_4</string> |
|
| 1210 |
</attribute> |
|
| 1211 |
</widget> |
|
| 1212 |
</item> |
|
| 1213 |
</layout> |
|
| 1214 |
</item> |
|
| 1215 |
</layout> |
|
| 1216 |
</item> |
|
| 1217 |
</layout> |
|
| 1218 |
</widget> |
|
| 1219 |
</item> |
|
| 1176 | 1220 |
<item row="0" column="0"> |
| 1177 | 1221 |
<widget class="QGroupBox" name="groupBox_11"> |
| 1178 | 1222 |
<property name="title"> |
| ... | ... | |
| 1379 | 1423 |
</connection> |
| 1380 | 1424 |
</connections> |
| 1381 | 1425 |
<buttongroups> |
| 1426 |
<buttongroup name="buttonGroup_3"/> |
|
| 1382 | 1427 |
<buttongroup name="buttonGroup"/> |
| 1383 | 1428 |
<buttongroup name="buttonGroup_2"/> |
| 1384 |
<buttongroup name="buttonGroup_3"/>
|
|
| 1429 |
<buttongroup name="buttonGroup_4"/>
|
|
| 1385 | 1430 |
</buttongroups> |
| 1386 | 1431 |
</ui> |
내보내기 Unified diff
