프로젝트

일반

사용자정보

개정판 eb71581d

IDeb71581d8a613b2bd30291e708544f43488c444c
상위 701cd8c0
하위 da7a24bc

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

dev issue #627: ui 변경 및 첫번째 텍스트 아이템을 Tag No(Item No)로 설정

차이점 보기:

DTI_PID/DTI_PID/ItemDataExportDialog.py
88 88 
        lineTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
89 89 
        equipTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
90 90 
        instTable.horizontalHeaderItem(1).setSizeHint(QSize(40, 40))
91 
        # UID column hide
92 
        #lineTable.hideColumn(0)
93 
        #equipTable.hideColumn(0)
94 
        #instTable.hideColumn(0)
91 95 

  		




  92
  96
  
    
        # talbe Data 설정


  		




  93
  97
  
    
        self.settingLineData()


  		












  

    
      DTI_PID/DTI_PID/MainWindow.py
    
  





  143
  143
  
    
        self.pushButtonCreateSymbol.clicked.connect(self.createSymbol)


  		




  144
  144
  
    
        self.pushButtonClearLog.clicked.connect(self.onClearLog)


  		




  145
  145
  
    
        self.actionHMB_DATA.triggered.connect(self.onHMBData)


  		




  146
  
  
    
        self.actionEquipment_Data_List.triggered.connect(self.showEquipmentDataList)


  		




  147
  
  
    
        self.actionLine_Data_List.triggered.connect(self.showLineDataList)


  		




  148
  
  
    
        self.actionInstrument_Data_List.triggered.connect(self.showInstrumentDataList)


  		




  
  146
  
    
        self.actionItem_Data_List.triggered.connect(self.showItemDataList)


  		




  149
  147
  
    
        self.actionCodeTable.triggered.connect(self.onShowCodeTable)


  		




  150
  148
  
    
        self.actionImage_Drawing.triggered.connect(self.onViewImageDrawing)


  		




  151
  149
  
    
        self.actionViewText.triggered.connect(self.onViewText)


  		




  ......




  485
  483
  
    
        dlg.exec_()


  		




  486
  484
  
    

  		




  487
  485
  
    
    '''


  		




  488
  
  
    
        @brief  show equipment data list 


  		




  489
  
  
    
        @author humkyung


  		




  490
  
  
    
        @date   2018.05.03


  		




  491
  
  
    
    '''


  		




  492
  
  
    
    def showEquipmentDataList(self):


  		




  493
  
  
    
        from QEquipmentDataListDialog import QEquipmentDataListDialog


  		




  494
  
  
    

  		




  495
  
  
    
        self.dlgEquipmentDataList = QEquipmentDataListDialog(self)


  		




  496
  
  
    
        self.dlgEquipmentDataList.exec_()


  		




  497
  
  
    

  		




  498
  
  
    
    '''


  		




  499
  486
  
    
        @brief  show line data list 


  		




  500
  487
  
    
        @author humkyung


  		




  501
  488
  
    
        @date   2018.05.03


  		




  502
  489
  
    
    '''


  		




  503
  
  
    
    def showLineDataList(self):


  		




  
  490
  
    
    def showItemDataList(self):


  		




  504
  491
  
    
        from ItemDataExportDialog import QItemDataExportDialog


  		




  505
  492
  
    

  		




  506
  493
  
    
        self.dlgLineDataList = QItemDataExportDialog(self)


  		




  507
  494
  
    
        self.dlgLineDataList.exec_()


  		




  508
  495
  
    

  		




  509
  496
  
    
    '''


  		




  510
  
  
    
        @brief  show instrument data list 


  		




  511
  
  
    
        @author humkyung


  		




  512
  
  
    
        @date   2018.05.03


  		




  513
  
  
    
    '''


  		




  514
  
  
    
    def showInstrumentDataList(self):


  		




  515
  
  
    
        from QInstrumentDataListDialog import QInstrumentDataListDialog


  		




  516
  
  
    

  		




  517
  
  
    
        self.dlgInstrumentDataList = QInstrumentDataListDialog(self)


  		




  518
  
  
    
        self.dlgInstrumentDataList.exec_()


  		




  519
  
  
    

  		




  520
  
  
    
    '''


  		




  521
  497
  
    
        @brief  Show Image Selection Guide MessageBox


  		




  522
  498
  
    
        @author Jeongwoo


  		




  523
  499
  
    
        @date   2018.05.02


  		












  

    
      DTI_PID/DTI_PID/MainWindow_UI.py
    
  





  214
  214
  
    
        font.setWeight(75)


  		




  215
  215
  
    
        self.actionEquipment_Data_List.setFont(font)


  		




  216
  216
  
    
        self.actionEquipment_Data_List.setObjectName("actionEquipment_Data_List")


  		




  217
  
  
    
        self.actionLine_Data_List = QtWidgets.QAction(MainWindow)


  		




  
  217
  
    
        self.actionItem_Data_List = QtWidgets.QAction(MainWindow)


  		




  218
  218
  
    
        font = QtGui.QFont()


  		




  219
  219
  
    
        font.setFamily("맑은 고딕")


  		




  220
  220
  
    
        font.setBold(True)


  		




  221
  221
  
    
        font.setWeight(75)


  		




  222
  
  
    
        self.actionLine_Data_List.setFont(font)


  		




  223
  
  
    
        self.actionLine_Data_List.setObjectName("actionLine_Data_List")


  		




  
  222
  
    
        self.actionItem_Data_List.setFont(font)


  		




  
  223
  
    
        self.actionItem_Data_List.setObjectName("actionItem_Data_List")


  		




  224
  224
  
    
        self.actionInstrument_Data_List = QtWidgets.QAction(MainWindow)


  		




  225
  225
  
    
        font = QtGui.QFont()


  		




  226
  226
  
    
        font.setFamily("맑은 고딕")


  		




  ......




  323
  323
  
    
        self.menu.addSeparator()


  		




  324
  324
  
    
        self.menu.addAction(self.actionClose)


  		




  325
  325
  
    
        self.menu_2.addAction(self.actionHMB_DATA)


  		




  326
  
  
    
        self.menu_2.addAction(self.actionEquipment_Data_List)


  		




  327
  
  
    
        self.menu_2.addAction(self.actionLine_Data_List)


  		




  328
  
  
    
        self.menu_2.addAction(self.actionInstrument_Data_List)


  		




  
  326
  
    
        self.menu_2.addAction(self.actionItem_Data_List)


  		




  329
  327
  
    
        self.menu_2.addSeparator()


  		




  330
  328
  
    
        self.menu_2.addAction(self.actionCodeTable)


  		




  331
  329
  
    
        self.menu_3.addAction(self.actionImage_Drawing)


  		




  ......




  390
  388
  
    
        self.actionLineRecognition.setToolTip(_translate("MainWindow", "속성 연계"))


  		




  391
  389
  
    
        self.actionGenerateOutput.setText(_translate("MainWindow", "변환"))


  		




  392
  390
  
    
        self.actionEquipment_Data_List.setText(_translate("MainWindow", "장치 데이타 리스트"))


  		




  393
  
  
    
        self.actionLine_Data_List.setText(_translate("MainWindow", "라인 데이타 리스트"))


  		




  
  391
  
    
        self.actionItem_Data_List.setText(_translate("MainWindow", "아이템 데이타 리스트"))


  		




  394
  392
  
    
        self.actionInstrument_Data_List.setText(_translate("MainWindow", "계장 데이타 리스트"))


  		




  395
  393
  
    
        self.actionInitialize.setText(_translate("MainWindow", "초기화"))


  		




  396
  394
  
    
        self.actionImage_Drawing.setText(_translate("MainWindow", "이미지 도면"))


  		












  

    
      DTI_PID/DTI_PID/Shapes/QEngineeringEquipmentItem.py
    
  





  10
  10
  
    

  		




  11
  11
  
    
from SymbolSvgItem import SymbolSvgItem


  		




  12
  12
  
    
from EngineeringConnectorItem import QEngineeringConnectorItem


  		




  
  13
  
    
from EngineeringTextItem import QEngineeringTextItem


  		




  13
  14
  
    

  		




  14
  15
  
    
equipColumnList = ['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', 'DOCUMENT_NAME']


  		




  15
  16
  
    

  		




  ......




  117
  118
  
    
            dataList[0] = self.uid


  		




  118
  119
  
    
            dataList[14] = docData.imgName


  		




  119
  120
  
    

  		




  
  121
  
    
            childItems = [item for item in self.childItems() if issubclass(type(item), QEngineeringTextItem)]


  		




  
  122
  
    
            if len(childItems):


  		




  
  123
  
    
                dataList[1] = childItems[0].text()


  		




  
  124
  
    

  		




  120
  125
  
    
            for attr in attrs:


  		




  121
  126
  
    
                pass


  		




  122
  127
  
    
            


  		












  

    
      DTI_PID/DTI_PID/Shapes/QEngineeringInstrumentItem.py
    
  





  10
  10
  
    

  		




  11
  11
  
    
from SymbolSvgItem import SymbolSvgItem


  		




  12
  12
  
    
from EngineeringConnectorItem import QEngineeringConnectorItem


  		




  
  13
  
    
from EngineeringTextItem import QEngineeringTextItem


  		




  13
  14
  
    

  		




  14
  15
  
    
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']


  		




  15
  16
  
    

  		




  ......




  270
  271
  
    
            dataList[0] = self.uid


  		




  271
  272
  
    
            dataList[13] = docData.imgName


  		




  272
  273
  
    

  		




  
  274
  
    
            childItems = [item for item in self.childItems() if issubclass(type(item), QEngineeringTextItem)]


  		




  
  275
  
    
            if len(childItems):


  		




  
  276
  
    
                dataList[1] = childItems[0].text()


  		




  
  277
  
    

  		




  273
  278
  
    
            for attr in attrs:


  		




  274
  279
  
    
                pass


  		




  275
  280
  
    
            


  		












  

    
      DTI_PID/DTI_PID/UI/MainWindow.ui
    
  





  55
  55
  
    
     <string>데이타</string>


  		




  56
  56
  
    
    </property>


  		




  57
  57
  
    
    <addaction name="actionHMB_DATA"/>


  		




  58
  
  
    
    <addaction name="actionEquipment_Data_List"/>


  		




  59
  
  
    
    <addaction name="actionLine_Data_List"/>


  		




  60
  
  
    
    <addaction name="actionInstrument_Data_List"/>


  		




  
  58
  
    
    <addaction name="actionItem_Data_List"/>


  		




  61
  59
  
    
    <addaction name="separator"/>


  		




  62
  60
  
    
    <addaction name="actionCodeTable"/>


  		




  63
  61
  
    
   </widget>


  		




  ......




  441
  439
  
    
    </font>


  		




  442
  440
  
    
   </property>


  		




  443
  441
  
    
  </action>


  		




  444
  
  
    
  <action name="actionLine_Data_List">


  		




  
  442
  
    
  <action name="actionItem_Data_List">


  		




  445
  443
  
    
   <property name="text">


  		




  446
  
  
    
    <string>라인 데이타 리스트</string>


  		




  
  444
  
    
    <string>아이템 데이타 리스트</string>


  		




  447
  445
  
    
   </property>


  		




  448
  446
  
    
   <property name="font">


  		




  449
  447
  
    
    <font>


  		












내보내기  Unified diff