/ - Diff - HYTOS - 일정관리

개정판 560f9bc9

ID	560f9bc94c47dbb7d8bf766047624ae6a742d666
상위	b54ed69c
하위	167da54c

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

issue #1201 2 Phase 계산식 수정 - Home_Den, Homo_Vel 컬럼 추가

Change-Id: Iae824761449f843c4380a8cea96f4ae2ffad69c9

                               , Void
                               , Quality
                               , Density
                               , V_Den
                               , Homo_Den
                               , V_Den
                               , Mean_Vel
                               , Homo_Vel
                               , Max_Vel
                               , Ero_Vel
                               , Pattern_X
-...
                 cursor.execute(sql, param)
                 rows = cursor.fetchall()
                 for row in rows:
                     res.append((row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9],
                                 row[10], row[11], row[12], row[13], row[14], row[15], row[16], row[17], row[18], row[19]))
                     res.append((row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10],
                                 row[11], row[12], row[13], row[14], row[15], row[16], row[17], row[18], row[19], row[20],
                                 row[21]))
             # Catch the exception
             except Exception as ex:
                 from App import App

             self.v_visco = None
             self._lambda = None
             self.tp_homo_den = None
             self.tp_mean_den = None
             self.tp_homo_vel = None
             self.tp_mean_vel = None
             self.tp_max_vel = None
             self.tp_ero_vel = None
             self.tp_void = None
             self.no = None
             self.element = {}
             self.inside_diameter = {}
-...
             self.pressure = {}
             self.void = {}
             self.quality = {}
             self.mean_den = {}
             self.density = {}
             self.homo_vel = {}
             self.mean_den = {}  # Display : Density = >  Mean.Den
             self.homo_den = {}  # 새로 추가 : Homo.Den
             self.density = {}   # Display : V.Den
             self.mean_vel = {}  # Display : Mean Vel
             self.homo_vel = {}  # 새로 추가 : Homo Vel
             self.max_vel = {}
             self.ero_vel = {}
             self.x = {}
-...
                 elif self.tp_angle > 0:
                     self.tp_vu_regime()
                 self.mixed_pressure_variation[self.no][13] = self.x[self.no]
                 self.mixed_pressure_variation[self.no][14] = self.y[self.no]
                 self.mixed_pressure_variation[self.no][15] = str(self.regime[self.no])
                 self.mixed_pressure_variation[self.no][15] = self.x[self.no]
                 self.mixed_pressure_variation[self.no][16] = self.y[self.no]
                 self.mixed_pressure_variation[self.no][17] = str(self.regime[self.no])
             except Exception as ex:
                 from App import App
                 from AppDocData import MessageType
-...
                     values['Pressure_Drop_Friction'] = round(fric_result, 3)
                     values['Pressure_Drop_Static'] = round(stat_result, 3)
                     values['Velocity'] = self.homo_vel[1]
                     values['Density'] = self.mean_den[0]
                     # max_mean_den
                     max_mean_den = sys.float_info.min
                     for no in range(self.no):
                         if no in self.mean_den:
                             mean_den = self.mean_den[no] if no in self.mean_den else 0
                             if mean_den > max_mean_den:
                                 max_mean_den = mean_den
                     # max_homo_den
                     max_homo_den = sys.float_info.min
                     for no in range(self.no):
                         if no in self.homo_den:
                             homo_den = self.homo_den[no] if no in self.homo_den else 0
                             if homo_den > max_homo_den:
                                 max_homo_den = homo_den
                     # max_mean_vel
                     max_mean_vel = sys.float_info.min
                     for no in range(self.no):
                         if no in self.mean_vel:
                             mean_vel = self.mean_vel[no] if no in self.mean_vel else 0
                             if mean_vel > max_mean_vel:
                                 max_mean_vel = mean_vel
                     # max_homo_vel
                     max_homo_vel = sys.float_info.min
                     for no in range(self.no):
                         if no in self.homo_vel:
                             homo_vel = self.homo_vel[no] if no in self.homo_vel else 0
                             if homo_vel > max_homo_vel:
                                 max_homo_vel = homo_vel
                     values['Density'] = max(max_mean_den, max_homo_den)  # self.mean_den[0]
                     values['Velocity'] = max(max_mean_vel, max_homo_vel)  # self.mean_vel[1]
                     # 부피유량 계산
                     values['Flowrate_Volume'] = round(values['Flowrate_Mass'] / values['Density'], 3)
                     '''
                     tp_volume = self.tp_flow / self.tp_mean_den * 3600
                     # 현재 tp_volume은 m3/h임.부피유량 단위에 맞춰 뿌려줌
                     flowrate_volume_unit = self.units['Flowrate_Volume']
-...
                         tp_volume = round(tp_volume * 150.955, 3)
                     values['Flowrate_Volume'] = tp_volume
                     '''
                     drawing.hmbTable.updateByUID(self.item.uid, values)
             except Exception as ex:
                 from App import App
-...
                 # velocity (m/s)
                 velocity_unit = self.units['Velocity']
                 if velocity_unit == 'm/s':
                     av = self.tp_homo_vel
                     av = self.tp_mean_vel  # self.tp_homo_vel
                     mv = self.tp_max_vel
                     ev = self.tp_ero_vel
                 elif velocity_unit == 'ft/s':
                     av = self.tp_homo_vel * 3.28084
                     av = self.tp_mean_vel * 3.28084  # self.tp_homo_vel * 3.28084
                     mv = self.tp_max_vel * 3.28084
                     ev = self.tp_ero_vel * 3.28084
                 self.homo_vel[self.no] = av
                 self.mean_vel[self.no] = av
                 self.max_vel[self.no] = mv
                 self.ero_vel[self.no] = ev
                 self.homo_den[self.no] = self.tp_homo_den
                 self.homo_vel[self.no] = self.tp_homo_vel
                 # dimensionless
                 self.void[self.no] = self.tp_void
                 self.quality[self.no] = self.tp_quality
-...
                 void = self.void[key] if key in self.void else None
                 quality = self.quality[key] if key in self.quality else None
                 mean_den = self.mean_den[key] if key in self.mean_den else None
                 homo_den = self.homo_den[key] if key in self.homo_den else None
                 v_density = self.density[key] if key in self.density else None
                 mean_vel = self.mean_vel[key] if key in self.mean_vel else None
                 homo_vel = self.homo_vel[key] if key in self.homo_vel else None
                 max_vel = self.max_vel[key] if key in self.max_vel else None
                 ero_vel = self.ero_vel[key] if key in self.ero_vel else None
-...
                 total = self.total[key] if key in self.total else None
                 self.mixed_pressure_variation.append([element, inside_diameter, length, angle, k, pressure, void,
                                                 quality, mean_den, v_density, homo_vel, max_vel, ero_vel,
                                                 quality, mean_den, homo_den, v_density, mean_vel, homo_vel, max_vel, ero_vel,
                                                 x, y, regime, dp_fric, dp_stat, dp_momen, total])
             except Exception as ex:
-...
                     l_flowrate = float(self.process['l_flowrate'])
                     v_flowrate = float(self.process['v_flowrate'])
                     tp_homo_den = self.l_density * (1 - ((v_flowrate / self.v_density) / (
                     self.tp_homo_den = self.l_density * (1 - ((v_flowrate / self.v_density) / (
                             (v_flowrate / self.v_density) + (l_flowrate / self.l_density)))) + self.v_density * (
                                           (v_flowrate / self.v_density) / (
                                           (v_flowrate / self.v_density) + (l_flowrate / self.l_density)))
                     # mean velocity (m/s)
                     self.tp_mean_vel = self.tp_massflux / self.tp_mean_den
                     # homogeneous vel (m/s)
                     self.tp_homo_vel = self.tp_massflux * self.tp_quality / self.v_density + self.tp_massflux * (1 - self.tp_quality) / self.l_density
                     # max velocity (m/s)
                     self.tp_max_vel = 122 / (tp_homo_den ** 0.5)
                     self.tp_max_vel = 122 / (self.tp_homo_den ** 0.5)
                     # erosion velocity (m/s)
                     self.tp_ero_vel = 195 / (tp_homo_den ** 0.5)
                     self.tp_ero_vel = 195 / (self.tp_homo_den ** 0.5)
                 else:
                     return
             except Exception as ex:

                     self.units = attr[1]
         def initialize(self):
             self.ui.tableWidget.setColumnCount(21)
             self.ui.tableWidget.setColumnCount(23)
             col_names = ['No.\n-', 'Element\n-', 'Diameter\n{}'.format(self.units['Pipe_Diameter']),
                          'Length\n{}'.format(self.units['Length']), 'Angle\n(deg)', 'K\n-',
                          'Pressure\n{}(g)'.format(self.units['Pressure']), 'Void\n-', 'Quality\n-',
                          'Density\n{}'.format(self.units['Density']), 'V.Den\n{}'.format(self.units['Density']),
                          'Mean Vel\n{}'.format(self.units['Velocity']), 'Max Vel\n{}'.format(self.units['Velocity']),
                          'Ero Vel\n{}'.format(self.units['Velocity']),
                          'Pattern\nX', 'Pattern\nY', 'Regime\n-',
                          'Mean.Den\n{}'.format(self.units['Density']), 'Homo.Den\n{}'.format(self.units['Density']),
                          'V.Den\n{}'.format(self.units['Density']), 'Mean Vel\n{}'.format(self.units['Velocity']),
                          'Homo Vel\n{}'.format(self.units['Velocity']), 'Max Vel\n{}'.format(self.units['Velocity']),
                          'Ero Vel\n{}'.format(self.units['Velocity']), 'Pattern\nX', 'Pattern\nY', 'Regime\n-',
                          'Friction\n{}/{}'.format(self.units['Pressure'], self.units['Length']),
                          'Gravity\n{}/{}'.format(self.units['Pressure'], self.units['Length']),
                          'Momentum\n{}/{}'.format(self.units['Pressure'], self.units['Length']),
-...
                 self.ui.tableWidget.setItem(row, 15, set_item_properties(convert_to_fixed_point(data[14]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 16, set_item_properties(convert_to_fixed_point(data[15]),
                                                                          Qt.AlignHCenter | Qt.AlignVCenter))
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 17, set_item_properties(convert_to_fixed_point(data[16]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 18, set_item_properties(convert_to_fixed_point(data[17]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                                                                          Qt.AlignHCenter | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 19, set_item_properties(convert_to_fixed_point(data[18]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 20, set_item_properties(convert_to_fixed_point(data[19]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 21, set_item_properties(convert_to_fixed_point(data[20]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.setItem(row, 22, set_item_properties(convert_to_fixed_point(data[21]),
                                                                          Qt.AlignRight | Qt.AlignVCenter))
                 self.ui.tableWidget.resizeRowsToContents()
                 self.ui.tableWidget.resizeColumnsToContents()
             except Exception as ex:
-...
                 for row in range(self.ui.tableWidget.rowCount()):
                     length = self.ui.tableWidget.item(row, 3).text()
                     if is_not_blank(length):
                         x = float(self.ui.tableWidget.item(row, 14).text())
                         y = float(self.ui.tableWidget.item(row, 15).text())
                         x = float(self.ui.tableWidget.item(row, 16).text())
                         y = float(self.ui.tableWidget.item(row, 17).text())
                         angle = float(self.ui.tableWidget.item(row, 4).text())
                         if angle == 0:
-...
                     data[6] = round(row[6], 3) if row[6] is not None else None  # void
                     data[7] = round(row[7], 3) if row[7] is not None else None  # quality
                     data[8] = round(row[8], 3) if row[8] is not None else None  # density
                     data[9] = round(row[9], 3) if row[9] is not None else None  # v_den
                     data[10] = round(row[10], 3) if row[10] is not None else None  # mean_vel
                     data[11] = round(row[11], 3) if row[11] is not None else None  # max_vel
                     data[12] = round(row[12], 3) if row[12] is not None else None  # ero_vel
                     data[13] = round(row[13], 3) if row[13] is not None else None  # x
                     data[14] = round(row[14], 3) if row[14] is not None else None  # y
                     data[15] = row[15]  # regime
                     data[16] = round(row[16], 5) if row[16] is not None else None  # friction
                     data[17] = round(row[17], 5) if row[17] is not None else None  # gravity
                     data[18] = round(row[18], 5) if row[18] is not None else None  # momentum
                     data[19] = round(row[19], 5) if row[19] is not None else None  # total
                     total_display += round(row[19], 5) if row[19] is not None else 0
                     data[9] = round(row[9], 3) if row[9] is not None else None  # homo_den 새로 추가됨
                     data[10] = round(row[10], 3) if row[10] is not None else None  # v_den Index 9 -> 10로 변경
                     data[11] = round(row[11], 3) if row[11] is not None else None  # mean_vel Index 10 -> 11로 변경
                     data[12] = round(row[12], 3) if row[12] is not None else None  # homo_den 새로 추가됨
                     data[13] = round(row[13], 3) if row[13] is not None else None  # max_vel Index 11 -> 13로 변경
                     data[14] = round(row[14], 3) if row[14] is not None else None  # ero_vel Index 12 -> 14로 변경
                     data[15] = round(row[15], 5) if row[15] is not None else None  # x Index 13 -> 15로 변경
                     data[16] = round(row[16], 5) if row[16] is not None else None  # y Index 14 -> 16로 변경
                     # data[15] = round(row[15], 3) if row[15] is not None else None  # x Index 13 -> 15로 변경
                     # data[16] = round(row[16], 3) if row[16] is not None else None  # y Index 14 -> 16로 변경
                     data[17] = row[17]  # regime Index 15 -> 17로 변경
                     data[18] = round(row[18], 5) if row[18] is not None else None  # friction Index 16 -> 18로 변경
                     data[19] = round(row[19], 5) if row[19] is not None else None  # gravity Index 17 -> 19로 변경
                     data[20] = round(row[20], 5) if row[20] is not None else None  # momentum Index 18 -> 20로 변경
                     data[21] = round(row[21], 5) if row[21] is not None else None  # total Index 19 -> 21로 변경
                     total_display += round(row[21], 5) if row[21] is not None else 0
                     len = row[2] if row[2] is not None else 0
                     fric = row[16] if row[16] is not None else 0
                     grav = row[17] if row[17] is not None else 0
                     fric = row[18] if row[18] is not None else 0
                     grav = row[19] if row[19] is not None else 0
                     fric_display_pipe += round(fric * len, 5)
                     grav_display_pipe += round(grav * len, 5)
-...
                     if str(row[0]) != 'Start Point':
                         element = str(row[0]).rsplit('_', 1)[1]
                         if element == 'Bend':
                             dp_display_bend += round(row[19], 5) if row[19] is not None else 0
                             dp_display_bend += round(row[21], 5) if row[21] is not None else 0
                         elif element in ('Check_Valve', 'Ball Valve', 'Gate Valve', 'Globe Valve', 'Butterfly Valve'):
                             dp_display_valve += round(row[19], 5) if row[19] is not None else 0
                             dp_display_valve += round(row[21], 5) if row[21] is not None else 0
                         elif element in ('Nozzle In', 'Nozzle Out'):
                             dp_display_noz += round(row[19], 5) if row[19] is not None else 0
                             dp_display_noz += round(row[21], 5) if row[21] is not None else 0
                     mean_vel = row[10] if row[10] is not None else 0
                     max_vel = row[11] if row[11] is not None else 0
                     mean_vel = row[11] if row[11] is not None else 0
                     max_vel = row[13] if row[13] is not None else 0
                     if float(mean_vel) >= 20:
                         find_velocity_20 = True
-...
                         item.setForeground(Qt.black)
                         self.ui.listWidget_Status.insertItem(0, item)
                     regime = str(row[15])
                     regime = str(row[17])
                     if regime in ('Slug / Plug', 'Oscillary', 'Churn', 'Plug'):
                         message = '{} regime is {}!'.format(row[0], regime)
                         item = QListWidgetItem(message)

                 if self.mixed_pressure_variation:
                     for row in self.mixed_pressure_variation:
                         cols = ['UID', 'Components_UID', 'Element', 'Inside_Pipe_Size', 'Length', 'Angle', 'K', 'Pressure',
                                 'Void', 'Quality', 'Density', 'V_Den', 'Mean_Vel', 'Max_Vel', 'Ero_Vel', 'Pattern_X',
                                 'Pattern_Y', 'Regime', 'Friction', 'Gravity', 'Momentum', 'Total']
                         values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
                                   '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?']
                                 'Void', 'Quality', 'Density', 'Homo_Den', 'V_Den', 'Mean_Vel', 'Homo_Vel', 'Max_Vel',
                                 'Ero_Vel', 'Pattern_X', 'Pattern_Y', 'Regime', 'Friction', 'Gravity', 'Momentum', 'Total']
                         values = ['?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
                                   '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?']
                         param = [str(uuid.uuid4()), str(uid), str(row[0]), row[1], row[2], row[3], row[4], row[5], row[6],
                                  row[7], row[8], row[9], row[10], row[11], row[12], row[13], row[14], row[15], row[16],
                                  row[17], row[18], row[19]]
                                  row[17], row[18], row[19], row[20], row[21]]
                         sql = 'insert or replace into PressureVariation({}) values({})'.format(','.join(cols),
                                                                                             ','.join(values))

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 560f9bc9