개정판 df26c309
issue# 1048: 1.velociy나 pressure drop이 limitation 값다 높을때 Stream Data의 배경색을 붉게 변경
2.Stream Line의 연결점이 끊어져 있을때 에러 출력
3.Stream Data 뷰에서 limitation pressure drop을 수정하고 sync 버튼을 눌렀을때 수정값 반영
Change-Id: Iaecc51d98a55eff0c635ce99415a4973d80f6780
| HYTOS/HYTOS/HMBTable.py | ||
|---|---|---|
| 469 | 469 |
pressure_drop, limitation_pressure_drop = self.pressure_drop, self.limitation_pressure_drop |
| 470 | 470 |
velocity, limitation_velocity = self.velocity, self.limitation_velocity |
| 471 | 471 | |
| 472 |
return type(pressure_drop) is float and type(limitation_pressure_drop) is float and \ |
|
| 473 |
type(velocity) is float and type(limitation_velocity) is float and \ |
|
| 474 |
(self.pressure_drop > self.limitation_pressure_drop or self.velocity > self.limitation_velocity) |
|
| 472 |
return (type(pressure_drop) is float and type(limitation_pressure_drop) is float and |
|
| 473 |
self.pressure_drop > self.limitation_pressure_drop) or \ |
|
| 474 |
(type(velocity) is float and type(limitation_velocity) is float and |
|
| 475 |
self.velocity > self.limitation_velocity) |
|
| 475 | 476 | |
| 476 | 477 |
def fromRow(row): |
| 477 | 478 |
hmb = HMBData() |
| HYTOS/HYTOS/MainWindow.py | ||
|---|---|---|
| 67 | 67 |
item.setForeground(foregroundcolor) # QBrush(QColor(255, 0, 0))) |
| 68 | 68 |
return item |
| 69 | 69 | |
| 70 |
""" |
|
| 71 |
item = QTableWidgetItem(str(name)) |
|
| 72 |
item.setTextAlignment(alignment) |
|
| 73 |
if backgroundcolor: |
|
| 74 |
item.setBackground(backgroundcolor) |
|
| 75 |
if foregroundcolor: |
|
| 76 |
item.setForeground(foregroundcolor) # QBrush(QColor(255, 0, 0))) |
|
| 77 |
return item |
|
| 78 |
""" |
|
| 79 | ||
| 80 | 70 | |
| 81 | 71 |
def convert_to_fixed_point(value): |
| 82 | 72 |
if is_float(str(value)): |
| ... | ... | |
| 341 | 331 |
components_uid = model.item(1, col).text() |
| 342 | 332 |
hmb = drawing.hmbTable.get_hmb_data(components_uid) |
| 343 | 333 | |
| 344 |
for row in range(2, 23):
|
|
| 334 |
for row in range(2, 24):
|
|
| 345 | 335 |
item = model.item(row, col) |
| 346 | 336 |
if Qt.magenta != item.background(): |
| 347 | 337 |
continue |
| ... | ... | |
| 1058 | 1048 |
app_doc_data.activeDrawing.modified = True |
| 1059 | 1049 |
self.setMainWindowTitle(f"{app_doc_data.activeDrawing.path}*")
|
| 1060 | 1050 | |
| 1061 |
''' |
|
| 1062 |
@brief selection changed |
|
| 1063 |
@author humkyung |
|
| 1064 |
@date 2018.06.27 |
|
| 1065 |
@history humkung 2018.07.08 call tree widget's findItem |
|
| 1066 |
''' |
|
| 1067 | ||
| 1068 | 1051 |
def onSelectionChanged(self): |
| 1052 |
"""selection changed""" |
|
| 1069 | 1053 |
from EngineeringStreamlineItem import QEngineeringStreamlineItem |
| 1070 | 1054 | |
| 1071 | 1055 |
items = [item for item in self.graphicsView.scene.selectedItems() if |
| HYTOS/HYTOS/Shapes/EngineeringStreamlineItem.py | ||
|---|---|---|
| 192 | 192 |
else: |
| 193 | 193 |
res = [[self, 'please check phase type']] |
| 194 | 194 | |
| 195 |
# check stream line connectivity |
|
| 196 |
for conn in self.connectors: |
|
| 197 |
if conn.connectedItem is None: |
|
| 198 |
msg = [self, f'check stream {self._stream_no} connection']
|
|
| 199 |
if res: |
|
| 200 |
res.append(msg) |
|
| 201 |
else: |
|
| 202 |
res = [msg, ] |
|
| 203 |
break |
|
| 204 |
# up to here |
|
| 205 | ||
| 195 | 206 |
return res |
| 196 | 207 | |
| 197 | 208 |
def build_connectors(self, connected, pointsUids=None): |
| readme.html | ||
|---|---|---|
| 25 | 25 |
<table width=100% style="border:1px dotted"> |
| 26 | 26 |
<tr bgcolor='#27AE60' > |
| 27 | 27 |
<td style="padding-left: 5px; font-weight: bold;" colspan=2> |
| 28 |
<font color="white" size="5"> HYTOS 3.0 </font> |
|
| 28 |
<font color="white" size="5"> HYTOS 3.1.9.0 </font>
|
|
| 29 | 29 |
</td> |
| 30 | 30 |
</tr> |
| 31 | 31 |
</table> |
| ... | ... | |
| 37 | 37 |
<td style="padding-left: 5px; font-weight: bold;" colspan="2"><font color="white" size="3">CHANGES</font></td> |
| 38 | 38 |
</tr> |
| 39 | 39 |
|
| 40 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.1.9.0 [2021.03.02]</B></td></tr> |
|
| 41 |
<tr><td class="filesChanged">1.</td><td>velociy나 pressure drop이 limitation 값다 높을때 Stream Data의 배경색을 붉게 변경</td></tr> |
|
| 42 |
<tr><td class="filesChanged">2.</td><td>Stream Line의 연결점이 끊어져 있을때 에러 출력</td></tr> |
|
| 43 |
<tr><td class="filesChanged">3.</td><td>Stream Data 뷰에서 limitation pressure drop을 수정하고 sync 버튼을 눌렀을때 수정값 반영</td></tr> |
|
| 44 |
|
|
| 40 | 45 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.1.8.0 [2021.03.01]</B></td></tr> |
| 41 | 46 |
<tr><td class="filesChanged">1.</td><td>Velocity, Pressure Drop이 임계값보다 높을 경우 화면에 표시</td></tr> |
| 42 | 47 |
|
| version.rc | ||
|---|---|---|
| 7 | 7 |
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) |
| 8 | 8 |
# Set not needed items to zero 0. |
| 9 | 9 |
# Local Build $BUILD_NUMBER=0 |
| 10 |
filevers=(3,1,8,0),
|
|
| 11 |
prodvers=(3,1,8,0),
|
|
| 10 |
filevers=(3,1,9,0),
|
|
| 11 |
prodvers=(3,1,9,0),
|
|
| 12 | 12 |
# Contains a bitmask that specifies the valid bits 'flags'r |
| 13 | 13 |
mask=0x3f, |
| 14 | 14 |
# Contains a bitmask that specifies the Boolean attributes of the file. |
| ... | ... | |
| 32 | 32 |
u'040904B0', |
| 33 | 33 |
[StringStruct(u'CompanyName', u'SECL'), |
| 34 | 34 |
StringStruct(u'FileDescription', u'Hydraulic Calculator'), |
| 35 |
StringStruct(u'FileVersion', u'3.1.8.0'),
|
|
| 35 |
StringStruct(u'FileVersion', u'3.1.9.0'),
|
|
| 36 | 36 |
StringStruct(u'InternalName', u'HYTOS'), |
| 37 | 37 |
StringStruct(u'LegalCopyright', u'Copyright(c) SECL'), |
| 38 | 38 |
StringStruct(u'OriginalFilename', u'HYTOS.exe'), |
| 39 | 39 |
StringStruct(u'ProductName', u'HYTOS'), |
| 40 |
StringStruct(u'ProductVersion', u'3.1.8.0')])
|
|
| 40 |
StringStruct(u'ProductVersion', u'3.1.9.0')])
|
|
| 41 | 41 |
]), |
| 42 | 42 |
VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) |
| 43 | 43 |
] |
내보내기 Unified diff