프로젝트

일반

사용자정보

개정판 b56bffce

IDb56bffce390163d789ce85df1f6744c0b9e788b5
상위 680cee6a
하위 b99587c4

백흠경이(가) 약 5년 전에 추가함

issue #1057: able to order fitting sequence

Change-Id: I05c86c6d2c3d83f753d37aba9ecb772e1441f9d6

차이점 보기:

HYTOS/DTI_PID.sln
1 

2 
Microsoft Visual Studio Solution File, Format Version 12.00
3 
# Visual Studio 15
4 
VisualStudioVersion = 15.0.26430.14
5 
MinimumVisualStudioVersion = 10.0.40219.1
6 
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DTI_PID", "DTI_PID\DTI_PID.pyproj", "{7C2E55A3-2B16-4B4F-867F-F16E2EF6F2F0}"
7 
EndProject
8 
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDF_TO_IMAGE", "PDF_TO_IMAGE\PDF_TO_IMAGE.csproj", "{B7B8B0AE-9F03-4543-BC05-813A25E9D584}"
9 
EndProject
10 
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPPIDConverter", "SPPIDConverter\SPPIDConverter.csproj", "{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}"
11 
EndProject
12 
Global
13 
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
14 
		Debug|Any CPU = Debug|Any CPU
15 
		Debug|x86 = Debug|x86
16 
		Release|Any CPU = Release|Any CPU
17 
		Release|x86 = Release|x86
18 
	EndGlobalSection
19 
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
20 
		{7C2E55A3-2B16-4B4F-867F-F16E2EF6F2F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21 
		{7C2E55A3-2B16-4B4F-867F-F16E2EF6F2F0}.Debug|x86.ActiveCfg = Debug|Any CPU
22 
		{7C2E55A3-2B16-4B4F-867F-F16E2EF6F2F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
23 
		{7C2E55A3-2B16-4B4F-867F-F16E2EF6F2F0}.Release|x86.ActiveCfg = Release|Any CPU
24 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Debug|x86.ActiveCfg = Debug|x86
27 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Debug|x86.Build.0 = Debug|x86
28 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|Any CPU.ActiveCfg = Release|Any CPU
29 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|Any CPU.Build.0 = Release|Any CPU
30 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|x86.ActiveCfg = Release|x86
31 
		{B7B8B0AE-9F03-4543-BC05-813A25E9D584}.Release|x86.Build.0 = Release|x86
32 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
34 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|x86.ActiveCfg = Debug|x86
35 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Debug|x86.Build.0 = Debug|x86
36 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
37 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Release|Any CPU.Build.0 = Release|Any CPU
38 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Release|x86.ActiveCfg = Release|x86
39 
		{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}.Release|x86.Build.0 = Release|x86
40 
	EndGlobalSection
41 
	GlobalSection(SolutionProperties) = preSolution
42 
		HideSolutionNode = FALSE
43 
	EndGlobalSection
44 
	GlobalSection(ExtensibilityGlobals) = postSolution
45 
		SolutionGuid = {3D496EC3-A232-40B5-BD20-1EA3CFECD450}
46 
	EndGlobalSection
47 
EndGlobal
HYTOS/HYTOS/StreamDataDialog.py
63 63 

  		




  64
  64
  
    
class QStreamDataDialog(QDialog):


  		




  65
  65
  
    
    def __init__(self):


  		




  
  66
  
    
        from TableWidgetEx import QTableWidgetEx


  		




  66
  67
  
    
        QDialog.__init__(self)


  		




  67
  68
  
    

  		




  68
  69
  
    
        self.ui = StreamData_UI.Ui_Dialog()


  		




  69
  70
  
    
        self.ui.setupUi(self)


  		




  
  71
  
    

  		




  
  72
  
    
        self.ui.tableWidget_GeometryData_Mixed = QTableWidgetEx(self.ui.groupBox_GeometryData_Mixed)


  		




  
  73
  
    
        self.ui.tableWidget_GeometryData_Mixed.setObjectName("tableWidget_GeometryData_Mixed")


  		




  
  74
  
    
        self.ui.horizontalLayoutTableWidget.addWidget(self.ui.tableWidget_GeometryData_Mixed)


  		




  
  75
  
    

  		




  70
  76
  
    
        self.item = None


  		




  71
  77
  
    
        self.result = False


  		




  72
  78
  
    
        self.liquid_drop_method = None


  		












  

    
      HYTOS/HYTOS/StreamData_UI.py
    
  





  2
  2
  
    

  		




  3
  3
  
    
# Form implementation generated from reading ui file '.\UI\StreamData.ui'


  		




  4
  4
  
    
#


  		




  5
  
  
    
# Created by: PyQt5 UI code generator 5.13.0


  		




  
  5
  
    
# Created by: PyQt5 UI code generator 5.14.1


  		




  6
  6
  
    
#


  		




  7
  7
  
    
# WARNING! All changes made in this file will be lost!


  		




  8
  8
  
    

  		




  ......




  27
  27
  
    
        icon = QtGui.QIcon()


  		




  28
  28
  
    
        icon.addPixmap(QtGui.QPixmap(":/images/HYTOS.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  29
  29
  
    
        Dialog.setWindowIcon(icon)


  		




  
  30
  
    
        Dialog.setSizeGripEnabled(False)


  		




  30
  31
  
    
        self.groupBox_GeometryData = QtWidgets.QGroupBox(Dialog)


  		




  31
  32
  
    
        self.groupBox_GeometryData.setGeometry(QtCore.QRect(348, 56, 328, 329))


  		




  32
  33
  
    
        font = QtGui.QFont()


  		




  ......




  1038
  1039
  
    
        self.groupBox_GeometryData_Mixed.setObjectName("groupBox_GeometryData_Mixed")


  		




  1039
  1040
  
    
        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_GeometryData_Mixed)


  		




  1040
  1041
  
    
        self.gridLayout_2.setObjectName("gridLayout_2")


  		




  1041
  
  
    
        self.verticalLayout_2 = QtWidgets.QVBoxLayout()


  		




  1042
  
  
    
        self.verticalLayout_2.setObjectName("verticalLayout_2")


  		




  
  1042
  
    
        self.gridLayout_3 = QtWidgets.QGridLayout()


  		




  
  1043
  
    
        self.gridLayout_3.setObjectName("gridLayout_3")


  		




  1043
  1044
  
    
        self.pushButton_Add_GeometryData_Mixed = QtWidgets.QPushButton(self.groupBox_GeometryData_Mixed)


  		




  1044
  1045
  
    
        self.pushButton_Add_GeometryData_Mixed.setMinimumSize(QtCore.QSize(24, 24))


  		




  1045
  1046
  
    
        self.pushButton_Add_GeometryData_Mixed.setMaximumSize(QtCore.QSize(24, 24))


  		




  ......




  1052
  1053
  
    
        icon1.addPixmap(QtGui.QPixmap(":/images/Add.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  1053
  1054
  
    
        self.pushButton_Add_GeometryData_Mixed.setIcon(icon1)


  		




  1054
  1055
  
    
        self.pushButton_Add_GeometryData_Mixed.setObjectName("pushButton_Add_GeometryData_Mixed")


  		




  1055
  
  
    
        self.verticalLayout_2.addWidget(self.pushButton_Add_GeometryData_Mixed)


  		




  1056
  
  
    
        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)


  		




  1057
  
  
    
        self.verticalLayout_2.addItem(spacerItem7)


  		




  1058
  
  
    
        self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1)


  		




  1059
  
  
    
        self.tableWidget_GeometryData_Mixed = QtWidgets.QTableWidget(self.groupBox_GeometryData_Mixed)


  		




  1060
  
  
    
        self.tableWidget_GeometryData_Mixed.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)


  		




  1061
  
  
    
        self.tableWidget_GeometryData_Mixed.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)


  		




  1062
  
  
    
        self.tableWidget_GeometryData_Mixed.setObjectName("tableWidget_GeometryData_Mixed")


  		




  1063
  
  
    
        self.tableWidget_GeometryData_Mixed.setColumnCount(0)


  		




  1064
  
  
    
        self.tableWidget_GeometryData_Mixed.setRowCount(0)


  		




  1065
  
  
    
        self.gridLayout_2.addWidget(self.tableWidget_GeometryData_Mixed, 0, 3, 1, 1)


  		




  
  1056
  
    
        self.gridLayout_3.addWidget(self.pushButton_Add_GeometryData_Mixed, 0, 0, 1, 1)


  		




  
  1057
  
    
        self.horizontalLayoutTableWidget = QtWidgets.QHBoxLayout()


  		




  
  1058
  
    
        self.horizontalLayoutTableWidget.setObjectName("horizontalLayoutTableWidget")


  		




  
  1059
  
    
        self.gridLayout_3.addLayout(self.horizontalLayoutTableWidget, 0, 1, 1, 1)


  		




  
  1060
  
    
        self.gridLayout_2.addLayout(self.gridLayout_3, 0, 0, 1, 1)


  		




  1066
  1061
  
    
        self.pushButton_Calculation = QtWidgets.QPushButton(Dialog)


  		




  1067
  1062
  
    
        self.pushButton_Calculation.setGeometry(QtCore.QRect(8, 400, 125, 24))


  		




  1068
  1063
  
    
        self.pushButton_Calculation.setMinimumSize(QtCore.QSize(0, 24))


  		




  ......




  1120
  1115
  
    
        self.pushButton_view.setMinimumSize(QtCore.QSize(0, 24))


  		




  1121
  1116
  
    
        self.pushButton_view.setMaximumSize(QtCore.QSize(16777215, 24))


  		




  1122
  1117
  
    
        self.pushButton_view.setObjectName("pushButton_view")


  		




  
  1118
  
    
        self.groupBox_GeometryData.raise_()


  		




  
  1119
  
    
        self.groupBox_ProcessData_Liquid.raise_()


  		




  
  1120
  
    
        self.groupBox_Line_Sizing_Data.raise_()


  		




  
  1121
  
    
        self.groupBox_ProcessData_Vapor.raise_()


  		




  
  1122
  
    
        self.pushButton_Line_Sizing.raise_()


  		




  
  1123
  
    
        self.groupBox_ProcessData_Mixed.raise_()


  		




  
  1124
  
    
        self.pushButton_Calculation.raise_()


  		




  
  1125
  
    
        self.buttonBox.raise_()


  		




  
  1126
  
    
        self.pushButton_Diameter_Estimation.raise_()


  		




  
  1127
  
    
        self.pushButton_Copy_Stream.raise_()


  		




  
  1128
  
    
        self.comboBox_PhaseType.raise_()


  		




  
  1129
  
    
        self.label_14.raise_()


  		




  
  1130
  
    
        self.lineEdit_StreamNo.raise_()


  		




  
  1131
  
    
        self.label_5.raise_()


  		




  
  1132
  
    
        self.pushButton_view.raise_()


  		




  
  1133
  
    
        self.groupBox_GeometryData_Mixed.raise_()


  		




  1123
  1134
  
    

  		




  1124
  1135
  
    
        self.retranslateUi(Dialog)


  		




  1125
  1136
  
    
        self.buttonBox.accepted.connect(Dialog.accept)


  		




  ......




  1154
  1165
  
    
        Dialog.setTabOrder(self.pushButton_Calculation, self.pushButton_Diameter_Estimation)


  		




  1155
  1166
  
    
        Dialog.setTabOrder(self.pushButton_Diameter_Estimation, self.pushButton_Copy_Stream)


  		




  1156
  1167
  
    
        Dialog.setTabOrder(self.pushButton_Copy_Stream, self.pushButton_view)


  		




  1157
  
  
    
        Dialog.setTabOrder(self.pushButton_view, self.tableWidget_GeometryData_Mixed)


  		




  1158
  
  
    
        Dialog.setTabOrder(self.tableWidget_GeometryData_Mixed, self.lineEdit_Fitting_K)


  		




  
  1168
  
    
        Dialog.setTabOrder(self.pushButton_view, self.lineEdit_Fitting_K)


  		




  1159
  1169
  
    
        Dialog.setTabOrder(self.lineEdit_Fitting_K, self.lineEdit_Mixed_Flowrate_Mass_Vapor)


  		




  1160
  1170
  
    
        Dialog.setTabOrder(self.lineEdit_Mixed_Flowrate_Mass_Vapor, self.lineEdit_Mixed_Density_Vapor)


  		




  1161
  1171
  
    
        Dialog.setTabOrder(self.lineEdit_Mixed_Density_Vapor, self.lineEdit_Mixed_Viscosity_Vapor)


  		




  ......




  1170
  1180
  
    
        Dialog.setTabOrder(self.lineEdit_11, self.lineEdit_10)


  		




  1171
  1181
  
    
        Dialog.setTabOrder(self.lineEdit_10, self.lineEdit_9)


  		




  1172
  1182
  
    
        Dialog.setTabOrder(self.lineEdit_9, self.lineEdit_8)


  		




  1173
  
  
    
        Dialog.setTabOrder(self.lineEdit_8, self.pushButton_Add_GeometryData_Mixed)


  		




  1174
  1183
  
    

  		




  1175
  1184
  
    
    def retranslateUi(self, Dialog):


  		




  1176
  1185
  
    
        _translate = QtCore.QCoreApplication.translate


  		












  

    
      HYTOS/HYTOS/UI/StreamData.ui
    
  





  40
  40
  
    
   <iconset resource="../res/Resource.qrc">


  		




  41
  41
  
    
    <normaloff>:/images/HYTOS.png</normaloff>:/images/HYTOS.png</iconset>


  		




  42
  42
  
    
  </property>


  		




  
  43
  
    
  <property name="sizeGripEnabled">


  		




  
  44
  
    
   <bool>false</bool>


  		




  
  45
  
    
  </property>


  		




  43
  46
  
    
  <widget class="QGroupBox" name="groupBox_GeometryData">


  		




  44
  47
  
    
   <property name="geometry">


  		




  45
  48
  
    
    <rect>


  		




  ......




  2618
  2621
  
    
   </property>


  		




  2619
  2622
  
    
   <layout class="QGridLayout" name="gridLayout_2">


  		




  2620
  2623
  
    
    <item row="0" column="0">


  		




  2621
  
  
    
     <layout class="QVBoxLayout" name="verticalLayout_2">


  		




  2622
  
  
    
      <item>


  		




  
  2624
  
    
     <layout class="QGridLayout" name="gridLayout_3">


  		




  
  2625
  
    
      <item row="0" column="0">


  		




  2623
  2626
  
    
       <widget class="QPushButton" name="pushButton_Add_GeometryData_Mixed">


  		




  2624
  2627
  
    
        <property name="minimumSize">


  		




  2625
  2628
  
    
         <size>


  		




  ......




  2648
  2651
  
    
        </property>


  		




  2649
  2652
  
    
       </widget>


  		




  2650
  2653
  
    
      </item>


  		




  2651
  
  
    
      <item>


  		




  2652
  
  
    
       <spacer name="verticalSpacer_5">


  		




  2653
  
  
    
        <property name="orientation">


  		




  2654
  
  
    
         <enum>Qt::Vertical</enum>


  		




  2655
  
  
    
        </property>


  		




  2656
  
  
    
        <property name="sizeHint" stdset="0">


  		




  2657
  
  
    
         <size>


  		




  2658
  
  
    
          <width>20</width>


  		




  2659
  
  
    
          <height>40</height>


  		




  2660
  
  
    
         </size>


  		




  2661
  
  
    
        </property>


  		




  2662
  
  
    
       </spacer>


  		




  
  2654
  
    
      <item row="0" column="1">


  		




  
  2655
  
    
       <layout class="QHBoxLayout" name="horizontalLayoutTableWidget"/>


  		




  2663
  2656
  
    
      </item>


  		




  2664
  2657
  
    
     </layout>


  		




  2665
  2658
  
    
    </item>


  		




  2666
  
  
    
    <item row="0" column="3">


  		




  2667
  
  
    
     <widget class="QTableWidget" name="tableWidget_GeometryData_Mixed">


  		




  2668
  
  
    
      <property name="selectionMode">


  		




  2669
  
  
    
       <enum>QAbstractItemView::SingleSelection</enum>


  		




  2670
  
  
    
      </property>


  		




  2671
  
  
    
      <property name="selectionBehavior">


  		




  2672
  
  
    
       <enum>QAbstractItemView::SelectRows</enum>


  		




  2673
  
  
    
      </property>


  		




  2674
  
  
    
     </widget>


  		




  2675
  
  
    
    </item>


  		




  2676
  2659
  
    
   </layout>


  		




  2677
  2660
  
    
  </widget>


  		




  2678
  2661
  
    
  <widget class="QPushButton" name="pushButton_Calculation">


  		




  ......




  2859
  2842
  
    
    <string>View Calculation Result</string>


  		




  2860
  2843
  
    
   </property>


  		




  2861
  2844
  
    
  </widget>


  		




  
  2845
  
    
  <zorder>groupBox_GeometryData</zorder>


  		




  
  2846
  
    
  <zorder>groupBox_ProcessData_Liquid</zorder>


  		




  
  2847
  
    
  <zorder>groupBox_Line_Sizing_Data</zorder>


  		




  
  2848
  
    
  <zorder>groupBox_ProcessData_Vapor</zorder>


  		




  
  2849
  
    
  <zorder>pushButton_Line_Sizing</zorder>


  		




  
  2850
  
    
  <zorder>groupBox_ProcessData_Mixed</zorder>


  		




  
  2851
  
    
  <zorder>pushButton_Calculation</zorder>


  		




  
  2852
  
    
  <zorder>buttonBox</zorder>


  		




  
  2853
  
    
  <zorder>pushButton_Diameter_Estimation</zorder>


  		




  
  2854
  
    
  <zorder>pushButton_Copy_Stream</zorder>


  		




  
  2855
  
    
  <zorder>comboBox_PhaseType</zorder>


  		




  
  2856
  
    
  <zorder>label_14</zorder>


  		




  
  2857
  
    
  <zorder>lineEdit_StreamNo</zorder>


  		




  
  2858
  
    
  <zorder>label_5</zorder>


  		




  
  2859
  
    
  <zorder>pushButton_view</zorder>


  		




  
  2860
  
    
  <zorder>groupBox_GeometryData_Mixed</zorder>


  		




  2862
  2861
  
    
 </widget>


  		




  2863
  2862
  
    
 <tabstops>


  		




  2864
  2863
  
    
  <tabstop>lineEdit_StreamNo</tabstop>


  		




  ......




  2891
  2890
  
    
  <tabstop>pushButton_Diameter_Estimation</tabstop>


  		




  2892
  2891
  
    
  <tabstop>pushButton_Copy_Stream</tabstop>


  		




  2893
  2892
  
    
  <tabstop>pushButton_view</tabstop>


  		




  2894
  
  
    
  <tabstop>tableWidget_GeometryData_Mixed</tabstop>


  		




  2895
  2893
  
    
  <tabstop>lineEdit_Fitting_K</tabstop>


  		




  2896
  2894
  
    
  <tabstop>lineEdit_Mixed_Flowrate_Mass_Vapor</tabstop>


  		




  2897
  2895
  
    
  <tabstop>lineEdit_Mixed_Density_Vapor</tabstop>


  		




  ......




  2907
  2905
  
    
  <tabstop>lineEdit_10</tabstop>


  		




  2908
  2906
  
    
  <tabstop>lineEdit_9</tabstop>


  		




  2909
  2907
  
    
  <tabstop>lineEdit_8</tabstop>


  		




  2910
  
  
    
  <tabstop>pushButton_Add_GeometryData_Mixed</tabstop>


  		




  2911
  2908
  
    
 </tabstops>


  		




  2912
  2909
  
    
 <resources>


  		




  2913
  2910
  
    
  <include location="../res/Resource.qrc"/>


  		












내보내기  Unified diff




        
        

    















   



  

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