프로젝트

일반

사용자정보

개정판 f24755f0

IDf24755f012c1a8273a56a82a06867c951aa0e9ec
상위 2d646c99
하위 381a2bc8

gaqhf 이(가) 6년 이상 전에 추가함

dev issue #627: fix bug and add note list tab

차이점 보기:

DTI_PID/DTI_PID/ItemDataExportDialog.py
18 18
        self.sceneLineData = {}
19 19
        self.sceneEquipData = {}
20 20
        self.sceneInstData = {}
21
        self.sceneNoteData = {}
21 22

  
22 23
        self.lineColumnList = []
23 24
        self.equipColumnList = []
24 25
        self.instColumnList = []
26
        self.noteColumnList = []
25 27

  
26 28
        self.removeUID = [[], [], []]
27 29

  
......
53 55
        # evnet connect
54 56
        self.ui.comboBoxDoc.currentTextChanged.connect(self.docNameChanged)
55 57
        self.ui.pushButtonExport.clicked.connect(self.saveExcel)
56

  
57 58
        
58 59

  
59 60
    '''
......
193 194
        lineTable = self.ui.tableWidgetLineDataList
194 195
        equipTable = self.ui.tableWidgetEquipmentDataList
195 196
        instTable = self.ui.tableWidgetInstrumentDataList
197
        noteTable = self.ui.tableWidgetNoteDataList
198
        
199
        noteTable.setColumnCount(4)
196 200

  
197 201
        # Table Header Label 설정
198 202
        self.lineColumnList = ['UID', 'LINE_SIZE', 'LINE_SYMBOL', 'LINE_NO', 'LINE_CLASS', 'LINE_ROUTING_FROM', 'LINE_ROUTING_TO', 'SERVICE_FLUID', 'SERVICE_DENSITY', 'SERVICE_STATE', 'OPERATION_CONDITION_TEMP', 'OPERATION_CONDITION_PRESS', 'DESIGN_CONDITION_TEMP', 'DESIGN_CONDITION_PRESS', 'TEST_CONDITION_TEMP', 'TEST_CONDITION_PRESS', 'INSUL_CODE', 'PAINT_CODE', 'NDE_CODE', 'PWHT', 'PNID_NO']
199 203
        self.equipColumnList = ['UID', 'ITEM_NO', 'SERVICE', 'NO_REQ', 'FLUID', 'DESC_OF_PART', 'OPERATION_CONDITION_TEMP', 'OPERATION_CONDITION_PRESS', 'DESIGN_CONDITION_TEMP', 'DESIGN_CONDITION_PRESS', 'MATERIAL', 'WEIGHT', 'POWER', 'INSULATION', 'PNID_NO', 'REV']
200 204
        self.instColumnList = ['UID', 'ITEM_NO', 'SERVICE', 'FLOW_RATE', 'PRESSURE', 'TEMPERATURE', 'TPYE', 'RANGE', 'NOR_LEVEL_MM', 'NOR_LEVEL_PERCENT', 'DEL_PRESS', 'SHUT_OFF', 'LOCATION', 'PNID_NO', 'REV']
205
        self.noteColumnList = ['UID', 'Note No', 'Description', 'P&ID No']
201 206

  
202 207
        lineTable.setHorizontalHeaderLabels(['UID', 'LINE_SIZE', 'LINE_SYMBOL', 'LINE_NO', 'LINE_CLASS', 'LINE_ROUTING_FROM', 'LINE_ROUTING_TO', 'SERVICE_FLUID', 'SERVICE_DENSITY', 'SERVICE_STATE', 'OPERATION_CONDITION_TEMP', 'OPERATION_CONDITION_PRESS', 'DESIGN_CONDITION_TEMP', 'DESIGN_CONDITION_PRESS', 'TEST_CONDITION_TEMP', 'TEST_CONDITION_PRESS', 'INSUL_CODE', 'PAINT_CODE', 'NDE_CODE', 'PWHT', 'PNID_NO'])
203 208
        equipTable.setHorizontalHeaderLabels(['UID', 'ITEM_NO', 'SERVICE', 'NO_REQ', 'FLUID', 'DESC_OF_PART', 'OPERATION_CONDITION_TEMP', 'OPERATION_CONDITION_PRESS', 'DESIGN_CONDITION_TEMP', 'DESIGN_CONDITION_PRESS', 'MATERIAL', 'WEIGHT', 'POWER', 'INSULATION', 'PNID_NO', 'REV'])
204 209
        instTable.setHorizontalHeaderLabels(['UID', 'ITEM_NO', 'SERVICE', 'FLOW_RATE', 'PRESSURE', 'TEMPERATURE', 'TPYE', 'RANGE', 'NOR_LEVEL_MM', 'NOR_LEVEL_PERCENT', 'DEL_PRESS', 'SHUT_OFF', 'LOCATION', 'PNID_NO', 'REV'])
210
        noteTable.setHorizontalHeaderLabels(['UID', 'Note No', 'Description', 'P&ID No'])
211

  
205 212
        # Table Header 크기 설정
206 213
        lineTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
207 214
        equipTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
208 215
        instTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
216
        noteTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
217
        
209 218
        # UID column hide
210
        #lineTable.hideColumn(0)
211
        #equipTable.hideColumn(0)
212
        #instTable.hideColumn(0)
219
        lineTable.hideColumn(0)
220
        equipTable.hideColumn(0)
221
        instTable.hideColumn(0)
213 222

  
214 223
        # talbe Data 설정
215 224
        self.settingLineData()
216 225
        self.settingEquipmentData()
217 226
        self.settingInstrumentData()
218 227

  
228

  
219 229
    '''
220 230
        @brief      setting line data
221 231
        @author     kyouho
DTI_PID/DTI_PID/ItemDataExport_UI.py
52 52
        self.tableWidgetInstrumentDataList.verticalHeader().setVisible(False)
53 53
        self.gridLayout_7.addWidget(self.tableWidgetInstrumentDataList, 0, 0, 1, 1)
54 54
        self.tabWidget.addTab(self.tabInstrumentList, "")
55
        self.tabNoteList = QtWidgets.QWidget()
56
        self.tabNoteList.setObjectName("tabNoteList")
57
        self.gridLayout_2 = QtWidgets.QGridLayout(self.tabNoteList)
58
        self.gridLayout_2.setObjectName("gridLayout_2")
59
        self.tableWidgetNoteDataList = QtWidgets.QTableWidget(self.tabNoteList)
60
        self.tableWidgetNoteDataList.setObjectName("tableWidgetNoteDataList")
61
        self.tableWidgetNoteDataList.setColumnCount(0)
62
        self.tableWidgetNoteDataList.setRowCount(0)
63
        self.tableWidgetNoteDataList.verticalHeader().setVisible(False)
64
        self.gridLayout_2.addWidget(self.tableWidgetNoteDataList, 0, 0, 1, 1)
65
        self.tabWidget.addTab(self.tabNoteList, "")
55 66
        self.gridLayout.addWidget(self.tabWidget, 0, 1, 1, 1)
56 67
        self.horizontalLayout = QtWidgets.QHBoxLayout()
57 68
        self.horizontalLayout.setObjectName("horizontalLayout")
......
81 92
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabLineList), _translate("ItemDataExportDialog", "라인 리스트"))
82 93
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabEquipmentList), _translate("ItemDataExportDialog", "장치 리스트"))
83 94
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabInstrumentList), _translate("ItemDataExportDialog", "계장 리스트"))
95
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabNoteList), _translate("ItemDataExportDialog", "노트 리스트"))
84 96
        self.pushButtonExport.setText(_translate("ItemDataExportDialog", "Export"))
85 97

  
86 98

  
DTI_PID/DTI_PID/MainWindow.py
983 983
            return
984 984

  
985 985
        try:
986
            self.removedItems['LINE'] = []
987
            self.removedItems['EQUIP'] = []
988
            self.removedItems['INST'] = []
989

  
986 990
            appDocData = AppDocData.instance()
987 991
            self.resultTreeWidget.setCurrentPID(appDocData.activeDrawing.name)
988 992
            ## up to here
DTI_PID/DTI_PID/Shapes/EngineeringLineNoTextItem.py
266 266

  
267 267
            docData = AppDocData.instance()
268 268
            attrs = self.getAttributes()
269

  
269
            attrs = attrs.items()
270 270
            for index in range(len(lineColumnList)):
271 271
                dataList.append('')
272 272

  
......
310 310
        except Exception as ex:
311 311
            print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
312 312

  
313
        if dataList[0] == '':
314
            dataList[0] = str(uuid.uuid4())
315

  
313 316
        return dataList
DTI_PID/DTI_PID/Shapes/EngineeringRunItem.py
257 257

  
258 258

  
259 259

  
260

  
261 260
        except Exception as ex: 
262 261
            print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
263 262

  
DTI_PID/DTI_PID/UI/ItemDataExport.ui
127 127
       </item>
128 128
      </layout>
129 129
     </widget>
130
     <widget class="QWidget" name="tabNoteList">
131
      <attribute name="title">
132
       <string>노트 리스트</string>
133
      </attribute>
134
      <layout class="QGridLayout" name="gridLayout_2">
135
       <item row="0" column="0">
136
        <widget class="QTableWidget" name="tableWidgetNoteDataList">
137
         <attribute name="verticalHeaderVisible">
138
          <bool>false</bool>
139
         </attribute>
140
        </widget>
141
       </item>
142
      </layout>
143
     </widget>
130 144
    </widget>
131 145
   </item>
132 146
   <item row="1" column="1">

내보내기 Unified diff

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