개정판 ac69d685
issue #1059: PDF로 리포터를 만들 때 이미지의 해상도 개선
Change-Id: I3fbdf53a88956ccdaa94f2d5c7bd33888d25768f
| HYTOS/HYTOS/App.py | ||
|---|---|---|
| 166 | 166 |
from ExceptionHandler import QExceptionHandler |
| 167 | 167 |
from SystemInformation import QSystemInformationDialog |
| 168 | 168 |
|
| 169 |
app = App(sys.argv) |
|
| 169 | 170 |
app_doc_data = AppDocData.instance() |
| 170 | 171 |
configs = app_doc_data.getAppConfigs('app', 'update_url')
|
| 171 | 172 |
|
| 172 |
app = App(sys.argv) |
|
| 173 | 173 |
if configs and configs[0].value: |
| 174 | 174 |
auto_update(configs[0].value) |
| 175 | 175 |
|
| HYTOS/HYTOS/MainWindow.py | ||
|---|---|---|
| 160 | 160 |
class MainWindow(QMainWindow, MainWindow_UI.Ui_MainWindow, SingletonInstane): |
| 161 | 161 |
""" This is MainWindow class """ |
| 162 | 162 |
DEFAULT_SIZE = QSizeF(1188, 841) |
| 163 |
PAPER_SIZE = QSizeF(1500, 950) # 엑셀에서 이미지 영역의 크기(픽셀 단위) |
|
| 163 | 164 |
addMessage = pyqtSignal(Enum, str) |
| 164 | 165 |
|
| 165 | 166 |
def __init__(self): |
| ... | ... | |
| 1453 | 1454 |
|
| 1454 | 1455 |
cal_image = openpyxl.drawing.image.Image(image_path) |
| 1455 | 1456 |
# rect = self.graphicsView.sceneRect() |
| 1456 |
x_scale = MainWindow.DEFAULT_SIZE.width() / cal_image.width |
|
| 1457 |
y_scale = MainWindow.DEFAULT_SIZE.height() / cal_image.height |
|
| 1458 |
scale = min(x_scale, y_scale) |
|
| 1459 |
cal_image.width *= scale |
|
| 1460 |
cal_image.height *= scale |
|
| 1461 |
ws.add_image(cal_image, 'C4') |
|
| 1457 |
x_scale = MainWindow.PAPER_SIZE.width() / cal_image.width |
|
| 1458 |
y_scale = MainWindow.PAPER_SIZE.height() / cal_image.height |
|
| 1459 |
cal_image.width *= x_scale |
|
| 1460 |
cal_image.height *= y_scale |
|
| 1461 |
ws.add_image(cal_image, 'A1') |
|
| 1462 | 1462 |
|
| 1463 | 1463 |
company_image = openpyxl.drawing.image.Image(company_image_path) |
| 1464 | 1464 |
company_image.width *= 0.8 |
| HYTOS/HYTOS/QtImageViewer.py | ||
|---|---|---|
| 548 | 548 |
""" save scene as given file """ |
| 549 | 549 |
|
| 550 | 550 |
try: |
| 551 |
default = QSize(1188, 841) |
|
| 552 |
|
|
| 553 | 551 |
rect = self.scene.itemsBoundingRect() |
| 552 |
default = QSize(rect.width()*1, rect.height()*1) |
|
| 554 | 553 |
image = QImage(default, QImage.Format_ARGB32_Premultiplied) |
| 555 | 554 |
painter = QPainter(image) |
| 556 | 555 |
|
| readme.html | ||
|---|---|---|
| 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.3.2.0 [2021.04.27]</B></td></tr>
|
|
| 40 |
<tr><td style="tr-title" colspan="2"><strong>3.3.2.0 [2021.04.27]</strong></td></tr>
|
|
| 41 | 41 |
<tr><td class="filesChanged">1.</td><td>자동 업데이트 기능 추가</td></tr> |
| 42 | 42 |
|
| 43 | 43 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.2.2.0 [2021.03.25]</B></td></tr> |
내보내기 Unified diff
