개정판 7e003f07
issue #665: 리스트 양식 오류 수정
Change-Id: I6bcb02bb3fd8ef0fc1ac9d3cb2a811a98db93b87
| DTI_PID/DTI_PID/ItemDataFormatDialog.py | ||
|---|---|---|
| 285 | 285 |
# self.update() |
| 286 | 286 |
|
| 287 | 287 |
def lineDropEvent(self, event): |
| 288 |
self.dropEvent(event, self.tableWidgets[0], self.listWidgets[0]) |
|
| 288 |
self.dropEvent(event, self.tableWidgets[QItemDataFormatDialog.DATA_LIST[0]], |
|
| 289 |
self.listWidgets[QItemDataFormatDialog.DATA_LIST[0]]) |
|
| 289 | 290 |
|
| 290 | 291 |
def equipmentDropEvent(self, event): |
| 291 |
self.dropEvent(event, self.tableWidgets[1], self.listWidgets[1]) |
|
| 292 |
self.dropEvent(event, self.tableWidgets[QItemDataFormatDialog.DATA_LIST[1]], |
|
| 293 |
self.listWidgets[QItemDataFormatDialog.DATA_LIST[1]]) |
|
| 292 | 294 |
|
| 293 | 295 |
def valveDropEvent(self, event): |
| 294 |
self.dropEvent(event, self.tableWidgets[2], self.listWidgets[2]) |
|
| 296 |
self.dropEvent(event, self.tableWidgets[QItemDataFormatDialog.DATA_LIST[2]], |
|
| 297 |
self.listWidgets[QItemDataFormatDialog.DATA_LIST[2]]) |
|
| 295 | 298 |
|
| 296 | 299 |
def instrumentDropEvent(self, event): |
| 297 |
self.dropEvent(event, self.tableWidgets[3], self.listWidgets[3]) |
|
| 300 |
self.dropEvent(event, self.tableWidgets[QItemDataFormatDialog.DATA_LIST[3]], |
|
| 301 |
self.listWidgets[QItemDataFormatDialog.DATA_LIST[3]]) |
|
| 298 | 302 |
|
| 299 | 303 |
def noteDropEvent(self, event): |
| 300 |
self.dropEvent(event, self.tableWidgets[4], self.listWidgets[4]) |
|
| 304 |
self.dropEvent(event, self.tableWidgets[QItemDataFormatDialog.DATA_LIST[4]], |
|
| 305 |
self.listWidgets[QItemDataFormatDialog.DATA_LIST[4]]) |
|
| 301 | 306 |
|
| 302 | 307 |
def edit_column_clicked(self, tableName, alist, colList, history): |
| 303 | 308 |
''' |
| DTI_PID/DTI_PID/Project_UI.py | ||
|---|---|---|
| 13 | 13 |
class Ui_ProjectDialog(object): |
| 14 | 14 |
def setupUi(self, ProjectDialog): |
| 15 | 15 |
ProjectDialog.setObjectName("ProjectDialog")
|
| 16 |
ProjectDialog.resize(679, 325)
|
|
| 16 |
ProjectDialog.resize(679, 298)
|
|
| 17 | 17 |
ProjectDialog.setMinimumSize(QtCore.QSize(0, 0)) |
| 18 | 18 |
ProjectDialog.setMaximumSize(QtCore.QSize(16777215, 16777215)) |
| 19 | 19 |
font = QtGui.QFont() |
| ... | ... | |
| 81 | 81 |
self.comboBoxProjectUnit = QtWidgets.QComboBox(ProjectDialog) |
| 82 | 82 |
self.comboBoxProjectUnit.setObjectName("comboBoxProjectUnit")
|
| 83 | 83 |
self.gridLayout_4.addWidget(self.comboBoxProjectUnit, 2, 1, 1, 1) |
| 84 |
self.lineEditProjectDesc = QtWidgets.QLineEdit(ProjectDialog) |
|
| 85 |
self.lineEditProjectDesc.setObjectName("lineEditProjectDesc")
|
|
| 86 |
self.gridLayout_4.addWidget(self.lineEditProjectDesc, 1, 1, 1, 1) |
|
| 87 |
self.toolButtonDelete = QtWidgets.QToolButton(ProjectDialog) |
|
| 88 |
self.toolButtonDelete.setObjectName("toolButtonDelete")
|
|
| 89 |
self.gridLayout_4.addWidget(self.toolButtonDelete, 0, 3, 1, 1) |
|
| 90 |
self.label_2 = QtWidgets.QLabel(ProjectDialog) |
|
| 84 |
self.comboBox = QtWidgets.QComboBox(ProjectDialog) |
|
| 91 | 85 |
font = QtGui.QFont() |
| 86 |
font.setFamily("맑은 고딕")
|
|
| 87 |
font.setPointSize(10) |
|
| 88 |
font.setBold(True) |
|
| 89 |
font.setWeight(75) |
|
| 90 |
self.comboBox.setFont(font) |
|
| 91 |
self.comboBox.setObjectName("comboBox")
|
|
| 92 |
self.gridLayout_4.addWidget(self.comboBox, 0, 1, 1, 1) |
|
| 93 |
self.label = QtWidgets.QLabel(ProjectDialog) |
|
| 94 |
font = QtGui.QFont() |
|
| 95 |
font.setFamily("맑은 고딕")
|
|
| 92 | 96 |
font.setPointSize(10) |
| 93 | 97 |
font.setBold(False) |
| 94 | 98 |
font.setWeight(50) |
| 95 |
self.label_2.setFont(font)
|
|
| 96 |
self.label_2.setObjectName("label_2")
|
|
| 97 |
self.gridLayout_4.addWidget(self.label_2, 1, 0, 1, 1)
|
|
| 99 |
self.label.setFont(font) |
|
| 100 |
self.label.setObjectName("label")
|
|
| 101 |
self.gridLayout_4.addWidget(self.label, 0, 0, 1, 1)
|
|
| 98 | 102 |
self.toolButton = QtWidgets.QToolButton(ProjectDialog) |
| 99 | 103 |
font = QtGui.QFont() |
| 100 | 104 |
font.setFamily("Noto Sans CJK KR Bold")
|
| ... | ... | |
| 106 | 110 |
self.toolButton.setIcon(icon) |
| 107 | 111 |
self.toolButton.setObjectName("toolButton")
|
| 108 | 112 |
self.gridLayout_4.addWidget(self.toolButton, 0, 2, 1, 1) |
| 109 |
self.label = QtWidgets.QLabel(ProjectDialog) |
|
| 113 |
self.label_2 = QtWidgets.QLabel(ProjectDialog)
|
|
| 110 | 114 |
font = QtGui.QFont() |
| 111 |
font.setFamily("맑은 고딕")
|
|
| 112 | 115 |
font.setPointSize(10) |
| 113 | 116 |
font.setBold(False) |
| 114 | 117 |
font.setWeight(50) |
| 115 |
self.label.setFont(font) |
|
| 116 |
self.label.setObjectName("label")
|
|
| 117 |
self.gridLayout_4.addWidget(self.label, 0, 0, 1, 1) |
|
| 118 |
self.comboBox = QtWidgets.QComboBox(ProjectDialog) |
|
| 119 |
font = QtGui.QFont() |
|
| 120 |
font.setFamily("맑은 고딕")
|
|
| 121 |
font.setPointSize(10) |
|
| 122 |
font.setBold(True) |
|
| 123 |
font.setWeight(75) |
|
| 124 |
self.comboBox.setFont(font) |
|
| 125 |
self.comboBox.setObjectName("comboBox")
|
|
| 126 |
self.gridLayout_4.addWidget(self.comboBox, 0, 1, 1, 1) |
|
| 118 |
self.label_2.setFont(font) |
|
| 119 |
self.label_2.setObjectName("label_2")
|
|
| 120 |
self.gridLayout_4.addWidget(self.label_2, 1, 0, 1, 1) |
|
| 121 |
self.toolButtonDelete = QtWidgets.QToolButton(ProjectDialog) |
|
| 122 |
self.toolButtonDelete.setObjectName("toolButtonDelete")
|
|
| 123 |
self.gridLayout_4.addWidget(self.toolButtonDelete, 0, 3, 1, 1) |
|
| 124 |
self.lineEditProjectDesc = QtWidgets.QLineEdit(ProjectDialog) |
|
| 125 |
self.lineEditProjectDesc.setObjectName("lineEditProjectDesc")
|
|
| 126 |
self.gridLayout_4.addWidget(self.lineEditProjectDesc, 1, 1, 1, 1) |
|
| 127 | 127 |
self.label_3 = QtWidgets.QLabel(ProjectDialog) |
| 128 | 128 |
font = QtGui.QFont() |
| 129 | 129 |
font.setPointSize(10) |
| ... | ... | |
| 132 | 132 |
self.label_3.setFont(font) |
| 133 | 133 |
self.label_3.setObjectName("label_3")
|
| 134 | 134 |
self.gridLayout_4.addWidget(self.label_3, 2, 0, 1, 1) |
| 135 |
self.label_4 = QtWidgets.QLabel(ProjectDialog) |
|
| 136 |
font = QtGui.QFont() |
|
| 137 |
font.setPointSize(10) |
|
| 138 |
font.setBold(False) |
|
| 139 |
font.setWeight(50) |
|
| 140 |
self.label_4.setFont(font) |
|
| 141 |
self.label_4.setObjectName("label_4")
|
|
| 142 |
self.gridLayout_4.addWidget(self.label_4, 3, 0, 1, 1) |
|
| 143 |
self.comboBox_2 = QtWidgets.QComboBox(ProjectDialog) |
|
| 144 |
self.comboBox_2.setEnabled(False) |
|
| 145 |
font = QtGui.QFont() |
|
| 146 |
font.setPointSize(10) |
|
| 147 |
font.setBold(False) |
|
| 148 |
font.setWeight(50) |
|
| 149 |
self.comboBox_2.setFont(font) |
|
| 150 |
self.comboBox_2.setObjectName("comboBox_2")
|
|
| 151 |
self.comboBox_2.addItem("")
|
|
| 152 |
self.comboBox_2.addItem("")
|
|
| 153 |
self.comboBox_2.addItem("")
|
|
| 154 |
self.gridLayout_4.addWidget(self.comboBox_2, 3, 1, 1, 1) |
|
| 155 | 135 |
self.gridLayout.addLayout(self.gridLayout_4, 0, 0, 1, 1) |
| 156 | 136 |
|
| 157 | 137 |
self.retranslateUi(ProjectDialog) |
| ... | ... | |
| 162 | 142 |
ProjectDialog.setTabOrder(self.toolButton, self.toolButtonDelete) |
| 163 | 143 |
ProjectDialog.setTabOrder(self.toolButtonDelete, self.lineEditProjectDesc) |
| 164 | 144 |
ProjectDialog.setTabOrder(self.lineEditProjectDesc, self.comboBoxProjectUnit) |
| 165 |
ProjectDialog.setTabOrder(self.comboBoxProjectUnit, self.comboBox_2) |
|
| 166 |
ProjectDialog.setTabOrder(self.comboBox_2, self.radioButtonSQLite) |
|
| 145 |
ProjectDialog.setTabOrder(self.comboBoxProjectUnit, self.radioButtonSQLite) |
|
| 167 | 146 |
ProjectDialog.setTabOrder(self.radioButtonSQLite, self.radioButtonMSSQL) |
| 168 | 147 |
ProjectDialog.setTabOrder(self.radioButtonMSSQL, self.lineEditServer) |
| 169 | 148 |
ProjectDialog.setTabOrder(self.lineEditServer, self.lineEditUser) |
| ... | ... | |
| 180 | 159 |
self.labelPassword.setText(_translate("ProjectDialog", "Password"))
|
| 181 | 160 |
self.pushButtonTestConnection.setText(_translate("ProjectDialog", "Test Connection"))
|
| 182 | 161 |
self.radioButtonMSSQL.setText(_translate("ProjectDialog", "MSSQL"))
|
| 183 |
self.toolButtonDelete.setText(_translate("ProjectDialog", "-"))
|
|
| 184 |
self.label_2.setText(_translate("ProjectDialog", "Project Desc"))
|
|
| 185 |
self.toolButton.setText(_translate("ProjectDialog", "+"))
|
|
| 186 | 162 |
self.label.setText(_translate("ProjectDialog", "Project Name"))
|
| 163 |
self.toolButton.setText(_translate("ProjectDialog", "+"))
|
|
| 164 |
self.label_2.setText(_translate("ProjectDialog", "Project Desc"))
|
|
| 165 |
self.toolButtonDelete.setText(_translate("ProjectDialog", "-"))
|
|
| 187 | 166 |
self.label_3.setText(_translate("ProjectDialog", "Project Unit"))
|
| 188 |
self.label_4.setText(_translate("ProjectDialog", "Target System"))
|
|
| 189 |
self.comboBox_2.setItemText(0, _translate("ProjectDialog", "SmartPlant P&ID"))
|
|
| 190 |
self.comboBox_2.setItemText(1, _translate("ProjectDialog", "AVEVA P&ID"))
|
|
| 191 |
self.comboBox_2.setItemText(2, _translate("ProjectDialog", "IX3"))
|
|
| 192 | 167 |
import MainWindow_rc |
| DTI_PID/DTI_PID/SymbolEditorDialog.py | ||
|---|---|---|
| 122 | 122 |
sys.exc_info()[-1].tb_lineno) |
| 123 | 123 |
App.mainWnd().addMessage.emit(MessageType.Error, message) |
| 124 | 124 |
|
| 125 |
def showEvent(self, QShowEvent): |
|
| 126 |
"""show event""" |
|
| 127 |
self.ui.imageView.zoomImageInit() |
|
| 128 |
|
|
| 125 | 129 |
def onAreaCreated(self, x, y, width, height): |
| 126 | 130 |
import uuid |
| 127 | 131 |
THICKNESS = 1 |
| DTI_PID/DTI_PID/UI/Project.ui | ||
|---|---|---|
| 7 | 7 |
<x>0</x> |
| 8 | 8 |
<y>0</y> |
| 9 | 9 |
<width>679</width> |
| 10 |
<height>325</height>
|
|
| 10 |
<height>298</height>
|
|
| 11 | 11 |
</rect> |
| 12 | 12 |
</property> |
| 13 | 13 |
<property name="minimumSize"> |
| ... | ... | |
| 141 | 141 |
<item row="2" column="1"> |
| 142 | 142 |
<widget class="QComboBox" name="comboBoxProjectUnit"/> |
| 143 | 143 |
</item> |
| 144 |
<item row="1" column="1"> |
|
| 145 |
<widget class="QLineEdit" name="lineEditProjectDesc"/> |
|
| 146 |
</item> |
|
| 147 |
<item row="0" column="3"> |
|
| 148 |
<widget class="QToolButton" name="toolButtonDelete"> |
|
| 149 |
<property name="text"> |
|
| 150 |
<string>-</string> |
|
| 144 |
<item row="0" column="1"> |
|
| 145 |
<widget class="QComboBox" name="comboBox"> |
|
| 146 |
<property name="font"> |
|
| 147 |
<font> |
|
| 148 |
<family>맑은 고딕</family> |
|
| 149 |
<pointsize>10</pointsize> |
|
| 150 |
<weight>75</weight> |
|
| 151 |
<bold>true</bold> |
|
| 152 |
</font> |
|
| 151 | 153 |
</property> |
| 152 | 154 |
</widget> |
| 153 | 155 |
</item> |
| 154 |
<item row="1" column="0">
|
|
| 155 |
<widget class="QLabel" name="label_2">
|
|
| 156 |
<item row="0" column="0">
|
|
| 157 |
<widget class="QLabel" name="label"> |
|
| 156 | 158 |
<property name="font"> |
| 157 | 159 |
<font> |
| 160 |
<family>맑은 고딕</family> |
|
| 158 | 161 |
<pointsize>10</pointsize> |
| 159 | 162 |
<weight>50</weight> |
| 160 | 163 |
<bold>false</bold> |
| 161 | 164 |
</font> |
| 162 | 165 |
</property> |
| 163 | 166 |
<property name="text"> |
| 164 |
<string>Project Desc</string>
|
|
| 167 |
<string>Project Name</string>
|
|
| 165 | 168 |
</property> |
| 166 | 169 |
</widget> |
| 167 | 170 |
</item> |
| ... | ... | |
| 184 | 187 |
</property> |
| 185 | 188 |
</widget> |
| 186 | 189 |
</item> |
| 187 |
<item row="0" column="0">
|
|
| 188 |
<widget class="QLabel" name="label"> |
|
| 190 |
<item row="1" column="0">
|
|
| 191 |
<widget class="QLabel" name="label_2">
|
|
| 189 | 192 |
<property name="font"> |
| 190 | 193 |
<font> |
| 191 |
<family>맑은 고딕</family> |
|
| 192 | 194 |
<pointsize>10</pointsize> |
| 193 | 195 |
<weight>50</weight> |
| 194 | 196 |
<bold>false</bold> |
| 195 | 197 |
</font> |
| 196 | 198 |
</property> |
| 197 | 199 |
<property name="text"> |
| 198 |
<string>Project Name</string>
|
|
| 200 |
<string>Project Desc</string>
|
|
| 199 | 201 |
</property> |
| 200 | 202 |
</widget> |
| 201 | 203 |
</item> |
| 202 |
<item row="0" column="1"> |
|
| 203 |
<widget class="QComboBox" name="comboBox"> |
|
| 204 |
<property name="font"> |
|
| 205 |
<font> |
|
| 206 |
<family>맑은 고딕</family> |
|
| 207 |
<pointsize>10</pointsize> |
|
| 208 |
<weight>75</weight> |
|
| 209 |
<bold>true</bold> |
|
| 210 |
</font> |
|
| 204 |
<item row="0" column="3"> |
|
| 205 |
<widget class="QToolButton" name="toolButtonDelete"> |
|
| 206 |
<property name="text"> |
|
| 207 |
<string>-</string> |
|
| 211 | 208 |
</property> |
| 212 | 209 |
</widget> |
| 213 | 210 |
</item> |
| 211 |
<item row="1" column="1"> |
|
| 212 |
<widget class="QLineEdit" name="lineEditProjectDesc"/> |
|
| 213 |
</item> |
|
| 214 | 214 |
<item row="2" column="0"> |
| 215 | 215 |
<widget class="QLabel" name="label_3"> |
| 216 | 216 |
<property name="font"> |
| ... | ... | |
| 225 | 225 |
</property> |
| 226 | 226 |
</widget> |
| 227 | 227 |
</item> |
| 228 |
<item row="3" column="0"> |
|
| 229 |
<widget class="QLabel" name="label_4"> |
|
| 230 |
<property name="font"> |
|
| 231 |
<font> |
|
| 232 |
<pointsize>10</pointsize> |
|
| 233 |
<weight>50</weight> |
|
| 234 |
<bold>false</bold> |
|
| 235 |
</font> |
|
| 236 |
</property> |
|
| 237 |
<property name="text"> |
|
| 238 |
<string>Target System</string> |
|
| 239 |
</property> |
|
| 240 |
</widget> |
|
| 241 |
</item> |
|
| 242 |
<item row="3" column="1"> |
|
| 243 |
<widget class="QComboBox" name="comboBox_2"> |
|
| 244 |
<property name="enabled"> |
|
| 245 |
<bool>false</bool> |
|
| 246 |
</property> |
|
| 247 |
<property name="font"> |
|
| 248 |
<font> |
|
| 249 |
<pointsize>10</pointsize> |
|
| 250 |
<weight>50</weight> |
|
| 251 |
<bold>false</bold> |
|
| 252 |
</font> |
|
| 253 |
</property> |
|
| 254 |
<item> |
|
| 255 |
<property name="text"> |
|
| 256 |
<string>SmartPlant P&ID</string> |
|
| 257 |
</property> |
|
| 258 |
</item> |
|
| 259 |
<item> |
|
| 260 |
<property name="text"> |
|
| 261 |
<string>AVEVA P&ID</string> |
|
| 262 |
</property> |
|
| 263 |
</item> |
|
| 264 |
<item> |
|
| 265 |
<property name="text"> |
|
| 266 |
<string>IX3</string> |
|
| 267 |
</property> |
|
| 268 |
</item> |
|
| 269 |
</widget> |
|
| 270 |
</item> |
|
| 271 | 228 |
</layout> |
| 272 | 229 |
</item> |
| 273 | 230 |
</layout> |
| ... | ... | |
| 278 | 235 |
<tabstop>toolButtonDelete</tabstop> |
| 279 | 236 |
<tabstop>lineEditProjectDesc</tabstop> |
| 280 | 237 |
<tabstop>comboBoxProjectUnit</tabstop> |
| 281 |
<tabstop>comboBox_2</tabstop> |
|
| 282 | 238 |
<tabstop>radioButtonSQLite</tabstop> |
| 283 | 239 |
<tabstop>radioButtonMSSQL</tabstop> |
| 284 | 240 |
<tabstop>lineEditServer</tabstop> |
내보내기 Unified diff
