프로젝트

일반

사용자정보

개정판 c6dfd73b

IDc6dfd73b3da5ac1bbc40ca69a0ad332b31197312
상위 072254e4
하위 86d0ed0b

김연진이(가) 5년 이상 전에 추가함

issue #1054 : 스트림 데이타 입력

Change-Id: I09a67749a4b0150933ba968f43d3416b5978a0b4

차이점 보기:

HYTOS/HYTOS/AppDocData.py
921 921

  
922 922
        return res
923 923

  
924
    def getNominalDiameter(self):
925
        
926
        res = []
927
        try:
928
            # Creates or opens a file called mydb with a SQLite3 DB
929
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
930
            db = sqlite3.connect(dbPath)
931
            # Get a cursor object
932
            cursor = db.cursor()
933

  
934
            sql = "select UID, Milimeter, Inch from NominalDiameter" 
935
            cursor.execute(sql)
936
            rows = cursor.fetchall()
937
            for row in rows:                
938
                res.append((row[0], row[1], row[2]))
939
        # Catch the exception
940
        except Exception as ex:
941
            # Roll back any change if something goes wrong
942
            db.rollback()
943
            print('error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno))
944
        finally:
945
            # Close the db connection
946
            db.close()
947

  
948
        return res
949

  
924 950
    '''
925 951
        @brief  return line types 
926 952
        @author humkyung
......
1689 1715
        return ret
1690 1716

  
1691 1717
    '''
1692
        @brief      get NominalDiameter
1693
        @author     humkyung
1694
        @date       2018.04.20
1695
        @history    humkyung 2018.04.24 read MetricStr column and set size unit
1696
                    kyouho 2018.07.04 forCheckLineNumber get only inch or metric
1697
                    kyouho 2018.07.16 edit query order by code
1698
    '''
1699
    def getNomialPipeSizeData(self, forCheckLineNumber = False, orderStr = "CODE"):
1700
        res = []
1701
        try:
1702
            configs = self.getConfigs('Line No', 'Size Unit')
1703
            sizeUnit = configs[0].value if 1 == len(configs) else 'Metric'
1704

  
1705
            # Creates or opens a file called mydb with a SQLite3 DB
1706
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
1707
            conn = sqlite3.connect(dbPath)
1708
            # Get a cursor object
1709
            cursor = conn.cursor()
1710

  
1711
            sql = "select UID,Code,Metric,Inch,InchStr,AllowableInchStr,MetricStr,AllowableMetricStr from NominalDiameter ORDER BY {} ASC".format(orderStr)
1712
            cursor.execute(sql)
1713
            rows = cursor.fetchall()
1714
            for row in rows:
1715
                pipeSize = NominalPipeSize(row[0], row[1], float(row[2]) if row[2] else None, float(row[3]) if row[3] else None, row[4], row[5], row[6], row[7])
1716
                pipeSize.sizeUnit = sizeUnit
1717
                if forCheckLineNumber:
1718
                    if sizeUnit == 'Inch' and pipeSize.inchStr:
1719
                        res.append(pipeSize.inchStr)
1720
                    elif sizeUnit == 'Metric' and pipeSize.metricStr:
1721
                        res.append(pipeSize.metricStr)
1722
                else:
1723
                    res.append(pipeSize)
1724
                
1725
        # Catch the exception
1726
        except Exception as ex:
1727
            # Roll back any change if something goes wrong
1728
            conn.rollback()
1729
            
1730
            from App import App 
1731
            message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
1732
            App.mainWnd().addMessage.emit(MessageType.Error, message)
1733
        finally:
1734
            # Close the db connection
1735
            conn.close()
1736

  
1737
        return res
1738

  
1739
    '''
1740 1718
        @brief      insert NominalDiameter table
1741 1719
        @author     kyouho
1742 1720
        @date       2018.07.16
HYTOS/HYTOS/Fitting_2KDialog.py
305 305
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, QTableWidgetItem('1'))
306 306

  
307 307

  
308
    def showDialog(self, item):
309
        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
310
        self.exec_()
311

  
308 312
    def accept(self):
309 313
        
310 314
        QDialog.accept(self)
HYTOS/HYTOS/Fitting_CraneKDialog.py
584 584
        self.ui.tableWidget_SelectedFitting.setItem(row, 3, QTableWidgetItem('1'))
585 585

  
586 586

  
587
    def showDialog(self, item):
588
        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
589
        self.exec_()
590
        
587 591
    def accept(self):
588 592
        
589 593
        QDialog.accept(self)
HYTOS/HYTOS/Fitting_EquivalentLengthDialog.py
3 3

  
4 4
import os
5 5
import sys
6
from PyQt5.QtCore import *
7
from PyQt5.QtGui import *
6
from PyQt5 import QtCore, QtGui, QtWidgets
8 7
from PyQt5.QtWidgets import *
9 8
import sqlite3
10 9
from App import App
......
31 30
        self.ui.comboBox_Degree.addItem('75')
32 31
        self.ui.comboBox_Degree.addItem('90')
33 32

  
33

  
34
    def showDialog(self, item):
35
        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
36
        self.exec_()
37

  
38

  
34 39
    def accept(self):
35 40
        
36 41
        QDialog.accept(self)
HYTOS/HYTOS/HMBTable.py
115 115
                    break
116 116

  
117 117

  
118
    def insert(self, components_uid, stream_no):
119
        import uuid
120

  
121
        hmb = HMBData()
122
        hmb.uid = str(uuid.uuid4())        
123
        hmb.components_uid = components_uid
124
        hmb.stream_no = stream_no
125
        hmb.isDeleted = False
126

  
127
        self.append(hmb)
128

  
129
    def updateByUID(self, components_uid, phase_type):
130
        
131
        for hmb in self._hmbs:
132
            if hmb.components_uid == components_uid:
133
                hmb.phase_type = phase_type
118 134

  
135
                break
119 136
    '''
120 137
        @brief      load hmb data from database
121 138
        @author     humkyung
HYTOS/HYTOS/MainWindow.py
310 310
            drawingUid = docData.activeDrawing.UID
311 311

  
312 312
        columnDisplayNameList = docData.getColumnDisplayNames(drawingUid, 'HMB')
313

  
314 313
        count = len(columnDisplayNameList)
315 314
        self.tableWidgetHMB.setRowCount(count)
316 315
        self.tableWidgetHMB.setColumnCount(2)
316
        self.tableWidgetHMB.hideRow(0)
317
        self.tableWidgetHMB.hideRow(1)
317 318

  
318 319
        rowIndex = 0
319 320
        for columnDisplayName in columnDisplayNameList:        
......
711 712
            self.path = os.path.join(project.getDrawingFilePath(), drawing + '.png')
712 713
            appDocData.setImgFilePath(self.path)
713 714
            appDocData.activeDrawing = Drawing(appDocData.imgName)            
715

  
714 716
            self.initTableWidgetHMB()
715 717
            ## Load data on database     
716 718

  
......
804 806

  
805 807
        drawing = AppDocData.instance().activeDrawing
806 808
        if drawing:
807
            hmb = HMBTable.new_data() 
808
            hmb.uid = str(uuid.uuid4())        
809
            hmb.components_uid = self.actionLine.tag.streamline.uid
810
            hmb.stream_no = self.getNextStreamNo(drawing)
811
        
812
            drawing.hmbTable.append(hmb)
809
            components_uid = self.actionLine.tag.streamline.uid
810
            stream_no = self.getNextStreamNo(drawing)
811

  
812
            drawing.hmbTable.insert(components_uid, stream_no)
813

  
814

  
815
            #hmb = HMBTable.new_data() 
816
            #hmb.uid = str(uuid.uuid4())        
817
            #hmb.components_uid = self.actionLine.tag.streamline.uid
818
            #hmb.stream_no = self.getNextStreamNo(drawing)        
819
            #drawing.hmbTable.append(hmb)
813 820

  
814 821
    def getNextStreamNo(self, drawing):
815 822

  
......
837 844
            for hmb in hmbs:                  
838 845
                columnCount = self.tableWidgetHMB.columnCount()                      
839 846
                self.tableWidgetHMB.setColumnCount(columnCount + 1)
847

  
848
                uid = QTableWidgetItem(str(hmb.uid))
849
                uid.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
850

  
851
                components_uid = QTableWidgetItem(str(hmb.components_uid))
852
                components_uid.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
853

  
840 854
                stream_no = QTableWidgetItem(str(hmb.stream_no))
841 855
                stream_no.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
842 856

  
857
                phase_type = QTableWidgetItem(str(hmb.phase_type))
858
                phase_type.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
859

  
843 860
                if hmb.isDeleted == True:
844 861
                    stream_no.setForeground(Qt.darkGray)       
845 862
                else:
846 863
                    stream_no.setForeground(Qt.black)       
847 864

  
848
                self.tableWidgetHMB.setItem(0, columnCount, stream_no)
865

  
866

  
867

  
868
                self.tableWidgetHMB.setItem(0, columnCount, uid)
869
                self.tableWidgetHMB.setItem(1, columnCount, components_uid)
870
                self.tableWidgetHMB.setItem(2, columnCount, stream_no)
871
                self.tableWidgetHMB.setItem(3, columnCount, phase_type)
849 872

  
850 873

  
851 874
    '''
HYTOS/HYTOS/Options_UI.py
41 41
        self.label_2.setObjectName("label_2")
42 42
        self.horizontalLayout_14.addWidget(self.label_2)
43 43
        self.spinBoxSymbolOpacity = QtWidgets.QSpinBox(self.groupBoxText)
44
        self.spinBoxSymbolOpacity.setMaximum(100)
44 45
        self.spinBoxSymbolOpacity.setProperty("value", 50)
45 46
        self.spinBoxSymbolOpacity.setObjectName("spinBoxSymbolOpacity")
46 47
        self.horizontalLayout_14.addWidget(self.spinBoxSymbolOpacity)
HYTOS/HYTOS/PhaseTypeDialog.py
8 8

  
9 9
from PyQt5 import QtCore, QtGui, QtWidgets
10 10
from PyQt5.QtWidgets import *
11
import sys
11 12
import os
12 13
from Project import Project
13 14
from AppDocData import AppDocData
......
45 46
        QDialog.accept(self)
46 47

  
47 48
    def reject(self):
48
        QDialog.reject(self)
49
        QDialog.reject(self)
50

  
51
    if __name__ == '__main__':
52
        from PhaseTypeDialog import QPhaseTypeDialog
53
        from App import App
54
        app = App(sys.argv)
55

  
56

  
57
        if True:
58
            dlg = QPhaseTypeDialog()
59
            dlg.exec_()              
HYTOS/HYTOS/PhaseType_UI.py
13 13
class Ui_PhaseTypeDialog(object):
14 14
    def setupUi(self, PhaseTypeDialog):
15 15
        PhaseTypeDialog.setObjectName("PhaseTypeDialog")
16
        PhaseTypeDialog.resize(304, 103)
16
        PhaseTypeDialog.resize(367, 107)
17 17
        PhaseTypeDialog.setMinimumSize(QtCore.QSize(0, 0))
18 18
        PhaseTypeDialog.setMaximumSize(QtCore.QSize(16777215, 16777215))
19 19
        font = QtGui.QFont()
......
26 26
        PhaseTypeDialog.setWindowIcon(icon)
27 27
        self.verticalLayout = QtWidgets.QVBoxLayout(PhaseTypeDialog)
28 28
        self.verticalLayout.setObjectName("verticalLayout")
29
        self.formLayout = QtWidgets.QFormLayout()
30
        self.formLayout.setObjectName("formLayout")
29
        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
30
        self.verticalLayout_2.setObjectName("verticalLayout_2")
31
        self.horizontalLayout = QtWidgets.QHBoxLayout()
32
        self.horizontalLayout.setObjectName("horizontalLayout")
31 33
        self.StreamNo = QtWidgets.QLabel(PhaseTypeDialog)
32
        self.StreamNo.setMinimumSize(QtCore.QSize(65, 0))
34
        self.StreamNo.setMinimumSize(QtCore.QSize(100, 0))
35
        self.StreamNo.setMaximumSize(QtCore.QSize(100, 16777215))
33 36
        font = QtGui.QFont()
34 37
        font.setFamily("맑은 고딕")
35 38
        font.setPointSize(9)
......
38 41
        self.StreamNo.setFont(font)
39 42
        self.StreamNo.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
40 43
        self.StreamNo.setObjectName("StreamNo")
41
        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.StreamNo)
44
        self.horizontalLayout.addWidget(self.StreamNo)
42 45
        self.lineEditSteamNo = QtWidgets.QLineEdit(PhaseTypeDialog)
43 46
        self.lineEditSteamNo.setEnabled(False)
44 47
        font = QtGui.QFont()
......
48 51
        self.lineEditSteamNo.setText("")
49 52
        self.lineEditSteamNo.setAlignment(QtCore.Qt.AlignCenter)
50 53
        self.lineEditSteamNo.setObjectName("lineEditSteamNo")
51
        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.lineEditSteamNo)
54
        self.horizontalLayout.addWidget(self.lineEditSteamNo)
55
        self.verticalLayout_2.addLayout(self.horizontalLayout)
56
        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
57
        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
52 58
        self.PhaseType = QtWidgets.QLabel(PhaseTypeDialog)
53
        self.PhaseType.setMinimumSize(QtCore.QSize(65, 0))
59
        self.PhaseType.setMinimumSize(QtCore.QSize(100, 0))
60
        self.PhaseType.setMaximumSize(QtCore.QSize(100, 16777215))
54 61
        font = QtGui.QFont()
55 62
        font.setFamily("맑은 고딕")
56 63
        font.setPointSize(9)
......
59 66
        self.PhaseType.setFont(font)
60 67
        self.PhaseType.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
61 68
        self.PhaseType.setObjectName("PhaseType")
62
        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.PhaseType)
69
        self.horizontalLayout_2.addWidget(self.PhaseType)
63 70
        self.comboBoxPhaseType = QtWidgets.QComboBox(PhaseTypeDialog)
64 71
        font = QtGui.QFont()
65 72
        font.setBold(False)
66 73
        font.setWeight(50)
67 74
        self.comboBoxPhaseType.setFont(font)
68 75
        self.comboBoxPhaseType.setObjectName("comboBoxPhaseType")
69
        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.comboBoxPhaseType)
70
        self.verticalLayout.addLayout(self.formLayout)
76
        self.horizontalLayout_2.addWidget(self.comboBoxPhaseType)
77
        self.verticalLayout_2.addLayout(self.horizontalLayout_2)
78
        self.verticalLayout.addLayout(self.verticalLayout_2)
71 79
        self.errorLabel = QtWidgets.QLabel(PhaseTypeDialog)
72 80
        self.errorLabel.setMaximumSize(QtCore.QSize(16777215, 0))
73 81
        self.errorLabel.setStyleSheet("")
......
93 101
    def retranslateUi(self, PhaseTypeDialog):
94 102
        _translate = QtCore.QCoreApplication.translate
95 103
        PhaseTypeDialog.setWindowTitle(_translate("PhaseTypeDialog", "Select Phase Type"))
96
        self.StreamNo.setText(_translate("PhaseTypeDialog", "Stream No."))
97
        self.PhaseType.setText(_translate("PhaseTypeDialog", "Phase Type"))
104
        self.StreamNo.setText(_translate("PhaseTypeDialog", "Current Type :"))
105
        self.PhaseType.setText(_translate("PhaseTypeDialog", "Phase Type :"))
98 106
import Resource_rc
HYTOS/HYTOS/Phase_LiquidDialog.py
22 22
        self.ui = Phase_Liquid_UI.Ui_LiquidDialog()
23 23
        self.ui.setupUi(self)
24 24

  
25
        self.initPhaseType() 
25
        self.ui.pushButton_Fitting.clicked.connect(self.show_FittingMethodDialog)
26
    
26 27
        self.initNominalDiameter()
27 28
        self.initSchedule()
28 29

  
29
        self.ui.comboBox_PhaseType.currentIndexChanged.connect(self.changePhaseType)
30
    def show_FittingMethodDialog(self):
31
        from FittingMethodDialog import QFittingMethodDialog
32
        
33
        dialog = QFittingMethodDialog()
34
        selectedFittingMethod = dialog.showDialog(self)
35
        if selectedFittingMethod:
36
            if selectedFittingMethod == 'EquivalentLength':
37
                self.show_EquivalentLengthDialog()
38
            elif selectedFittingMethod == 'CraneK':
39
                self.show_CraneKDialog()
40
            elif selectedFittingMethod == '2K':
41
                self.show_2KDialog()
42

  
43
    def show_EquivalentLengthDialog(self):
44
        from Fitting_EquivalentLengthDialog import QFitting_EquivalentLengthDialog
45

  
46
        dialog = QFitting_EquivalentLengthDialog()
47
        dialog.showDialog(self)
48

  
49
    def show_CraneKDialog(self):
50
        from Fitting_CraneKDialog import QFitting_CraneKDialog
30 51

  
52
        dialog = QFitting_CraneKDialog()
53
        dialog.showDialog(self)
54

  
55
    def show_2KDialog(self):
56
        from Fitting_2KDialog import QFitting_2KDialog
57

  
58
        dialog = QFitting_2KDialog()
59
        dialog.showDialog(self)
31 60

  
32
    def changePhaseType(self):
33
        index = self.ui.comboBox_PhaseType.currentIndex()
34
        selectedPhaseType = self.ui.comboBox_PhaseType.itemData(index)
35
        if selectedPhaseType == 'Vapor':
36
            self.show_VaporDialog()
37
        elif selectedPhaseType == 'Mixed':
38
            self.show_MixedDialog()
39 61

  
40 62
    def show_VaporDialog(self):
41 63
        from Phase_VaporDialog import QPhase_VaporDialog
......
49 71
        dialog = QPhase_MixedDialog()
50 72
        dialog.showDialog(self)
51 73

  
52
    def initPhaseType(self):
53
        self.ui.comboBox_PhaseType.clear()
74
    def initNominalDiameter(self):
75
        from AppDocData import AppDocData
54 76

  
55
        self.ui.comboBox_PhaseType.addItem('Vapor (Compressible)', 'Vapor')
56
        self.ui.comboBox_PhaseType.addItem('Liquid (Incompressible)', 'Liquid')
57
        self.ui.comboBox_PhaseType.addItem('Mixed (Vapor + Liquid)', 'Mixed')
58
        
59
        self.ui.comboBox_PhaseType.setCurrentIndex(1)
77
        self.ui.comboBox_NominalDiameter.clear()
60 78

  
61
    def initNominalDiameter(self):
62
        dev = 1
79
        nominalDiameterList = AppDocData.instance().getNominalDiameter()
80
        for nominalDiameter in nominalDiameterList:
81
            self.ui.comboBox_NominalDiameter.addItem(str(nominalDiameter[1]), nominalDiameter[0])    
82

  
83
        self.ui.comboBox_NominalDiameter.setCurrentIndex(-1)
63 84
    def initSchedule(self):
64 85
        self.ui.comboBox_Schedule.clear()
65 86

  
HYTOS/HYTOS/Phase_Liquid_UI.py
408 408
        self.horizontalLayout_16.setObjectName("horizontalLayout_16")
409 409
        spacerItem4 = QtWidgets.QSpacerItem(49, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
410 410
        self.horizontalLayout_16.addItem(spacerItem4)
411
        self.pushButton_2 = QtWidgets.QPushButton(self.groupBox)
411
        self.pushButton_Fitting = QtWidgets.QPushButton(self.groupBox)
412 412
        font = QtGui.QFont()
413 413
        font.setBold(False)
414 414
        font.setWeight(50)
415
        self.pushButton_2.setFont(font)
416
        self.pushButton_2.setObjectName("pushButton_2")
417
        self.horizontalLayout_16.addWidget(self.pushButton_2)
415
        self.pushButton_Fitting.setFont(font)
416
        self.pushButton_Fitting.setObjectName("pushButton_Fitting")
417
        self.horizontalLayout_16.addWidget(self.pushButton_Fitting)
418 418
        self.lineEdit_13 = QtWidgets.QLineEdit(self.groupBox)
419 419
        self.lineEdit_13.setMinimumSize(QtCore.QSize(80, 0))
420 420
        self.lineEdit_13.setMaximumSize(QtCore.QSize(80, 16777215))
......
499 499
        self.horizontalLayout_20.setObjectName("horizontalLayout_20")
500 500
        self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
501 501
        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
502
        self.label_5 = QtWidgets.QLabel(self.groupBox_StreamNo)
503
        font = QtGui.QFont()
504
        font.setBold(False)
505
        font.setWeight(50)
506
        self.label_5.setFont(font)
507
        self.label_5.setObjectName("label_5")
508
        self.horizontalLayout_13.addWidget(self.label_5)
509
        self.lineEdit_9 = QtWidgets.QLineEdit(self.groupBox_StreamNo)
510
        self.lineEdit_9.setEnabled(False)
511
        self.lineEdit_9.setMinimumSize(QtCore.QSize(90, 0))
512
        self.lineEdit_9.setMaximumSize(QtCore.QSize(90, 16777215))
513
        self.lineEdit_9.setObjectName("lineEdit_9")
514
        self.horizontalLayout_13.addWidget(self.lineEdit_9)
502 515
        self.label_3 = QtWidgets.QLabel(self.groupBox_StreamNo)
503 516
        font = QtGui.QFont()
504 517
        font.setBold(False)
......
507 520
        self.label_3.setObjectName("label_3")
508 521
        self.horizontalLayout_13.addWidget(self.label_3)
509 522
        self.lineEdit_DisplayNo = QtWidgets.QLineEdit(self.groupBox_StreamNo)
510
        self.lineEdit_DisplayNo.setMaximumSize(QtCore.QSize(90, 16777215))
523
        self.lineEdit_DisplayNo.setMaximumSize(QtCore.QSize(16777215, 16777215))
511 524
        font = QtGui.QFont()
512 525
        font.setBold(False)
513 526
        font.setWeight(50)
514 527
        self.lineEdit_DisplayNo.setFont(font)
515 528
        self.lineEdit_DisplayNo.setObjectName("lineEdit_DisplayNo")
516 529
        self.horizontalLayout_13.addWidget(self.lineEdit_DisplayNo)
517
        self.label_2 = QtWidgets.QLabel(self.groupBox_StreamNo)
518
        font = QtGui.QFont()
519
        font.setBold(False)
520
        font.setWeight(50)
521
        self.label_2.setFont(font)
522
        self.label_2.setObjectName("label_2")
523
        self.horizontalLayout_13.addWidget(self.label_2)
524
        self.comboBox_PhaseType = QtWidgets.QComboBox(self.groupBox_StreamNo)
525
        self.comboBox_PhaseType.setMinimumSize(QtCore.QSize(90, 0))
526
        font = QtGui.QFont()
527
        font.setBold(False)
528
        font.setWeight(50)
529
        self.comboBox_PhaseType.setFont(font)
530
        self.comboBox_PhaseType.setObjectName("comboBox_PhaseType")
531
        self.horizontalLayout_13.addWidget(self.comboBox_PhaseType)
532 530
        self.horizontalLayout_20.addLayout(self.horizontalLayout_13)
533 531
        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
534 532
        self.horizontalLayout_20.addItem(spacerItem6)
......
549 547
        self.buttonBox.accepted.connect(LiquidDialog.accept)
550 548
        self.buttonBox.rejected.connect(LiquidDialog.reject)
551 549
        QtCore.QMetaObject.connectSlotsByName(LiquidDialog)
550
        LiquidDialog.setTabOrder(self.lineEdit_9, self.lineEdit_DisplayNo)
551
        LiquidDialog.setTabOrder(self.lineEdit_DisplayNo, self.lineEdit_4)
552
        LiquidDialog.setTabOrder(self.lineEdit_4, self.lineEdit_5)
553
        LiquidDialog.setTabOrder(self.lineEdit_5, self.lineEdit_6)
554
        LiquidDialog.setTabOrder(self.lineEdit_6, self.lineEdit_7)
555
        LiquidDialog.setTabOrder(self.lineEdit_7, self.lineEdit)
556
        LiquidDialog.setTabOrder(self.lineEdit, self.lineEdit_2)
557
        LiquidDialog.setTabOrder(self.lineEdit_2, self.comboBox_NominalDiameter)
558
        LiquidDialog.setTabOrder(self.comboBox_NominalDiameter, self.comboBox_Schedule)
559
        LiquidDialog.setTabOrder(self.comboBox_Schedule, self.lineEdit_3)
560
        LiquidDialog.setTabOrder(self.lineEdit_3, self.pushButton)
561
        LiquidDialog.setTabOrder(self.pushButton, self.lineEdit_10)
562
        LiquidDialog.setTabOrder(self.lineEdit_10, self.lineEdit_11)
563
        LiquidDialog.setTabOrder(self.lineEdit_11, self.lineEdit_12)
564
        LiquidDialog.setTabOrder(self.lineEdit_12, self.pushButton_Fitting)
565
        LiquidDialog.setTabOrder(self.pushButton_Fitting, self.lineEdit_13)
566
        LiquidDialog.setTabOrder(self.lineEdit_13, self.lineEdit_8)
567
        LiquidDialog.setTabOrder(self.lineEdit_8, self.textEdit)
568
        LiquidDialog.setTabOrder(self.textEdit, self.pushButton_5)
569
        LiquidDialog.setTabOrder(self.pushButton_5, self.pushButton_6)
570
        LiquidDialog.setTabOrder(self.pushButton_6, self.pushButton_4)
552 571

  
553 572
    def retranslateUi(self, LiquidDialog):
554 573
        _translate = QtCore.QCoreApplication.translate
......
573 592
        self.groupBox.setTitle(_translate("LiquidDialog", "Geometry Data"))
574 593
        self.label_8.setText(_translate("LiquidDialog", "ND :"))
575 594
        self.label_Nominal_Pipe_Size_Unit.setText(_translate("LiquidDialog", "in"))
576
        self.label_10.setText(_translate("LiquidDialog", "Sch. :"))
595
        self.label_10.setText(_translate("LiquidDialog", "Sch. No. :"))
577 596
        self.label_12.setText(_translate("LiquidDialog", "ID :"))
578 597
        self.label_Inside_Pipe_Size_Unit.setText(_translate("LiquidDialog", "in"))
579
        self.pushButton.setText(_translate("LiquidDialog", "Rough"))
598
        self.pushButton.setText(_translate("LiquidDialog", "Roughness"))
580 599
        self.label_Roughness_Unit.setText(_translate("LiquidDialog", "mm"))
581 600
        self.label_27.setText(_translate("LiquidDialog", "Str. Length :"))
582 601
        self.label_Straight_Lengh_Unit.setText(_translate("LiquidDialog", "m"))
583 602
        self.label_29.setText(_translate("LiquidDialog", "Equiv. Length (Input) :"))
584 603
        self.label_Equivalent_Lenght_Input_Unit.setText(_translate("LiquidDialog", "m"))
585
        self.pushButton_2.setText(_translate("LiquidDialog", "Fitting Input"))
604
        self.pushButton_Fitting.setText(_translate("LiquidDialog", "Fitting Input"))
586 605
        self.label_Fitting_Length_Unit.setText(_translate("LiquidDialog", "m"))
587 606
        self.label.setText(_translate("LiquidDialog", "Equiv. Length (Cal\'d) :"))
588 607
        self.label_Equivalent_Lenght_Cal_Unit.setText(_translate("LiquidDialog", "m"))
589 608
        self.groupBox_4.setTitle(_translate("LiquidDialog", "Data Basis"))
590
        self.groupBox_StreamNo.setTitle(_translate("LiquidDialog", "Stream No : ?"))
609
        self.groupBox_StreamNo.setTitle(_translate("LiquidDialog", "Stream Information"))
610
        self.label_5.setText(_translate("LiquidDialog", "Stream No. "))
591 611
        self.label_3.setText(_translate("LiquidDialog", "Display No."))
592
        self.label_2.setText(_translate("LiquidDialog", "Phase Type"))
593 612
import Resource_rc
HYTOS/HYTOS/UI/FittingMethodDialog.ui
1
<?xml version="1.0" encoding="UTF-8"?>
2
<ui version="4.0">
3
 <class>FittingMethodDialog</class>
4
 <widget class="QDialog" name="FittingMethodDialog">
5
  <property name="geometry">
6
   <rect>
7
    <x>0</x>
8
    <y>0</y>
9
    <width>304</width>
10
    <height>103</height>
11
   </rect>
12
  </property>
13
  <property name="minimumSize">
14
   <size>
15
    <width>0</width>
16
    <height>0</height>
17
   </size>
18
  </property>
19
  <property name="maximumSize">
20
   <size>
21
    <width>16777215</width>
22
    <height>16777215</height>
23
   </size>
24
  </property>
25
  <property name="font">
26
   <font>
27
    <family>맑은 고딕</family>
28
    <weight>75</weight>
29
    <bold>true</bold>
30
   </font>
31
  </property>
32
  <property name="windowTitle">
33
   <string>Select Fitting Method</string>
34
  </property>
35
  <property name="windowIcon">
36
   <iconset resource="../res/Resource.qrc">
37
    <normaloff>:/newPrefix/HYTOS.png</normaloff>:/newPrefix/HYTOS.png</iconset>
38
  </property>
39
  <layout class="QVBoxLayout" name="verticalLayout">
40
   <item>
41
    <layout class="QFormLayout" name="formLayout">
42
     <item row="0" column="0">
43
      <widget class="QLabel" name="StreamNo">
44
       <property name="minimumSize">
45
        <size>
46
         <width>65</width>
47
         <height>0</height>
48
        </size>
49
       </property>
50
       <property name="font">
51
        <font>
52
         <family>맑은 고딕</family>
53
         <pointsize>9</pointsize>
54
         <weight>50</weight>
55
         <bold>false</bold>
56
        </font>
57
       </property>
58
       <property name="text">
59
        <string>Current Method</string>
60
       </property>
61
       <property name="alignment">
62
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
63
       </property>
64
      </widget>
65
     </item>
66
     <item row="0" column="1">
67
      <widget class="QLineEdit" name="lineEditSteamNo">
68
       <property name="enabled">
69
        <bool>false</bool>
70
       </property>
71
       <property name="font">
72
        <font>
73
         <weight>50</weight>
74
         <bold>false</bold>
75
        </font>
76
       </property>
77
       <property name="text">
78
        <string/>
79
       </property>
80
       <property name="alignment">
81
        <set>Qt::AlignCenter</set>
82
       </property>
83
      </widget>
84
     </item>
85
     <item row="1" column="0">
86
      <widget class="QLabel" name="PhaseType">
87
       <property name="minimumSize">
88
        <size>
89
         <width>65</width>
90
         <height>0</height>
91
        </size>
92
       </property>
93
       <property name="font">
94
        <font>
95
         <family>맑은 고딕</family>
96
         <pointsize>9</pointsize>
97
         <weight>50</weight>
98
         <bold>false</bold>
99
        </font>
100
       </property>
101
       <property name="text">
102
        <string>Select Method</string>
103
       </property>
104
       <property name="alignment">
105
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
106
       </property>
107
      </widget>
108
     </item>
109
     <item row="1" column="1">
110
      <widget class="QComboBox" name="comboBoxPhaseType">
111
       <property name="font">
112
        <font>
113
         <weight>50</weight>
114
         <bold>false</bold>
115
        </font>
116
       </property>
117
      </widget>
118
     </item>
119
    </layout>
120
   </item>
121
   <item>
122
    <widget class="QLabel" name="errorLabel">
123
     <property name="maximumSize">
124
      <size>
125
       <width>16777215</width>
126
       <height>0</height>
127
      </size>
128
     </property>
129
     <property name="styleSheet">
130
      <string notr="true"/>
131
     </property>
132
     <property name="text">
133
      <string/>
134
     </property>
135
     <property name="alignment">
136
      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
137
     </property>
138
    </widget>
139
   </item>
140
   <item>
141
    <widget class="QDialogButtonBox" name="buttonBox">
142
     <property name="font">
143
      <font>
144
       <family>맑은 고딕</family>
145
       <weight>75</weight>
146
       <bold>true</bold>
147
      </font>
148
     </property>
149
     <property name="standardButtons">
150
      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
151
     </property>
152
    </widget>
153
   </item>
154
  </layout>
155
 </widget>
156
 <resources>
157
  <include location="../res/Resource.qrc"/>
158
 </resources>
159
 <connections>
160
  <connection>
161
   <sender>buttonBox</sender>
162
   <signal>rejected()</signal>
163
   <receiver>FittingMethodDialog</receiver>
164
   <slot>reject()</slot>
165
   <hints>
166
    <hint type="sourcelabel">
167
     <x>299</x>
168
     <y>79</y>
169
    </hint>
170
    <hint type="destinationlabel">
171
     <x>299</x>
172
     <y>49</y>
173
    </hint>
174
   </hints>
175
  </connection>
176
  <connection>
177
   <sender>buttonBox</sender>
178
   <signal>accepted()</signal>
179
   <receiver>FittingMethodDialog</receiver>
180
   <slot>accept()</slot>
181
   <hints>
182
    <hint type="sourcelabel">
183
     <x>299</x>
184
     <y>79</y>
185
    </hint>
186
    <hint type="destinationlabel">
187
     <x>299</x>
188
     <y>49</y>
189
    </hint>
190
   </hints>
191
  </connection>
192
 </connections>
193
</ui>
HYTOS/HYTOS/UI/Options.ui
52 52
              </item>
53 53
              <item>
54 54
               <widget class="QSpinBox" name="spinBoxSymbolOpacity">
55
                <property name="minimum">
56
                 <number>1</number>
57
                </property>
58
                <property name="maximum">
59
                 <number>100</number>
60
                </property>
55 61
                <property name="value">
56 62
                 <number>50</number>
57 63
                </property>
HYTOS/HYTOS/UI/PhaseType.ui
6 6
   <rect>
7 7
    <x>0</x>
8 8
    <y>0</y>
9
    <width>304</width>
10
    <height>103</height>
9
    <width>367</width>
10
    <height>107</height>
11 11
   </rect>
12 12
  </property>
13 13
  <property name="minimumSize">
......
38 38
  </property>
39 39
  <layout class="QVBoxLayout" name="verticalLayout">
40 40
   <item>
41
    <layout class="QFormLayout" name="formLayout">
42
     <item row="0" column="0">
43
      <widget class="QLabel" name="StreamNo">
44
       <property name="minimumSize">
45
        <size>
46
         <width>65</width>
47
         <height>0</height>
48
        </size>
49
       </property>
50
       <property name="font">
51
        <font>
52
         <family>맑은 고딕</family>
53
         <pointsize>9</pointsize>
54
         <weight>50</weight>
55
         <bold>false</bold>
56
        </font>
57
       </property>
58
       <property name="text">
59
        <string>Stream No.</string>
60
       </property>
61
       <property name="alignment">
62
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
63
       </property>
64
      </widget>
41
    <layout class="QVBoxLayout" name="verticalLayout_2">
42
     <item>
43
      <layout class="QHBoxLayout" name="horizontalLayout">
44
       <item>
45
        <widget class="QLabel" name="StreamNo">
46
         <property name="minimumSize">
47
          <size>
48
           <width>100</width>
49
           <height>0</height>
50
          </size>
51
         </property>
52
         <property name="maximumSize">
53
          <size>
54
           <width>100</width>
55
           <height>16777215</height>
56
          </size>
57
         </property>
58
         <property name="font">
59
          <font>
60
           <family>맑은 고딕</family>
61
           <pointsize>9</pointsize>
62
           <weight>50</weight>
63
           <bold>false</bold>
64
          </font>
65
         </property>
66
         <property name="text">
67
          <string>Current Type :</string>
68
         </property>
69
         <property name="alignment">
70
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
71
         </property>
72
        </widget>
73
       </item>
74
       <item>
75
        <widget class="QLineEdit" name="lineEdit_CurrentType">
76
         <property name="enabled">
77
          <bool>false</bool>
78
         </property>
79
         <property name="font">
80
          <font>
81
           <weight>50</weight>
82
           <bold>false</bold>
83
          </font>
84
         </property>
85
         <property name="text">
86
          <string/>
87
         </property>
88
         <property name="alignment">
89
          <set>Qt::AlignCenter</set>
90
         </property>
91
        </widget>
92
       </item>
93
      </layout>
65 94
     </item>
66
     <item row="0" column="1">
67
      <widget class="QLineEdit" name="lineEditSteamNo">
68
       <property name="enabled">
69
        <bool>false</bool>
70
       </property>
71
       <property name="font">
72
        <font>
73
         <weight>50</weight>
74
         <bold>false</bold>
75
        </font>
76
       </property>
77
       <property name="text">
78
        <string/>
79
       </property>
80
       <property name="alignment">
81
        <set>Qt::AlignCenter</set>
82
       </property>
83
      </widget>
84
     </item>
85
     <item row="1" column="0">
86
      <widget class="QLabel" name="PhaseType">
87
       <property name="minimumSize">
88
        <size>
89
         <width>65</width>
90
         <height>0</height>
91
        </size>
92
       </property>
93
       <property name="font">
94
        <font>
95
         <family>맑은 고딕</family>
96
         <pointsize>9</pointsize>
97
         <weight>50</weight>
98
         <bold>false</bold>
99
        </font>
100
       </property>
101
       <property name="text">
102
        <string>Phase Type</string>
103
       </property>
104
       <property name="alignment">
105
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
106
       </property>
107
      </widget>
108
     </item>
109
     <item row="1" column="1">
110
      <widget class="QComboBox" name="comboBoxPhaseType">
111
       <property name="font">
112
        <font>
113
         <weight>50</weight>
114
         <bold>false</bold>
115
        </font>
116
       </property>
117
      </widget>
95
     <item>
96
      <layout class="QHBoxLayout" name="horizontalLayout_2">
97
       <item>
98
        <widget class="QLabel" name="PhaseType">
99
         <property name="minimumSize">
100
          <size>
101
           <width>100</width>
102
           <height>0</height>
103
          </size>
104
         </property>
105
         <property name="maximumSize">
106
          <size>
107
           <width>100</width>
108
           <height>16777215</height>
109
          </size>
110
         </property>
111
         <property name="font">
112
          <font>
113
           <family>맑은 고딕</family>
114
           <pointsize>9</pointsize>
115
           <weight>50</weight>
116
           <bold>false</bold>
117
          </font>
118
         </property>
119
         <property name="text">
120
          <string>Phase Type :</string>
121
         </property>
122
         <property name="alignment">
123
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
124
         </property>
125
        </widget>
126
       </item>
127
       <item>
128
        <widget class="QComboBox" name="comboBox_PhaseType">
129
         <property name="font">
130
          <font>
131
           <weight>50</weight>
132
           <bold>false</bold>
133
          </font>
134
         </property>
135
        </widget>
136
       </item>
137
      </layout>
118 138
     </item>
119 139
    </layout>
120 140
   </item>
HYTOS/HYTOS/UI/Phase_Liquid.ui
570 570
                 </font>
571 571
                </property>
572 572
                <property name="text">
573
                 <string>Sch. :</string>
573
                 <string>Sch. No. :</string>
574 574
                </property>
575 575
                <property name="alignment">
576 576
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
702 702
                 </font>
703 703
                </property>
704 704
                <property name="text">
705
                 <string>Rough</string>
705
                 <string>Roughness</string>
706 706
                </property>
707 707
               </widget>
708 708
              </item>
......
884 884
               </spacer>
885 885
              </item>
886 886
              <item>
887
               <widget class="QPushButton" name="pushButton_2">
887
               <widget class="QPushButton" name="pushButton_Fitting">
888 888
                <property name="font">
889 889
                 <font>
890 890
                  <weight>50</weight>
......
1058 1058
          </font>
1059 1059
         </property>
1060 1060
         <property name="title">
1061
          <string>Stream No : ?</string>
1061
          <string>Stream Information</string>
1062 1062
         </property>
1063 1063
         <layout class="QHBoxLayout" name="horizontalLayout_20">
1064 1064
          <item>
1065 1065
           <layout class="QHBoxLayout" name="horizontalLayout_13">
1066 1066
            <item>
1067
             <widget class="QLabel" name="label_3">
1067
             <widget class="QLabel" name="label_5">
1068 1068
              <property name="font">
1069 1069
               <font>
1070 1070
                <weight>50</weight>
......
1072 1072
               </font>
1073 1073
              </property>
1074 1074
              <property name="text">
1075
               <string>Display No.</string>
1075
               <string>Stream No. </string>
1076 1076
              </property>
1077 1077
             </widget>
1078 1078
            </item>
1079 1079
            <item>
1080
             <widget class="QLineEdit" name="lineEdit_DisplayNo">
1080
             <widget class="QLineEdit" name="lineEdit_9">
1081
              <property name="enabled">
1082
               <bool>false</bool>
1083
              </property>
1084
              <property name="minimumSize">
1085
               <size>
1086
                <width>90</width>
1087
                <height>0</height>
1088
               </size>
1089
              </property>
1081 1090
              <property name="maximumSize">
1082 1091
               <size>
1083 1092
                <width>90</width>
1084 1093
                <height>16777215</height>
1085 1094
               </size>
1086 1095
              </property>
1087
              <property name="font">
1088
               <font>
1089
                <weight>50</weight>
1090
                <bold>false</bold>
1091
               </font>
1092
              </property>
1093 1096
             </widget>
1094 1097
            </item>
1095 1098
            <item>
1096
             <widget class="QLabel" name="label_2">
1099
             <widget class="QLabel" name="label_3">
1097 1100
              <property name="font">
1098 1101
               <font>
1099 1102
                <weight>50</weight>
......
1101 1104
               </font>
1102 1105
              </property>
1103 1106
              <property name="text">
1104
               <string>Phase Type</string>
1107
               <string>Display No.</string>
1105 1108
              </property>
1106 1109
             </widget>
1107 1110
            </item>
1108 1111
            <item>
1109
             <widget class="QComboBox" name="comboBox_PhaseType">
1110
              <property name="minimumSize">
1112
             <widget class="QLineEdit" name="lineEdit_DisplayNo">
1113
              <property name="maximumSize">
1111 1114
               <size>
1112
                <width>90</width>
1113
                <height>0</height>
1115
                <width>16777215</width>
1116
                <height>16777215</height>
1114 1117
               </size>
1115 1118
              </property>
1116 1119
              <property name="font">
......
1161 1164
   </item>
1162 1165
  </layout>
1163 1166
 </widget>
1167
 <tabstops>
1168
  <tabstop>lineEdit_9</tabstop>
1169
  <tabstop>lineEdit_DisplayNo</tabstop>
1170
  <tabstop>lineEdit_4</tabstop>
1171
  <tabstop>lineEdit_5</tabstop>
1172
  <tabstop>lineEdit_6</tabstop>
1173
  <tabstop>lineEdit_7</tabstop>
1174
  <tabstop>lineEdit</tabstop>
1175
  <tabstop>lineEdit_2</tabstop>
1176
  <tabstop>comboBox_NominalDiameter</tabstop>
1177
  <tabstop>comboBox_Schedule</tabstop>
1178
  <tabstop>lineEdit_3</tabstop>
1179
  <tabstop>pushButton</tabstop>
1180
  <tabstop>lineEdit_10</tabstop>
1181
  <tabstop>lineEdit_11</tabstop>
1182
  <tabstop>lineEdit_12</tabstop>
1183
  <tabstop>pushButton_Fitting</tabstop>
1184
  <tabstop>lineEdit_13</tabstop>
1185
  <tabstop>lineEdit_8</tabstop>
1186
  <tabstop>textEdit</tabstop>
1187
  <tabstop>pushButton_5</tabstop>
1188
  <tabstop>pushButton_6</tabstop>
1189
  <tabstop>pushButton_4</tabstop>
1190
 </tabstops>
1164 1191
 <resources>
1165 1192
  <include location="../res/Resource.qrc"/>
1166 1193
 </resources>

내보내기 Unified diff

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