프로젝트

일반

사용자정보

개정판 a347455a

IDa347455a6c7c3462c9c747574235d8f74732d5b1
상위 673d8cba
하위 b6efff78

함의성이(가) 약 6년 전에 추가함

issue #655: add refresh ongoing

차이점 보기:

DTI_PID/DTI_PID/AppDocData.py
2589 2589
            # Get a cursor object
2590 2590
            cursor = conn.cursor()
2591 2591

  
2592
            sql = 'select UID, ITEM_NO, SERVICE, FLOW_RATE, PRESSURE, TEMPERATURE, TYPE, RANGE, NOR_LEVEL_MM, NOR_LEVEL_PERCENT, DEL_PRESS, SHUT_OFF, LOCATION, PNID_NO, REV from INSTRUMENT_DATA_LIST'
2592
            #sql = 'select UID, ITEM_NO, SERVICE, FLOW_RATE, PRESSURE, TEMPERATURE, TYPE, RANGE, NOR_LEVEL_MM, NOR_LEVEL_PERCENT, DEL_PRESS, SHUT_OFF, LOCATION, PNID_NO, REV from INSTRUMENT_DATA_LIST'
2593
            sql = 'select * from INSTRUMENT_DATA_LIST'
2593 2594
            if docName is not None:
2594 2595
                sql += " where PNID_NO = '{}'".format(docName)
2595 2596

  
......
3028 3029
            conn.close()
3029 3030

  
3030 3031
        return res
3032
    
3033
    def add_column_into_table(self, table, columnName):
3034
        '''
3035
            @brief  add column into table
3036
            @author euisung
3037
            @date   2019.03.13
3038
        '''
3039
        err = False
3040
        try:
3041
            # Creates or opens a file called mydb with a SQLite3 DB
3042
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), 'ITI_PID.db')
3043
            conn = sqlite3.connect(dbPath)
3044
            # Get a cursor object
3045
            cursor = conn.cursor()
3046
            sql = "alter table {} add {}".format(table, columnName)
3047
            cursor.execute(sql)
3048

  
3049
            conn.commit()
3050

  
3051
        # Catch the exception
3052
        except Exception as ex:
3053
            # Roll back any change if something goes wrong
3054
            conn.rollback()
3055
            err = True
3056
            print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
3057
        finally:
3058
            # Close the db connection
3059
            conn.close()
3060
            return (True if not err else False)
3031 3061

  
3032 3062
    '''
3033 3063
        @brief  getter of OCRData
DTI_PID/DTI_PID/ItemDataAddEditDialog.py
1
# -*- coding: utf-8 -*-
2

  
3
# Form implementation generated from reading ui file 'ProjectDialog.ui'
4
#
5
# Created by: PyQt5 UI code generator 5.6
6
#
7
# WARNING! All changes made in this file will be lost!
8

  
9
from PyQt5 import QtCore, QtGui, QtWidgets
10
from PyQt5.QtWidgets import *
11
import os
12
from Project import Project
13
from AppDocData import AppDocData
14
import ItemDataAddEdit_UI
15

  
16
class QItemDataAddEditDialog(QDialog):
17
    def __init__(self, parent, isAdd, tableName):
18
        QDialog.__init__(self, parent)
19

  
20
        self.selectedProject = None
21
        self.ui = ItemDataAddEdit_UI.Ui_ItemDataAddEditDialog()
22
        self.ui.setupUi(self)
23
        self.isAdd = isAdd
24
        self.tableName = tableName
25
        self.isAccepted = False
26
        if not self.isAdd:
27
            self.setWindowTitle(self.tr('Edit'))
28

  
29
    def showDialog(self):
30
        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowCloseButtonHint & ~QtCore.Qt.WindowContextHelpButtonHint)
31
        self.exec_()
32
        return self.isAccepted, self.newColName
33

  
34
    def accept(self):
35
        appDocData = AppDocData.instance()
36
        self.newColName = self.ui.lineEdit.text()
37
        if self.newColName == '':
38
            return
39
        else:
40
            if appDocData.add_column_into_table(self.tableName, self.ui.lineEdit.text()):
41
                self.isAccepted = True
42
                QDialog.accept(self)
43
            else:
44
                QDialog.reject(self)
45

  
46
    def reject(self):
47
        QDialog.reject(self)
DTI_PID/DTI_PID/ItemDataExportDialog.py
45 45
            self.sceneInstData = {}
46 46
            self.sceneNoteData = {}
47 47

  
48
            #self.lineColumnListAll = []
49
            #self.equipColumnListAll = []
50
            #self.valveColumnListAll = []
51
            #self.instColumnListAll = []
52
            #self.noteColumnListAll = []
48 53
            self.lineColumnListAll = appDocData.getColNames('LINE_DATA_LIST')
49 54
            self.equipColumnListAll = appDocData.getColNames('EQUIPMENT_DATA_LIST')
50 55
            self.valveColumnListAll = appDocData.getColNames('VALVE_DATA_LIST')
......
92 97
                # setting combobox
93 98
                self.initComboBox()
94 99
                # setting table
100
                self.viewTables.append(self.ui.tableWidgetLineDataList)
101
                self.viewTables.append(self.ui.tableWidgetEquipmentDataList)
102
                self.viewTables.append(self.ui.tableWidgetValveDataList)
103
                self.viewTables.append(self.ui.tableWidgetInstrumentDataList)
104
                self.viewTables.append(self.ui.tableWidgetNoteDataList)
95 105
                self.initTableWidget()
96 106
            except Exception as ex:
97 107
                from App import App
......
336 346
                    Euisung 2018.10.25 add initial list saving process
337 347
    '''
338 348
    def initTableWidget(self):
349
        docData = AppDocData.instance()
350
        #self.lineColumnListAll = docData.getColNames('LINE_DATA_LIST')
351
        #self.equipColumnListAll = docData.getColNames('EQUIPMENT_DATA_LIST')
352
        #self.valveColumnListAll = docData.getColNames('VALVE_DATA_LIST')
353
        #self.instColumnListAll = docData.getColNames('INSTRUMENT_DATA_LIST')
354
        #self.noteColumnListAll = docData.getColNames('NOTE_DATA_LIST')
339 355
        # 엑셀 추출시 사용할 리스트 오더를 db에서 읽거나 없으면 db에 추가
340 356
        try:
341 357
            configs = []
342
            docData = AppDocData.instance()
343 358
            for orderIndex in range(len(self.columnOrder)):
344 359
                self.columnOrder[orderIndex] = docData.getConfigs(dbListOrderName[orderIndex], str(orderIndex))
345 360
                if len(self.columnOrder[orderIndex]) is 0:
......
359 374
            App.mainWnd().addMessage.emit(MessageType.Error, message)
360 375
            return None
361 376

  
362
        try:
363
            self.viewTables.append(self.ui.tableWidgetLineDataList)
364
            self.viewTables.append(self.ui.tableWidgetEquipmentDataList)
365
            self.viewTables.append(self.ui.tableWidgetValveDataList)
366
            self.viewTables.append(self.ui.tableWidgetInstrumentDataList)
367
            self.viewTables.append(self.ui.tableWidgetNoteDataList)
368
            
377
        try:           
369 378
            for tableIndex in range(len(self.viewTables)):
370 379
                # set table column count
371 380
                self.viewTables[tableIndex].setColumnCount(len(self.columnListAll[tableIndex]))
......
385 394
            self.settingInstrumentData()
386 395
            self.settingNoteData()
387 396

  
388
            for table in self.viewTables:
389
                self.initialTables.append(table.horizontalHeader().saveState())
397
            #for table in self.viewTables:
398
            #    self.initialTables.append(table.horizontalHeader().saveState())
390 399

  
391 400
            self.sortListOrder()
392 401
        except Exception as ex:
......
406 415
    def sortListOrder(self):
407 416
        try:
408 417
            docData = AppDocData.instance()
418

  
409 419
            for index in range(len(self.viewTables)):
410 420
                self.viewTables[index].setColumnCount(len(self.columnListAll[index]))
411 421
                self.viewTables[index].setHorizontalHeaderLabels(self.columnListAll[index])
412
                self.viewTables[index].horizontalHeader().restoreState(self.initialTables[index])
422
                #self.viewTables[index].horizontalHeader().restoreState(self.initialTables[index])
413 423
                self.columnOrder[index] = docData.getConfigs(dbListOrderName[index], str(index))[0].value.split(self.delimiter)
414 424
                withoutEmpty = []
415 425
                emptys = []
......
814 824
        show item data format dialog
815 825
        """
816 826
        from ItemDataFormatDialog import QItemDataFormatDialog
817
        docData = AppDocData.instance()
818 827

  
819 828
        item_data_format_dialog = QItemDataFormatDialog(self, self.columnListAll, self.columnOrder)
820 829
        item_data_format_dialog.exec_()
821

  
822
        self.sortListOrder()
830
        
831
        self.initTableWidget()
823 832

  
824 833
    '''
825 834
        @brief      doc name change event
......
830 839
    def docNameChanged(self, text):
831 840
        self.settingLineData()
832 841
        self.settingEquipmentData()
833

  
834
        #self.settingLineData()
835
        #self.settingEquipmentData()
836 842
        self.set_valve_data()
837 843
        self.settingInstrumentData()
838 844
        self.settingNoteData()
......
843 849
        @author     kyouho
844 850
        @date       2018.08.13
845 851
        """
846

  
847
        appDocData = AppDocData.instance()
848

  
849 852
        if not self.parent.graphicsView.hasImage():
850 853
            return
851 854

  
DTI_PID/DTI_PID/ItemDataFormatDialog.py
12 12
import ItemDataFormat_UI
13 13

  
14 14
dbListOrderName = ['LINE_DATA_LIST_EXPORT_ORDER', 'EQUIPMENT_DATA_LIST_EXPORT_ORDER', 'VALVE_DATA_LIST_EXPORT_ORDER', 'INSTRUMENT_DATA_LIST_EXPORT_ORDER', 'NOTE_DATA_LIST_EXPORT_ORDER']
15
dbListName = ['LINE_DATA_LIST', 'EQUIPMENT_DATA_LIST', 'VALVE_DATA_LIST', 'INSTRUMENT_DATA_LIST']
15 16

  
16 17
class QItemDataFormatDialog(QDialog):
17 18
    """
......
110 111
        self.emptys.append(self.instrumentEmptyClicked)
111 112
        self.emptys.append(self.noteEmptyClicked)
112 113

  
114
        self.colAddButtons = []
115
        self.colAddButtons.append(self.ui.pushButtonLineColAdd)
116
        self.colAddButtons.append(self.ui.pushButtonEqpColAdd)
117
        self.colAddButtons.append(self.ui.pushButtonValveColAdd)
118
        self.colAddButtons.append(self.ui.pushButtonInstColAdd)
119
        self.colAddButtons.append(self.ui.pushButtonNoteColAdd)
120

  
121
        self.colAdds = []
122
        self.colAdds.append(self.line_add_clicked)
123
        self.colAdds.append(self.equipment_add_clicked)
124
        self.colAdds.append(self.valve_add_clicked)
125
        self.colAdds.append(self.instrument_add_clicked)
126
        self.colAdds.append(self.note_add_clicked)
127

  
113 128
        self.dragItem = None
114 129

  
115 130
        # tableWidget setting
......
145 160
        # attribute list setting
146 161
        for index in range(len(self.listWidgets)):
147 162
            self.listWidgets[index].itemDoubleClicked.connect(self.items[index])
163
            self.colAddButtons[index].clicked.connect(self.colAdds[index])
148 164
            for header in range(1, len(columnListAll[index])):
149 165
                item = QListWidgetItem(columnListAll[index][header])
150 166
                item.setSizeHint(QSize(25, 25))
......
213 229
    def noteDropEvent(self, event):
214 230
        self.dropEvent(event, self.tableWidgets[4], self.listWidgets[4])
215 231

  
232

  
233
    def add_column_clicked(self, tableName, alist):
234
        '''
235
            @brief      add column
236
            @author     euisung
237
            @date       2019.03.13
238
        '''
239
        from ItemDataAddEditDialog import QItemDataAddEditDialog
240

  
241
        item_data_format_dialog = QItemDataAddEditDialog(self, True, tableName)
242
        isAccepted, newColName = item_data_format_dialog.showDialog()
243
        if isAccepted:
244
            #print('added')
245
            item = QListWidgetItem(newColName)
246
            item.setSizeHint(QSize(25, 25))
247
            alist.addItem(item)
248

  
249
    def line_add_clicked(self):
250
        self.add_column_clicked(dbListName[0], self.listWidgets[0])
251

  
252
    def equipment_add_clicked(self):
253
        self.add_column_clicked(dbListName[1], self.listWidgets[1])
254

  
255
    def valve_add_clicked(self):
256
        self.add_column_clicked(dbListName[2], self.listWidgets[2])
257

  
258
    def instrument_add_clicked(self):
259
        self.add_column_clicked(dbListName[3], self.listWidgets[3])
260

  
261
    def note_add_clicked(self):
262
        self.add_column_clicked(dbListName[4], self.listWidgets[4])
263

  
216 264
    '''
217 265
        @brief      add empty column
218 266
        @author     euisung
DTI_PID/DTI_PID/ItemDataFormat_UI.py
189 189
        self.verticalLayout_9.setObjectName("verticalLayout_9")
190 190
        self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
191 191
        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
192
        self.pushButtonValveAdd_2 = QtWidgets.QPushButton(self.tabValveList)
193
        self.pushButtonValveAdd_2.setObjectName("pushButtonValveAdd_2")
194
        self.horizontalLayout_10.addWidget(self.pushButtonValveAdd_2)
195
        self.pushButtonValveDelete_2 = QtWidgets.QPushButton(self.tabValveList)
196
        self.pushButtonValveDelete_2.setObjectName("pushButtonValveDelete_2")
197
        self.horizontalLayout_10.addWidget(self.pushButtonValveDelete_2)
198
        self.pushButtonValveEdit = QtWidgets.QPushButton(self.tabValveList)
199
        self.pushButtonValveEdit.setObjectName("pushButtonValveEdit")
200
        self.horizontalLayout_10.addWidget(self.pushButtonValveEdit)
192
        self.pushButtonValveColAdd = QtWidgets.QPushButton(self.tabValveList)
193
        self.pushButtonValveColAdd.setObjectName("pushButtonValveColAdd")
194
        self.horizontalLayout_10.addWidget(self.pushButtonValveColAdd)
195
        self.pushButtonValveColDelete = QtWidgets.QPushButton(self.tabValveList)
196
        self.pushButtonValveColDelete.setObjectName("pushButtonValveColDelete")
197
        self.horizontalLayout_10.addWidget(self.pushButtonValveColDelete)
198
        self.pushButtonValveColEdit = QtWidgets.QPushButton(self.tabValveList)
199
        self.pushButtonValveColEdit.setObjectName("pushButtonValveColEdit")
200
        self.horizontalLayout_10.addWidget(self.pushButtonValveColEdit)
201 201
        self.verticalLayout_9.addLayout(self.horizontalLayout_10)
202 202
        self.listWidgetValve = QtWidgets.QListWidget(self.tabValveList)
203 203
        self.listWidgetValve.setObjectName("listWidgetValve")
......
243 243
        self.verticalLayout_10.setObjectName("verticalLayout_10")
244 244
        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
245 245
        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
246
        self.pushButtonInstAdd = QtWidgets.QPushButton(self.tabInstList)
247
        self.pushButtonInstAdd.setObjectName("pushButtonInstAdd")
248
        self.horizontalLayout_11.addWidget(self.pushButtonInstAdd)
249
        self.pushButtonInstDelete = QtWidgets.QPushButton(self.tabInstList)
250
        self.pushButtonInstDelete.setObjectName("pushButtonInstDelete")
251
        self.horizontalLayout_11.addWidget(self.pushButtonInstDelete)
252
        self.pushButtonInstEdit = QtWidgets.QPushButton(self.tabInstList)
253
        self.pushButtonInstEdit.setObjectName("pushButtonInstEdit")
254
        self.horizontalLayout_11.addWidget(self.pushButtonInstEdit)
246
        self.pushButtonInstColAdd = QtWidgets.QPushButton(self.tabInstList)
247
        self.pushButtonInstColAdd.setObjectName("pushButtonInstColAdd")
248
        self.horizontalLayout_11.addWidget(self.pushButtonInstColAdd)
249
        self.pushButtonInstColDelete = QtWidgets.QPushButton(self.tabInstList)
250
        self.pushButtonInstColDelete.setObjectName("pushButtonInstColDelete")
251
        self.horizontalLayout_11.addWidget(self.pushButtonInstColDelete)
252
        self.pushButtonInstColEdit = QtWidgets.QPushButton(self.tabInstList)
253
        self.pushButtonInstColEdit.setObjectName("pushButtonInstColEdit")
254
        self.horizontalLayout_11.addWidget(self.pushButtonInstColEdit)
255 255
        self.verticalLayout_10.addLayout(self.horizontalLayout_11)
256 256
        self.listWidgetInstrument = QtWidgets.QListWidget(self.tabInstList)
257 257
        self.listWidgetInstrument.setObjectName("listWidgetInstrument")
......
297 297
        self.verticalLayout_11.setObjectName("verticalLayout_11")
298 298
        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
299 299
        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
300
        self.pushButtonNoteAdd_2 = QtWidgets.QPushButton(self.tabNoteList)
301
        self.pushButtonNoteAdd_2.setObjectName("pushButtonNoteAdd_2")
302
        self.horizontalLayout_12.addWidget(self.pushButtonNoteAdd_2)
303
        self.pushButtonNoteDelete_2 = QtWidgets.QPushButton(self.tabNoteList)
304
        self.pushButtonNoteDelete_2.setObjectName("pushButtonNoteDelete_2")
305
        self.horizontalLayout_12.addWidget(self.pushButtonNoteDelete_2)
306
        self.pushButtonNoteEdit = QtWidgets.QPushButton(self.tabNoteList)
307
        self.pushButtonNoteEdit.setObjectName("pushButtonNoteEdit")
308
        self.horizontalLayout_12.addWidget(self.pushButtonNoteEdit)
300
        self.pushButtonNoteColAdd = QtWidgets.QPushButton(self.tabNoteList)
301
        self.pushButtonNoteColAdd.setObjectName("pushButtonNoteColAdd")
302
        self.horizontalLayout_12.addWidget(self.pushButtonNoteColAdd)
303
        self.pushButtonNoteColDelete = QtWidgets.QPushButton(self.tabNoteList)
304
        self.pushButtonNoteColDelete.setObjectName("pushButtonNoteColDelete")
305
        self.horizontalLayout_12.addWidget(self.pushButtonNoteColDelete)
306
        self.pushButtonNoteColEdit = QtWidgets.QPushButton(self.tabNoteList)
307
        self.pushButtonNoteColEdit.setObjectName("pushButtonNoteColEdit")
308
        self.horizontalLayout_12.addWidget(self.pushButtonNoteColEdit)
309 309
        self.verticalLayout_11.addLayout(self.horizontalLayout_12)
310 310
        self.listWidgetNote = QtWidgets.QListWidget(self.tabNoteList)
311 311
        self.listWidgetNote.setObjectName("listWidgetNote")
......
340 340
        self.pushButtonValveAdd.setText(_translate("ItemDataFormatDialog", "Add Attribute"))
341 341
        self.pushButtonValveEmptyColumn.setText(_translate("ItemDataFormatDialog", "Add Empty Column"))
342 342
        self.pushButtonValveDelete.setText(_translate("ItemDataFormatDialog", "Del Column"))
343
        self.pushButtonValveAdd_2.setText(_translate("ItemDataFormatDialog", "Add"))
344
        self.pushButtonValveDelete_2.setText(_translate("ItemDataFormatDialog", "Delete"))
345
        self.pushButtonValveEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
343
        self.pushButtonValveColAdd.setText(_translate("ItemDataFormatDialog", "Add"))
344
        self.pushButtonValveColDelete.setText(_translate("ItemDataFormatDialog", "Delete"))
345
        self.pushButtonValveColEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
346 346
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabValveList), _translate("ItemDataFormatDialog", "Valve List"))
347 347
        self.pushButtonInstrumentAdd.setText(_translate("ItemDataFormatDialog", "Add Attribute"))
348 348
        self.pushButtonInstrumentEmptyColumn.setText(_translate("ItemDataFormatDialog", "Add Empty Column"))
349 349
        self.pushButtonInstrumentDelete.setText(_translate("ItemDataFormatDialog", "Del Column"))
350
        self.pushButtonInstAdd.setText(_translate("ItemDataFormatDialog", "Add"))
351
        self.pushButtonInstDelete.setText(_translate("ItemDataFormatDialog", "Delete"))
352
        self.pushButtonInstEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
350
        self.pushButtonInstColAdd.setText(_translate("ItemDataFormatDialog", "Add"))
351
        self.pushButtonInstColDelete.setText(_translate("ItemDataFormatDialog", "Delete"))
352
        self.pushButtonInstColEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
353 353
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabInstList), _translate("ItemDataFormatDialog", "Instrumentation List"))
354 354
        self.pushButtonNoteAdd.setText(_translate("ItemDataFormatDialog", "Add Attribute"))
355 355
        self.pushButtonNoteEmptyColumn.setText(_translate("ItemDataFormatDialog", "Add Empty Column"))
356 356
        self.pushButtonNoteDelete.setText(_translate("ItemDataFormatDialog", "Del Column"))
357
        self.pushButtonNoteAdd_2.setText(_translate("ItemDataFormatDialog", "Add"))
358
        self.pushButtonNoteDelete_2.setText(_translate("ItemDataFormatDialog", "Delete"))
359
        self.pushButtonNoteEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
357
        self.pushButtonNoteColAdd.setText(_translate("ItemDataFormatDialog", "Add"))
358
        self.pushButtonNoteColDelete.setText(_translate("ItemDataFormatDialog", "Delete"))
359
        self.pushButtonNoteColEdit.setText(_translate("ItemDataFormatDialog", "Edit"))
360 360
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabNoteList), _translate("ItemDataFormatDialog", "Note List"))
361 361

  
362 362

  
DTI_PID/DTI_PID/UI/ItemDataFormat.ui
391 391
         <item>
392 392
          <layout class="QHBoxLayout" name="horizontalLayout_10">
393 393
           <item>
394
            <widget class="QPushButton" name="pushButtonValveAdd_2">
394
            <widget class="QPushButton" name="pushButtonValveColAdd">
395 395
             <property name="text">
396 396
              <string>Add</string>
397 397
             </property>
398 398
            </widget>
399 399
           </item>
400 400
           <item>
401
            <widget class="QPushButton" name="pushButtonValveDelete_2">
401
            <widget class="QPushButton" name="pushButtonValveColDelete">
402 402
             <property name="text">
403 403
              <string>Delete</string>
404 404
             </property>
405 405
            </widget>
406 406
           </item>
407 407
           <item>
408
            <widget class="QPushButton" name="pushButtonValveEdit">
408
            <widget class="QPushButton" name="pushButtonValveColEdit">
409 409
             <property name="text">
410 410
              <string>Edit</string>
411 411
             </property>
......
502 502
         <item>
503 503
          <layout class="QHBoxLayout" name="horizontalLayout_11">
504 504
           <item>
505
            <widget class="QPushButton" name="pushButtonInstAdd">
505
            <widget class="QPushButton" name="pushButtonInstColAdd">
506 506
             <property name="text">
507 507
              <string>Add</string>
508 508
             </property>
509 509
            </widget>
510 510
           </item>
511 511
           <item>
512
            <widget class="QPushButton" name="pushButtonInstDelete">
512
            <widget class="QPushButton" name="pushButtonInstColDelete">
513 513
             <property name="text">
514 514
              <string>Delete</string>
515 515
             </property>
516 516
            </widget>
517 517
           </item>
518 518
           <item>
519
            <widget class="QPushButton" name="pushButtonInstEdit">
519
            <widget class="QPushButton" name="pushButtonInstColEdit">
520 520
             <property name="text">
521 521
              <string>Edit</string>
522 522
             </property>
......
613 613
         <item>
614 614
          <layout class="QHBoxLayout" name="horizontalLayout_12">
615 615
           <item>
616
            <widget class="QPushButton" name="pushButtonNoteAdd_2">
616
            <widget class="QPushButton" name="pushButtonNoteColAdd">
617 617
             <property name="text">
618 618
              <string>Add</string>
619 619
             </property>
620 620
            </widget>
621 621
           </item>
622 622
           <item>
623
            <widget class="QPushButton" name="pushButtonNoteDelete_2">
623
            <widget class="QPushButton" name="pushButtonNoteColDelete">
624 624
             <property name="text">
625 625
              <string>Delete</string>
626 626
             </property>
627 627
            </widget>
628 628
           </item>
629 629
           <item>
630
            <widget class="QPushButton" name="pushButtonNoteEdit">
630
            <widget class="QPushButton" name="pushButtonNoteColEdit">
631 631
             <property name="text">
632 632
              <string>Edit</string>
633 633
             </property>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)