프로젝트

일반

사용자정보

개정판 54021391

ID540213915e71c84da1ba9bdef6912fda4f9ff015
상위 4ca2299d
하위 2e23e9d0

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

issue #1043 : 시스템분석/설계 Schedul_No => schedule_no 수정

Change-Id: I3e12f240e79f75b47299d5fcdc6ec7c2476f5acf

차이점 보기:

HYTOS/HYTOS/HMBTable.py
24 24
        self._compress_factor           = None
25 25
        self._nominal_pipe_size         = None
26 26
        self._inside_pipe_size          = None
27
        self._schedul_no                = None
27
        self._schedule_no               = None
28 28
        self._straight_length           = None
29 29
        self._equivalent_length         = None
30 30
        self._roughness                 = None
......
178 178
        self._inside_pipe_size = value
179 179

  
180 180
    @property
181
    def schedul_no(self):
182
        return self._schedul_no
181
    def schedule_no(self):
182
        return self._schedule_no
183 183

  
184
    @schedul_no.setter
185
    def schedul_no(self, value):
186
        self._schedul_no = value
184
    @schedule_no.setter
185
    def schedule_no(self, value):
186
        self._schedule_no = value
187 187

  
188 188
    @property
189 189
    def straight_length(self):
......
306 306
        hmb._compress_factor = row[11]
307 307
        hmb._nominal_pipe_size = row[12]
308 308
        hmb._inside_pipe_size = row[13]
309
        hmb._schedul_no = row[14]
309
        hmb._schedule_no = row[14]
310 310
        hmb._straight_length = row[15]
311 311
        hmb._equivalent_length = row[16]
312 312
        hmb._roughness = row[17]
......
398 398
                    hmb.nominal_pipe_size = values['Nominal_Pipe_Size']
399 399
                if 'Inside_Pipe_Size' in values:
400 400
                    hmb.inside_pipe_size = values['Inside_Pipe_Size']
401
                if 'Schedul_No' in values:
402
                    hmb.schedul_no = values['Schedul_No']
401
                if 'Schedule_No' in values:
402
                    hmb.schedule_no = values['Schedule_No']
403 403
                if 'Straight_Length' in values:
404 404
                    hmb.straight_length = values['Straight_Length']
405 405
                if 'Equivalent_Length' in values:
......
461 461
                              , h.Compress_Factor
462 462
                              , h.Nominal_Pipe_Size
463 463
                              , h.Inside_Pipe_Size
464
                              , h.Schedul_No
464
                              , h.Schedule_No
465 465
                              , h.Straight_Length
466 466
                              , h.Equivalent_Length
467 467
                              , h.Roughness
......
522 522
                if data.isDeleted == False:
523 523
                    cols = ['UID', 'Components_UID', 'Stream_No', 'Phase_Type', 'Flowrate_Mass', 'Flowrate_Volume', 'Density', 'Viscosity',
524 524
                            'Temperature', 'Molecular_Weight', 'Specific_Heat_Ratio', 'Compress_Factor', 'Nominal_Pipe_Size', 'Inside_Pipe_Size',
525
                            'Schedul_No', 'Straight_Length', 'Equivalent_Length', 'Roughness', 'Limitation_Velocity', 'Limitation_Pressure_Drop',
525
                            'Schedule_No', 'Straight_Length', 'Equivalent_Length', 'Roughness', 'Limitation_Velocity', 'Limitation_Pressure_Drop',
526 526
                            'Velocity', 'Reynolds', 'Friction_Factor', 'Pressure_Drop', 'Pressure_Drop_Friction', 'Pressure_Drop_Static', 'Pressure_Pipe_End_Point', 'Power']
527 527
                    values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?']
528 528
                    param = (str(data.uid), str(data.components_uid), data.stream_no, data.phase_type, data.flowrate_mass, data.flowrate_volume, data.density,
529 529
                             data.viscosity, data.temperature, data.molecular_weight, data.specific_heat_ratio, data.compress_factor, data.nominal_pipe_size,
530
                             data.inside_pipe_size, data.schedul_no, data.straight_length, data.equivalent_length, data.roughness, data.limitation_velocity,
530
                             data.inside_pipe_size, data.schedule_no, data.straight_length, data.equivalent_length, data.roughness, data.limitation_velocity,
531 531
                             data.limitation_pressure_drop, data.velocity, data.reynolds, data.friction_factor, data.pressure_drop, data.pressure_drop_friction,
532 532
                             data.pressure_drop_static, data.pressure_pipe_end_point, data.power)
533 533

  
HYTOS/HYTOS/MainWindow.py
887 887
                self.tableWidgetHMB.setItem(11, columnCount, self.setTableWidgetItemProperties(hmb.compress_factor, Qt.AlignHCenter | Qt.AlignVCenter))
888 888
                self.tableWidgetHMB.setItem(12, columnCount, self.setTableWidgetItemProperties(hmb.nominal_pipe_size, Qt.AlignHCenter | Qt.AlignVCenter))
889 889
                self.tableWidgetHMB.setItem(13, columnCount, self.setTableWidgetItemProperties(hmb.inside_pipe_size, Qt.AlignHCenter | Qt.AlignVCenter))
890
                self.tableWidgetHMB.setItem(14, columnCount, self.setTableWidgetItemProperties(hmb.schedul_no, Qt.AlignHCenter | Qt.AlignVCenter))
890
                self.tableWidgetHMB.setItem(14, columnCount, self.setTableWidgetItemProperties(hmb.schedule_no, Qt.AlignHCenter | Qt.AlignVCenter))
891 891
                self.tableWidgetHMB.setItem(15, columnCount, self.setTableWidgetItemProperties(hmb.straight_length, Qt.AlignHCenter | Qt.AlignVCenter))
892 892
                self.tableWidgetHMB.setItem(16, columnCount, self.setTableWidgetItemProperties(hmb.equivalent_length, Qt.AlignHCenter | Qt.AlignVCenter))
893 893
                self.tableWidgetHMB.setItem(17, columnCount, self.setTableWidgetItemProperties(hmb.roughness, Qt.AlignHCenter | Qt.AlignVCenter))
HYTOS/HYTOS/Phase_LiquidDialog.py
139 139
        self.ui.comboBox_Nominal_Pipe_Size.setCurrentIndex(-1)
140 140
        
141 141
    def initSchedule(self):
142
        self.ui.comboBox_Schedul_No.clear()
143

  
144
        self.ui.comboBox_Schedul_No.addItem('5S', '5S')
145
        self.ui.comboBox_Schedul_No.addItem('10S', '10S')
146
        self.ui.comboBox_Schedul_No.addItem('10', '10')
147
        self.ui.comboBox_Schedul_No.addItem('20', '20')
148
        self.ui.comboBox_Schedul_No.addItem('30', '30')
149
        self.ui.comboBox_Schedul_No.addItem('40S', '40S')
150
        self.ui.comboBox_Schedul_No.addItem('Std', 'Std')
151
        self.ui.comboBox_Schedul_No.addItem('40', '40')
152
        self.ui.comboBox_Schedul_No.addItem('60', '60')
153
        self.ui.comboBox_Schedul_No.addItem('80S', '80S')
154
        self.ui.comboBox_Schedul_No.addItem('XS', 'XS')
155
        self.ui.comboBox_Schedul_No.addItem('80', '80')
156
        self.ui.comboBox_Schedul_No.addItem('100', '100')
157
        self.ui.comboBox_Schedul_No.addItem('120', '120')
158
        self.ui.comboBox_Schedul_No.addItem('140', '140')
159
        self.ui.comboBox_Schedul_No.addItem('160', '160')
160
        self.ui.comboBox_Schedul_No.addItem('XXS', 'XXS')
161
        self.ui.comboBox_Schedul_No.addItem('User Sch.', 'User Sch.')
162

  
163
        self.ui.comboBox_Schedul_No.setCurrentIndex(-1)
142
        self.ui.comboBox_Schedule_No.clear()
143

  
144
        self.ui.comboBox_Schedule_No.addItem('5S', '5S')
145
        self.ui.comboBox_Schedule_No.addItem('10S', '10S')
146
        self.ui.comboBox_Schedule_No.addItem('10', '10')
147
        self.ui.comboBox_Schedule_No.addItem('20', '20')
148
        self.ui.comboBox_Schedule_No.addItem('30', '30')
149
        self.ui.comboBox_Schedule_No.addItem('40S', '40S')
150
        self.ui.comboBox_Schedule_No.addItem('Std', 'Std')
151
        self.ui.comboBox_Schedule_No.addItem('40', '40')
152
        self.ui.comboBox_Schedule_No.addItem('60', '60')
153
        self.ui.comboBox_Schedule_No.addItem('80S', '80S')
154
        self.ui.comboBox_Schedule_No.addItem('XS', 'XS')
155
        self.ui.comboBox_Schedule_No.addItem('80', '80')
156
        self.ui.comboBox_Schedule_No.addItem('100', '100')
157
        self.ui.comboBox_Schedule_No.addItem('120', '120')
158
        self.ui.comboBox_Schedule_No.addItem('140', '140')
159
        self.ui.comboBox_Schedule_No.addItem('160', '160')
160
        self.ui.comboBox_Schedule_No.addItem('XXS', 'XXS')
161
        self.ui.comboBox_Schedule_No.addItem('User Sch.', 'User Sch.')
162

  
163
        self.ui.comboBox_Schedule_No.setCurrentIndex(-1)
164 164

  
165 165

  
166 166
    def initRoughness(self):
......
199 199
        if drawing:    
200 200
            for hmb in drawing.hmbTable._hmbs:
201 201
                if hmb.components_uid == self.components_uid:
202

  
203
                    self.ui.lineEdit_Flowrate_Mass.setText(str(hmb.flowrate_mass))
202
                    if hmb.flowrate_mass:
203
                        self.ui.lineEdit_Flowrate_Mass.setText(str(hmb.flowrate_mass))
204
                    if hmb.flowrate_volume:
205
                        self.ui.lineEdit_Flowrate_Volume.setText(str(hmb.flowrate_volume))
204 206
                    break
205 207

  
206 208

  
......
223 225
            values['Limitation_Pressure_Drop'] = self.ui.lineEdit_Limitation_Pressure_Drop.text()
224 226
            values['Nominal_Pipe_Size'] = self.ui.comboBox_Nominal_Pipe_Size.currentText()
225 227
            values['Inside_Pipe_Size'] = self.ui.lineEdit_Inside_Pipe_Size.text()
226
            values['Schedul_No'] = self.ui.comboBox_Schedul_No.currentText()
228
            values['Schedule_No'] = self.ui.comboBox_Schedule_No.currentText()
227 229
            values['Roughness'] = self.ui.lineEdit_Roughness.text()
228 230
            values['Straight_Length'] = self.ui.lineEdit_Straight_Length.text()
229 231

  
HYTOS/HYTOS/Phase_Liquid_UI.py
350 350
        self.label_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
351 351
        self.label_10.setObjectName("label_10")
352 352
        self.horizontalLayout_6.addWidget(self.label_10)
353
        self.comboBox_Schedul_No = QtWidgets.QComboBox(self.groupBox)
354
        self.comboBox_Schedul_No.setMinimumSize(QtCore.QSize(80, 0))
355
        self.comboBox_Schedul_No.setMaximumSize(QtCore.QSize(80, 16777215))
353
        self.comboBox_Schedule_No = QtWidgets.QComboBox(self.groupBox)
354
        self.comboBox_Schedule_No.setMinimumSize(QtCore.QSize(80, 0))
355
        self.comboBox_Schedule_No.setMaximumSize(QtCore.QSize(80, 16777215))
356 356
        font = QtGui.QFont()
357 357
        font.setBold(False)
358 358
        font.setWeight(50)
359
        self.comboBox_Schedul_No.setFont(font)
360
        self.comboBox_Schedul_No.setObjectName("comboBox_Schedul_No")
361
        self.horizontalLayout_6.addWidget(self.comboBox_Schedul_No)
359
        self.comboBox_Schedule_No.setFont(font)
360
        self.comboBox_Schedule_No.setObjectName("comboBox_Schedule_No")
361
        self.horizontalLayout_6.addWidget(self.comboBox_Schedule_No)
362 362
        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
363 363
        self.horizontalLayout_6.addItem(spacerItem2)
364 364
        self.verticalLayout_4.addLayout(self.horizontalLayout_6)
......
641 641
        LiquidDialog.setTabOrder(self.lineEdit_Limitation_Pressure_Drop, self.radioButton_Equivalent_Length_Input)
642 642
        LiquidDialog.setTabOrder(self.radioButton_Equivalent_Length_Input, self.radioButton_Equivalent_Length_Cal)
643 643
        LiquidDialog.setTabOrder(self.radioButton_Equivalent_Length_Cal, self.comboBox_Nominal_Pipe_Size)
644
        LiquidDialog.setTabOrder(self.comboBox_Nominal_Pipe_Size, self.comboBox_Schedul_No)
645
        LiquidDialog.setTabOrder(self.comboBox_Schedul_No, self.lineEdit_Inside_Pipe_Size)
644
        LiquidDialog.setTabOrder(self.comboBox_Nominal_Pipe_Size, self.comboBox_Schedule_No)
645
        LiquidDialog.setTabOrder(self.comboBox_Schedule_No, self.lineEdit_Inside_Pipe_Size)
646 646
        LiquidDialog.setTabOrder(self.lineEdit_Inside_Pipe_Size, self.comboBox_Roughness)
647 647
        LiquidDialog.setTabOrder(self.comboBox_Roughness, self.lineEdit_Roughness)
648 648
        LiquidDialog.setTabOrder(self.lineEdit_Roughness, self.pushButton_Roughness)
HYTOS/HYTOS/Scripts/CreateTables.sql
260 260
    Compress_Factor          REAL,
261 261
    Nominal_Pipe_Size        REAL,
262 262
    Inside_Pipe_Size         REAL,
263
    Schedul_No               TEXT,
263
    Schedule_No              TEXT,
264 264
    Straight_Length          REAL,
265 265
    Equivalent_Length        REAL,
266 266
    Roughness                REAL,
HYTOS/HYTOS/UI/Phase_Liquid.ui
778 778
               </widget>
779 779
              </item>
780 780
              <item>
781
               <widget class="QComboBox" name="comboBox_Schedul_No">
781
               <widget class="QComboBox" name="comboBox_Schedule_No">
782 782
                <property name="minimumSize">
783 783
                 <size>
784 784
                  <width>80</width>
......
1438 1438
  <tabstop>radioButton_Equivalent_Length_Input</tabstop>
1439 1439
  <tabstop>radioButton_Equivalent_Length_Cal</tabstop>
1440 1440
  <tabstop>comboBox_Nominal_Pipe_Size</tabstop>
1441
  <tabstop>comboBox_Schedul_No</tabstop>
1441
  <tabstop>comboBox_Schedule_No</tabstop>
1442 1442
  <tabstop>lineEdit_Inside_Pipe_Size</tabstop>
1443 1443
  <tabstop>comboBox_Roughness</tabstop>
1444 1444
  <tabstop>lineEdit_Roughness</tabstop>

내보내기 Unified diff

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