개정판 7d66ef2b
drawing open change and ignore save process check
Change-Id: I6005c76ea70266d7f616fe16d8147a246222355f
| DTI_PID/DTI_PID/OPCRelationDialog.py | ||
|---|---|---|
| 332 | 332 |
|
| 333 | 333 |
if self.error: |
| 334 | 334 |
QMessageBox.about(self, self.tr('Error'), self.tr('Please check OPC data.'))
|
| 335 |
return |
|
| 335 | 336 |
|
| 336 | 337 |
try: |
| 337 | 338 |
QApplication.setOverrideCursor(Qt.WaitCursor) |
| DTI_PID/DTI_PID/TcpServer.py | ||
|---|---|---|
| 62 | 62 |
print("HighLight")
|
| 63 | 63 |
|
| 64 | 64 |
from App import App |
| 65 |
from AppDocData import AppDocData |
|
| 65 | 66 |
|
| 66 | 67 |
# Get a QTcpSocket from the QTcpServer |
| 67 | 68 |
clientConnection = self.tcpServer.nextPendingConnection() |
| ... | ... | |
| 72 | 73 |
jsonstr = json.loads(instr) |
| 73 | 74 |
mainWnd = App.mainWnd() |
| 74 | 75 |
data = instr |
| 76 |
docData = AppDocData.instance() |
|
| 75 | 77 |
if data: |
| 76 | 78 |
if jsonstr['request'] == 'prjinfo': |
| 77 |
from AppDocData import AppDocData |
|
| 78 |
|
|
| 79 |
docData = AppDocData.instance() |
|
| 80 | 79 |
if docData.project.database.db_type == 'MSSQL': |
| 81 | 80 |
params = {'host': docData.project.database.host, 'user': docData.project.database.user ,
|
| 82 | 81 |
'password': docData.project.database.password, 'db_name': docData.project.database.db_name, |
| ... | ... | |
| 96 | 95 |
if drawing: |
| 97 | 96 |
name = drawing.name |
| 98 | 97 |
if jsonstr['drawing'] == name.rsplit('.', 1)[0]:
|
| 99 |
mainWnd.open_image_drawing(drawing) |
|
| 100 |
child.setCheckState(0, Qt.Checked) |
|
| 98 |
if docData.activeDrawing != drawing: |
|
| 99 |
mainWnd.open_image_drawing(drawing, force=True) |
|
| 100 |
child.setCheckState(0, Qt.Checked) |
|
| 101 | 101 |
|
| 102 | 102 |
HighLight(jsonstr['oid']) |
| 103 | 103 |
|
내보내기 Unified diff
