개정판 9e08c92a
issue #1054: 단위 변환시 Straight Length 가 자동 계산 된다
Change-Id: I07870160d4cddc50ca6917d764ae0df718c59c19
| HYTOS/HYTOS/Calculation.py | ||
|---|---|---|
| 53 | 53 |
hmb.straight_length = self.convert_length(hmb.straight_length) |
| 54 | 54 |
if hmb.equivalent_length: |
| 55 | 55 |
hmb.equivalent_length = self.convert_length(hmb.equivalent_length) |
| 56 |
if hmb.straight_length: |
|
| 57 |
hmb.straight_length = self.convert_length(hmb.straight_length) |
|
| 58 | 56 |
if hmb.equivalent_length_input: |
| 59 | 57 |
hmb.equivalent_length_input = self.convert_length(hmb.equivalent_length_input) |
| 60 | 58 |
if hmb.fitting_length: |
| HYTOS/HYTOS/StreamDataDialog.py | ||
|---|---|---|
| 1231 | 1231 |
nominal_pipe_size_unit = self.ui.label_Nominal_Pipe_Size_Unit.text() |
| 1232 | 1232 |
|
| 1233 | 1233 |
nominal_diameter = self.ui.comboBox_Nominal_Pipe_Size.currentText() |
| 1234 |
if (nominal_pipe_size_unit.upper() == 'MM' and float(nominal_diameter) > 900) or (
|
|
| 1235 |
nominal_pipe_size_unit.upper() == 'IN' and float(nominal_diameter) > 36): |
|
| 1234 |
if nominal_diameter and (nominal_pipe_size_unit.upper() == 'MM' and float(nominal_diameter) > 900) or \
|
|
| 1235 |
(nominal_pipe_size_unit.upper() == 'IN' and float(nominal_diameter) > 36):
|
|
| 1236 | 1236 |
self.ui.lineEdit_Inside_Pipe_Size.setText(str(nominal_diameter)) |
| 1237 | 1237 |
else: |
| 1238 | 1238 |
nominal_diameter_uid = self.get_nominal_diameter_uid(nominal_diameter, nominal_pipe_size_unit) |
내보내기 Unified diff
