개정판 e93abe49
issue #1059: 각 시트마다 계산 결과, 회사, Mixed Type에 대한 이미지가 나타나도록 수정
Change-Id: I6887c48efb35ab983f5d7f55f996064011309591
| HYTOS.wxs | ||
|---|---|---|
| 386 | 386 |
<Component Id="cmp5F29B5D95BF145C48A13DDCB8A11194E" Directory="MyAppDataFolder" Guid="DD71B16A-CFCB-49DA-B513-D4D0560B318A"> |
| 387 | 387 |
<File Id="filFAC4B6243A464D75A35CAFC213913DBD" KeyPath="yes" Source=".\dist\App\Templates\Report_Template.xlsx" /> |
| 388 | 388 |
</Component> |
| 389 |
<Component Id="cmpE0BF521AD6A1F720B5BBF8137C3DD0B2" Directory="MyAppDataFolder" Guid="26AAC223-9E9E-406B-96D7-003F275E63E7"> |
|
| 390 |
<File Id="fil3E4BA43713C131999B0E9615B6A492A9" KeyPath="yes" Source=".\dist\App\Templates\Company.png" /> |
|
| 391 |
</Component> |
|
| 392 |
<Component Id="cmp92A8D72B10D94D019B19F9CCFB2647FE" Directory="MyAppDataFolder" Guid="21A0F09E-1DE4-4611-8EEC-B1F2257BF057"> |
|
| 393 |
<File Id="filDC74427AF42732170C2487D67292CD64" KeyPath="yes" Source=".\dist\App\Templates\Horizontal_Flow.png" /> |
|
| 394 |
</Component> |
|
| 395 |
<Component Id="cmp89CF19E723A55781E4EF5B0D8D914110" Directory="MyAppDataFolder" Guid="4F565141-07BC-477C-8BA0-C1BAC465A721"> |
|
| 396 |
<File Id="fil18DE9095DE416041C08B422C47DA9031" KeyPath="yes" Source=".\dist\App\Templates\Vertical_Downward_Flow.png" /> |
|
| 397 |
</Component> |
|
| 398 |
<Component Id="cmp318E537FBB49C039163B414C6706BD89" Directory="MyAppDataFolder" Guid="FEA509E3-9DD9-4A43-9C19-B8B5C18DE21C"> |
|
| 399 |
<File Id="fil34EA8A4436630C16C4D19E793A2E4E51" KeyPath="yes" Source=".\dist\App\Templates\Vertical_Upward_Flow.png" /> |
|
| 400 |
</Component> |
|
| 389 | 401 |
<Component Id="cmpC88C7058DD1B4F9D810AE363E929971D" Directory="MyAppDataFolder" Guid="46E937DE-F9FD-4591-8F72-0BA60A024F23"> |
| 390 | 402 |
<File Id="fil0549994C50244D83A729C2696B167266" KeyPath="yes" Source=".\dist\App\res\Explode.svg" /> |
| 391 | 403 |
</Component> |
| HYTOS/HYTOS/MainWindow.py | ||
|---|---|---|
| 978 | 978 |
options=options) |
| 979 | 979 |
|
| 980 | 980 |
template = os.path.join(os.getenv('ALLUSERSPROFILE'), App.NAME, 'Report_Template.xlsx')
|
| 981 |
|
|
| 982 |
# get image file path |
|
| 983 |
company_image_path = os.path.join(os.getenv('ALLUSERSPROFILE'), App.NAME, 'Company.png')
|
|
| 984 |
horizontal_flow_image_path = os.path.join(os.getenv('ALLUSERSPROFILE'), App.NAME, 'Horizontal_Flow.png')
|
|
| 985 |
vertical_upward_flow_image_path = os.path.join(os.getenv('ALLUSERSPROFILE'), App.NAME,
|
|
| 986 |
'Vertical_Upward_Flow.png') |
|
| 987 |
vertical_downward_flow_image_path = os.path.join(os.getenv('ALLUSERSPROFILE'), App.NAME,
|
|
| 988 |
'Vertical_Downward_Flow.png') |
|
| 989 |
# up to here |
|
| 981 | 990 |
if file_name and os.path.exists(template): |
| 982 | 991 |
units = [attr[1] for attr in app_doc_data.activeDrawing.attrs if attr[0] == 'Units'][0] |
| 983 | 992 |
|
| ... | ... | |
| 995 | 1004 |
cal_image.height *= y_scale |
| 996 | 1005 |
ws.add_image(cal_image, 'C4') |
| 997 | 1006 |
|
| 1007 |
company_image = openpyxl.drawing.image.Image(company_image_path) |
|
| 1008 |
company_image.width *= 0.8 |
|
| 1009 |
company_image.height *= 0.7 |
|
| 1010 |
ws.add_image(company_image, 'W53') |
|
| 1011 |
|
|
| 998 | 1012 |
"""write sheet information""" |
| 999 | 1013 |
configs = app_doc_data.getConfigs('Sheet')
|
| 1000 | 1014 |
for config in configs: |
| ... | ... | |
| 1361 | 1375 |
ws = wb.copy_worksheet(wb.get_sheet_by_name('Two_phase'))
|
| 1362 | 1376 |
ws.title = 'Two Phase {}'.format(str(lines[0]))
|
| 1363 | 1377 |
|
| 1378 |
horizontal_flow_image = openpyxl.drawing.image.Image(horizontal_flow_image_path) |
|
| 1379 |
horizontal_flow_image.width *= 0.6 |
|
| 1380 |
horizontal_flow_image.height *= 0.6 |
|
| 1381 |
ws.add_image(horizontal_flow_image, 'L3') |
|
| 1382 |
vertical_upward_flow_image = openpyxl.drawing.image.Image( |
|
| 1383 |
vertical_upward_flow_image_path) |
|
| 1384 |
vertical_upward_flow_image.width *= 0.6 |
|
| 1385 |
vertical_upward_flow_image.height *= 0.6 |
|
| 1386 |
ws.add_image(vertical_upward_flow_image, 'R3') |
|
| 1387 |
vertical_downward_flow_image = openpyxl.drawing.image.Image( |
|
| 1388 |
vertical_downward_flow_image_path) |
|
| 1389 |
vertical_downward_flow_image.width *= 0.6 |
|
| 1390 |
vertical_downward_flow_image.height *= 0.6 |
|
| 1391 |
ws.add_image(vertical_downward_flow_image, 'Z3') |
|
| 1392 |
|
|
| 1364 | 1393 |
# Information |
| 1365 | 1394 |
ws['B5'].value = 'File : Two_Phase' |
| 1366 | 1395 |
ws['B6'].value = 'Line : {}'.format(lines[0].stream_no)
|
| HYTOSx86.wxs | ||
|---|---|---|
| 263 | 263 |
<Component Id="cmp5F29B5D95BF145C48A13DDCB8A11194E" Directory="MyAppDataFolder" Guid="DD71B16A-CFCB-49DA-B513-D4D0560B318A"> |
| 264 | 264 |
<File Id="filFAC4B6243A464D75A35CAFC213913DBD" KeyPath="yes" Source=".\dist\App\Templates\Report_Template.xlsx" /> |
| 265 | 265 |
</Component> |
| 266 |
<Component Id="cmpC88C7058DD1B4F9D810AE363E929971D" Directory="MyAppDataFolder" Guid="46E937DE-F9FD-4591-8F72-0BA60A024F23"> |
|
| 267 |
<File Id="fil0549994C50244D83A729C2696B167266" KeyPath="yes" Source=".\dist\App\res\Explode.svg" /> |
|
| 268 |
</Component> |
|
| 266 |
<Component Id="cmpE0BF521AD6A1F720B5BBF8137C3DD0B2" Directory="MyAppDataFolder" Guid="26AAC223-9E9E-406B-96D7-003F275E63E7"> |
|
| 267 |
<File Id="fil3E4BA43713C131999B0E9615B6A492A9" KeyPath="yes" Source=".\dist\App\Templates\Company.png" /> |
|
| 268 |
</Component> |
|
| 269 |
<Component Id="cmp92A8D72B10D94D019B19F9CCFB2647FE" Directory="MyAppDataFolder" Guid="21A0F09E-1DE4-4611-8EEC-B1F2257BF057"> |
|
| 270 |
<File Id="filDC74427AF42732170C2487D67292CD64" KeyPath="yes" Source=".\dist\App\Templates\Horizontal_Flow.png" /> |
|
| 271 |
</Component> |
|
| 272 |
<Component Id="cmp89CF19E723A55781E4EF5B0D8D914110" Directory="MyAppDataFolder" Guid="4F565141-07BC-477C-8BA0-C1BAC465A721"> |
|
| 273 |
<File Id="fil18DE9095DE416041C08B422C47DA9031" KeyPath="yes" Source=".\dist\App\Templates\Vertical_Downward_Flow.png" /> |
|
| 274 |
</Component> |
|
| 275 |
<Component Id="cmp318E537FBB49C039163B414C6706BD89" Directory="MyAppDataFolder" Guid="FEA509E3-9DD9-4A43-9C19-B8B5C18DE21C"> |
|
| 276 |
<File Id="fil34EA8A4436630C16C4D19E793A2E4E51" KeyPath="yes" Source=".\dist\App\Templates\Vertical_Upward_Flow.png" /> |
|
| 277 |
</Component> |
|
| 269 | 278 |
<Component Id="cmp918DC12DD06841688FB3B0066C92660E" Directory="dir2E9D0B9FF47444B6A356DBE9B14DEBFC" Guid="41AAFE8A-E22A-4D62-BD0B-F36A769AE0B8"> |
| 270 | 279 |
<File Id="fil2D55D34A13384E8B9E5DCEAF26B2F3DC" KeyPath="yes" Source=".\dist\App\translate\ko_kr.qm" /> |
| 271 | 280 |
</Component> |
내보내기 Unified diff
