개정판 3a6c46a5
issue #1233: add clear drawing access information clear func
Change-Id: Ia17afa75ff0a7fd8f28770b965aefd140ba85616
DTI_PID/DTI_PID/AppDocData.py | ||
---|---|---|
173 | 173 |
try: |
174 | 174 |
# Get a cursor object |
175 | 175 |
cursor = conn.cursor() |
176 |
sql = "UPDATE Drawings SET [OCCUPIED]=null WHERE [OCCUPIED]='{}' and UID='{}'".format(os.environ['COMPUTERNAME'], drawing) |
|
176 |
if drawing: |
|
177 |
sql = "UPDATE Drawings SET [OCCUPIED]=null WHERE [OCCUPIED]='{}' and UID='{}'".format(os.environ['COMPUTERNAME'], drawing) |
|
178 |
else: |
|
179 |
sql = "UPDATE Drawings SET [OCCUPIED]=null" |
|
177 | 180 |
cursor.execute(sql) |
178 | 181 |
|
179 | 182 |
conn.commit() |
DTI_PID/DTI_PID/ConfigurationDialog.py | ||
---|---|---|
310 | 310 |
self.ui.pushButtonLineNoAttribute.clicked.connect(self.editLineNoAttributeClicked) |
311 | 311 |
self.ui.checkBoxNoteNoSymbolName.stateChanged.connect(self.checkBoxNoteNoSymbolNameChanged) |
312 | 312 |
self.ui.listWidgetLineNo.itemDoubleClicked.connect(self.lineNoItemDoubleCliced) |
313 |
self.ui.pushButtonClearAccessInfo.clicked.connect(self.clear_drawing_access_info_clicked) |
|
314 |
|
|
315 |
def clear_drawing_access_info_clicked(self): |
|
316 |
reply = QMessageBox.question(self, self.tr('Continue?'), self.tr('Are you sure you want to clear drawing access information?'), QMessageBox.Yes, QMessageBox.Cancel) |
|
317 |
if reply == QMessageBox.Yes: |
|
318 |
AppDocData.instance().clear_occupying_drawing(None) |
|
319 |
QMessageBox.information(self, self.tr('Information'), self.tr('Succeeded')) |
|
313 | 320 |
|
314 | 321 |
def lineNoItemDoubleCliced(self, item): |
315 | 322 |
from ConfigurationLineNoDialog import QConfigurationLineNoDialog |
DTI_PID/DTI_PID/Configuration_UI.py | ||
---|---|---|
544 | 544 |
self.radioButtonLoadXmlNo.setObjectName("radioButtonLoadXmlNo") |
545 | 545 |
self.horizontalLayout_7.addWidget(self.radioButtonLoadXmlNo) |
546 | 546 |
self.verticalLayout_4.addLayout(self.horizontalLayout_7) |
547 |
self.horizontalLayout_9 = QtWidgets.QHBoxLayout() |
|
548 |
self.horizontalLayout_9.setObjectName("horizontalLayout_9") |
|
549 |
self.label_31 = QtWidgets.QLabel(self.groupBox_11) |
|
550 |
self.label_31.setObjectName("label_31") |
|
551 |
self.horizontalLayout_9.addWidget(self.label_31) |
|
552 |
spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) |
|
553 |
self.horizontalLayout_9.addItem(spacerItem7) |
|
554 |
self.pushButtonClearAccessInfo = QtWidgets.QPushButton(self.groupBox_11) |
|
555 |
self.pushButtonClearAccessInfo.setObjectName("pushButtonClearAccessInfo") |
|
556 |
self.horizontalLayout_9.addWidget(self.pushButtonClearAccessInfo) |
|
557 |
self.verticalLayout_4.addLayout(self.horizontalLayout_9) |
|
547 | 558 |
self.gridLayout_23.addLayout(self.verticalLayout_4, 0, 0, 1, 1) |
548 | 559 |
self.gridLayout_21.addWidget(self.groupBox_11, 0, 0, 1, 1) |
549 | 560 |
self.gridLayout_22.addLayout(self.gridLayout_21, 0, 0, 1, 1) |
550 |
spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
|
551 |
self.gridLayout_22.addItem(spacerItem7, 1, 0, 1, 1)
|
|
561 |
spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
|
562 |
self.gridLayout_22.addItem(spacerItem8, 2, 0, 1, 1)
|
|
552 | 563 |
self.tabWidget.addTab(self.tabETC, "") |
553 | 564 |
self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) |
554 | 565 |
self.buttonBox = QtWidgets.QDialogButtonBox(ConfigurationDialog) |
... | ... | |
645 | 656 |
self.label_30.setText(_translate("ConfigurationDialog", "Load Data From XML First")) |
646 | 657 |
self.radioButtonLoadXmlYes.setText(_translate("ConfigurationDialog", "Yes")) |
647 | 658 |
self.radioButtonLoadXmlNo.setText(_translate("ConfigurationDialog", "No")) |
659 |
self.label_31.setText(_translate("ConfigurationDialog", "Clear Drawing Access Information")) |
|
660 |
self.pushButtonClearAccessInfo.setText(_translate("ConfigurationDialog", "Clear")) |
|
648 | 661 |
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabETC), _translate("ConfigurationDialog", "etc")) |
649 | 662 |
|
650 | 663 |
import MainWindow_rc |
DTI_PID/DTI_PID/SymbolThicknessDialog.py | ||
---|---|---|
48 | 48 |
e = cv2.erode(new, kernel, iterations=1) |
49 | 49 |
cv2.imwrite(fullPath, e) |
50 | 50 |
|
51 |
QMessageBox.information(self, self.tr('Information'), self.tr('Success'))
|
|
51 |
QMessageBox.information(self, self.tr('Information'), self.tr('Succeeded'))
|
|
52 | 52 |
except Exception as ex: |
53 | 53 |
from App import App |
54 | 54 |
from AppDocData import MessageType |
DTI_PID/DTI_PID/UI/Configuration.ui | ||
---|---|---|
1129 | 1129 |
</item> |
1130 | 1130 |
</layout> |
1131 | 1131 |
</item> |
1132 |
<item> |
|
1133 |
<layout class="QHBoxLayout" name="horizontalLayout_9"> |
|
1134 |
<item> |
|
1135 |
<widget class="QLabel" name="label_31"> |
|
1136 |
<property name="text"> |
|
1137 |
<string>Clear Drawing Access Information</string> |
|
1138 |
</property> |
|
1139 |
</widget> |
|
1140 |
</item> |
|
1141 |
<item> |
|
1142 |
<spacer name="horizontalSpacer_6"> |
|
1143 |
<property name="orientation"> |
|
1144 |
<enum>Qt::Horizontal</enum> |
|
1145 |
</property> |
|
1146 |
<property name="sizeHint" stdset="0"> |
|
1147 |
<size> |
|
1148 |
<width>40</width> |
|
1149 |
<height>20</height> |
|
1150 |
</size> |
|
1151 |
</property> |
|
1152 |
</spacer> |
|
1153 |
</item> |
|
1154 |
<item> |
|
1155 |
<widget class="QPushButton" name="pushButtonClearAccessInfo"> |
|
1156 |
<property name="text"> |
|
1157 |
<string>Clear</string> |
|
1158 |
</property> |
|
1159 |
</widget> |
|
1160 |
</item> |
|
1161 |
</layout> |
|
1162 |
</item> |
|
1132 | 1163 |
</layout> |
1133 | 1164 |
</item> |
1134 | 1165 |
</layout> |
... | ... | |
1136 | 1167 |
</item> |
1137 | 1168 |
</layout> |
1138 | 1169 |
</item> |
1139 |
<item row="1" column="0">
|
|
1170 |
<item row="2" column="0">
|
|
1140 | 1171 |
<spacer name="verticalSpacer_2"> |
1141 | 1172 |
<property name="orientation"> |
1142 | 1173 |
<enum>Qt::Vertical</enum> |
내보내기 Unified diff