개정판 b25f5d9e
issue #1059: Ven_Flowmeter_V 위치 보정 처리
Change-Id: I16a6663b9de46793b8c39d33a864c1a3e36451a4
HYTOS/HYTOS/Shapes/SymbolSvgItem.py | ||
---|---|---|
116 | 116 |
from App import App |
117 | 117 |
from AppDocData import MessageType |
118 | 118 |
|
119 |
message = 'error occurred({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename,
|
|
120 |
sys.exc_info()[-1].tb_lineno)
|
|
119 |
message = f'error occurred({repr(ex)}) in {sys.exc_info()[-1].tb_frame.f_code.co_filename}:' \
|
|
120 |
f'{sys.exc_info()[-1].tb_lineno}'
|
|
121 | 121 |
App.mainWnd().addMessage.emit(MessageType.Error, message) |
122 | 122 |
|
123 | 123 |
self.setZValue(SymbolSvgItem.ZVALUE) |
... | ... | |
2090 | 2090 |
node.attrib['stroke-width'] = "1.0" |
2091 | 2091 |
|
2092 | 2092 |
trans = self.sceneTransform() |
2093 |
# 'Ven_Flowmeter_V'의 경우 svg 파일이 g로 묶여있어 보정 처리함 |
|
2094 |
offset = [39.71057, 4.7766031] if self.name == 'Ven_Flowmeter_V' else [0, 0] |
|
2093 | 2095 |
node.attrib['transform'] = f"matrix(" \ |
2094 | 2096 |
f"{trans.m11()},{trans.m12()}," \ |
2095 | 2097 |
f"{trans.m21()},{trans.m22()}," \ |
2096 |
f"{trans.m31()},{trans.m32()}" \
|
|
2098 |
f"{trans.m31() + offset[0]},{trans.m32() + offset[1]}" \
|
|
2097 | 2099 |
f")" |
2098 | 2100 |
|
2099 | 2101 |
node_list = self._document.elementsByTagName('path') |
ReportApp/ReportApp/Program.cs | ||
---|---|---|
27 | 27 |
{ |
28 | 28 |
if (worksheet.Name.Contains("Page")) |
29 | 29 |
{ |
30 |
worksheet.Pictures.Add(SvgPath, "A1", 1500, 990, LengthUnit.Pixel);
|
|
30 |
worksheet.Pictures.Add(SvgPath, "A1", 1550, 990, LengthUnit.Pixel);
|
|
31 | 31 |
} |
32 | 32 |
} |
33 | 33 |
workbook.Save(ExcelPath); |
내보내기 Unified diff