개정판 5ace22e9
issue #1059: 도면 이미지 해상도 개선
Change-Id: Ic19d5f9784f57b562b4252e817790eb18e5cc067
| App.spec | ||
|---|---|---|
| 16 | 16 |
('.\\HYTOS\\HYTOS\\translate\\*.qm', 'translate'),
|
| 17 | 17 |
('.\\HYTOS\\HYTOS\\Scripts\\*.sql', 'Scripts'),
|
| 18 | 18 |
('.\\HYTOS\\HYTOS\\res\\*.svg', 'res'),
|
| 19 |
('.\\HYTOS\\HYTOS\\ReportApp\\*.*', 'ReportApp'),
|
|
| 19 | 20 |
], |
| 20 | 21 |
hiddenimports=['tkinter'], |
| 21 | 22 |
hookspath=[], |
| HYTOS/HYTOS/MainWindow.py | ||
|---|---|---|
| 2216 | 2216 |
|
| 2217 | 2217 |
if svg_input_result == 1: |
| 2218 | 2218 |
os.startfile(save_file_name) |
| 2219 |
# QMessageBox.information(self, self.tr('Information'), self.tr('Report is done'))
|
|
| 2219 |
QMessageBox.information(self, self.tr('Information'), self.tr('Report is done'))
|
|
| 2220 | 2220 |
elif svg_input_result == 0: |
| 2221 | 2221 |
QMessageBox.information(self, self.tr('Information'),
|
| 2222 | 2222 |
self.tr('Could not find excel file or svg file'))
|
| HYTOSx86.wxs | ||
|---|---|---|
| 12 | 12 |
|
| 13 | 13 |
<Feature Id="ProductFeature" Title="HYTOS" Level="1"> |
| 14 | 14 |
<ComponentGroupRef Id="HYTOS" /> |
| 15 |
<ComponentGroupRef Id="ReportApp" /> |
|
| 15 | 16 |
</Feature> |
| 16 | 17 |
</Product> |
| 17 | 18 |
|
| ... | ... | |
| 105 | 106 |
</ComponentGroup> |
| 106 | 107 |
</Fragment> |
| 107 | 108 |
|
| 108 |
<Fragment> |
|
| 109 |
<DirectoryRef Id="INSTALLFOLDER"> |
|
| 110 |
<Directory Id="dir2479B4CBD34C5D8E06045ABE7EF6401E" Name="db" /> |
|
| 111 |
<Directory Id="dir4A75851B3F11AB4A6A14A144CF144CDE" Name="Include" /> |
|
| 112 |
<Directory Id="dirE74BC271BBB2DC1596036C68C520DE05" Name="PIL" /> |
|
| 113 |
<Directory Id="dir0395578F1B049DC836212B0E8A74915E" Name="PyQt5" /> |
|
| 114 |
<Directory Id="dirDF1CEA3323C27914B0D50E31598C65CE" Name="res" /> |
|
| 115 |
<Directory Id="dir33A2F09B010813323099475AA1D7838F" Name="Scripts" /> |
|
| 116 |
<Directory Id="dir4C219358092CF37B231E3A3DAAF3B513" Name="shapely" /> |
|
| 117 |
<Directory Id="dir608A4CEF2C50A404903D91CDBC5FC19F" Name="tcl" /> |
|
| 118 |
<Directory Id="dir49EA0834158134F6299E5E29DFC983FF" Name="tcl8" /> |
|
| 119 |
<Directory Id="dir981E75FAA8338FED72F8C693C4A43F64" Name="Templates" /> |
|
| 120 |
<Directory Id="dirCB95A5AFC5861D1E3A722344BB5C91C8" Name="tk" /> |
|
| 121 |
<Directory Id="dir2858E6757EEE7E6A5EF2129279E3829D" Name="translate" /> |
|
| 122 |
</DirectoryRef> |
|
| 109 |
<Fragment> |
|
| 110 |
<DirectoryRef Id="INSTALLFOLDER"> |
|
| 111 |
<Directory Id="dir2479B4CBD34C5D8E06045ABE7EF6401E" Name="db" /> |
|
| 112 |
<Directory Id="dir4A75851B3F11AB4A6A14A144CF144CDE" Name="Include" /> |
|
| 113 |
<Directory Id="dirE74BC271BBB2DC1596036C68C520DE05" Name="PIL" /> |
|
| 114 |
<Directory Id="dir0395578F1B049DC836212B0E8A74915E" Name="PyQt5" /> |
|
| 115 |
<Directory Id="dirDF1CEA3323C27914B0D50E31598C65CE" Name="res" /> |
|
| 116 |
<Directory Id="dir33A2F09B010813323099475AA1D7838F" Name="Scripts" /> |
|
| 117 |
<Directory Id="dir4C219358092CF37B231E3A3DAAF3B513" Name="shapely" /> |
|
| 118 |
<Directory Id="dir608A4CEF2C50A404903D91CDBC5FC19F" Name="tcl" /> |
|
| 119 |
<Directory Id="dir49EA0834158134F6299E5E29DFC983FF" Name="tcl8" /> |
|
| 120 |
<Directory Id="dir981E75FAA8338FED72F8C693C4A43F64" Name="Templates" /> |
|
| 121 |
<Directory Id="dirCB95A5AFC5861D1E3A722344BB5C91C8" Name="tk" /> |
|
| 122 |
<Directory Id="dir2858E6757EEE7E6A5EF2129279E3829D" Name="translate" /> |
|
| 123 |
<Directory Id="dirC643920DCE8D456A8378D1ECFECA6203" Name="ReportApp" /> |
|
| 124 |
</DirectoryRef> |
|
| 123 | 125 |
|
| 124 |
<DirectoryRef Id="TARGETDIR">
|
|
| 125 |
<Component Id="RegistryEntries" Guid="5376EB0F-AB87-42CB-9121-9D42770129D4">
|
|
| 126 |
<RegistryKey Root="HKLM"
|
|
| 127 |
Key="Software\SECL\HYTOS"
|
|
| 128 |
Action="createAndRemoveOnUninstall">
|
|
| 129 |
<RegistryValue Type="string" Name="Path" Value="[INSTALLFOLDER]"/>
|
|
| 130 |
</RegistryKey>
|
|
| 131 |
</Component>
|
|
| 132 |
</DirectoryRef>
|
|
| 133 |
</Fragment>
|
|
| 126 |
<DirectoryRef Id="TARGETDIR">
|
|
| 127 |
<Component Id="RegistryEntries" Guid="5376EB0F-AB87-42CB-9121-9D42770129D4">
|
|
| 128 |
<RegistryKey Root="HKLM"
|
|
| 129 |
Key="Software\SECL\HYTOS"
|
|
| 130 |
Action="createAndRemoveOnUninstall">
|
|
| 131 |
<RegistryValue Type="string" Name="Path" Value="[INSTALLFOLDER]"/>
|
|
| 132 |
</RegistryKey>
|
|
| 133 |
</Component>
|
|
| 134 |
</DirectoryRef>
|
|
| 135 |
</Fragment>
|
|
| 134 | 136 |
|
| 135 | 137 |
<Fragment> |
| 136 | 138 |
<Icon Id="ico6B6943A7346F494980BA04319103DE9A" SourceFile="HYTOS.ico" /> |
| ... | ... | |
| 3367 | 3369 |
<File Id="fil8BE6D90D1830F4B1D44B5C0B1FC12B4B" KeyPath="yes" Source=".\dist\App\translate\ko_kr.qm" /> |
| 3368 | 3370 |
</Component> |
| 3369 | 3371 |
</ComponentGroup> |
| 3372 |
<ComponentGroup Id="ReportApp"> |
|
| 3373 |
<Component Id="cmp7D65C35D16B3F44B1A39DA696888A8FA" Directory="dirC643920DCE8D456A8378D1ECFECA6203" Guid="4175F46A-09F9-4075-BD9F-AFA5C71841D5"> |
|
| 3374 |
<File Id="filC99B8574CE4263FE947951F6D85A3BEF" KeyPath="yes" Source=".\dist\App\ReportApp\GemBox.Spreadsheet.dll" /> |
|
| 3375 |
</Component> |
|
| 3376 |
<Component Id="cmp8003A8E94E4BD671A3E66F60954FE79B" Directory="dirC643920DCE8D456A8378D1ECFECA6203" Guid="759B25DE-A1CD-4450-97AC-D0CA4B5FA007"> |
|
| 3377 |
<File Id="fil52820AA6329EE9F429D84CB3BA350014" KeyPath="yes" Source=".\dist\App\ReportApp\GemBox.Spreadsheet.xml" /> |
|
| 3378 |
</Component> |
|
| 3379 |
<Component Id="cmpFA45B1114D3C9ECF5BCB2995B3BE70E1" Directory="dirC643920DCE8D456A8378D1ECFECA6203" Guid="801A7E4F-3A84-47F5-A276-EC7943E218DA"> |
|
| 3380 |
<File Id="fil2C8F62C7259273E7E4CC03132DB9C5F4" KeyPath="yes" Source=".\dist\App\ReportApp\ReportApp.exe" /> |
|
| 3381 |
</Component> |
|
| 3382 |
<Component Id="cmp268F5F616D9731F4DAC64604F7956126" Directory="dirC643920DCE8D456A8378D1ECFECA6203" Guid="9B6BFE99-DC52-48C5-97DD-94C68CDC1A2D"> |
|
| 3383 |
<File Id="filBBF80767FD3FBB08FE518E138786D519" KeyPath="yes" Source=".\dist\App\ReportApp\ReportApp.exe.config" /> |
|
| 3384 |
</Component> |
|
| 3385 |
</ComponentGroup> |
|
| 3370 | 3386 |
</Fragment> |
| 3371 | 3387 |
|
| 3372 | 3388 |
<Fragment> |
| ReportApp/ReportApp/ReportApp.csproj | ||
|---|---|---|
| 29 | 29 |
<PlatformTarget>AnyCPU</PlatformTarget> |
| 30 | 30 |
<DebugType>pdbonly</DebugType> |
| 31 | 31 |
<Optimize>true</Optimize> |
| 32 |
<OutputPath>bin\Release\</OutputPath>
|
|
| 32 |
<OutputPath>..\..\HYTOS\HYTOS\ReportApp\</OutputPath>
|
|
| 33 | 33 |
<DefineConstants>TRACE</DefineConstants> |
| 34 | 34 |
<ErrorReport>prompt</ErrorReport> |
| 35 | 35 |
<WarningLevel>4</WarningLevel> |
| ... | ... | |
| 39 | 39 |
<StartupObject /> |
| 40 | 40 |
</PropertyGroup> |
| 41 | 41 |
<ItemGroup> |
| 42 |
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942"> |
|
| 43 |
<HintPath>..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath> |
|
| 44 |
</Reference> |
|
| 45 |
<Reference Include="GemBox.Spreadsheet, Version=47.0.0.1207, Culture=neutral, PublicKeyToken=b1b72c69714d4847, processorArchitecture=MSIL"> |
|
| 46 |
<SpecificVersion>False</SpecificVersion> |
|
| 47 |
<HintPath>..\packages\GemBox.Spreadsheet.47\net35\GemBox.Spreadsheet.dll</HintPath> |
|
| 48 |
</Reference> |
|
| 42 |
<Reference Include="GemBox.Spreadsheet, Version=47.0.0.1207, Culture=neutral, PublicKeyToken=b1b72c69714d4847, processorArchitecture=MSIL" /> |
|
| 49 | 43 |
<Reference Include="PresentationCore" /> |
| 50 | 44 |
<Reference Include="PresentationFramework" /> |
| 51 | 45 |
<Reference Include="ReachFramework" /> |
| ... | ... | |
| 69 | 63 |
</ItemGroup> |
| 70 | 64 |
<ItemGroup> |
| 71 | 65 |
<None Include="App.config" /> |
| 72 |
<None Include="packages.config" /> |
|
| 73 | 66 |
</ItemGroup> |
| 74 | 67 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 75 | 68 |
</Project> |
| ReportApp/ReportApp/packages.config | ||
|---|---|---|
| 1 |
<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
<packages> |
|
| 3 |
<package id="BouncyCastle" version="1.8.9" targetFramework="net461" /> |
|
| 4 |
<package id="GemBox.Spreadsheet" version="47.0.1207" targetFramework="net461" /> |
|
| 5 |
</packages> |
|
| 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><strong>3.4.4.0 [2021.06.3]</strong></td></tr> |
|
| 41 |
<tr><td class="filesChanged">1.</td><td>도면 이미지 해상도 개선</td></tr> |
|
| 42 |
|
|
| 40 | 43 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><strong>3.4.3.0 [2021.06.1]</strong></td></tr> |
| 41 | 44 |
<tr><td class="filesChanged">1.</td><td>Flip, Rotation 기능 추가</td></tr> |
| 42 | 45 |
<tr><td class="filesChanged">2.</td><td>Polygon으로 객체를 선택하는 기능 추가</td></tr> |
내보내기 Unified diff
