개정판 38d69491
issue #00000 ctrl+S입력시 텍스트박스 입력 완료 되도록 수정
Change-Id: Id4ab97a53ab61022f5a2ac4d5ae63cd14338c2a7
FinalService/KCOM_FinalService/ConnectionStrEncrypt/Program.cs | ||
---|---|---|
23 | 23 |
|
24 | 24 |
if (args == null || args?.Count() == 0) |
25 | 25 |
{ |
26 |
args = new[] { "-en", "data source=210.94.128.101;database=markus;user id=doftech;password=xpdhtm!1" }; |
|
26 |
args = new[] { "-en", "data source=10.10.130.11,14950;database=markus;user id=doftech;password=gasadmin1!" }; |
|
27 |
//args = new[] { "-en", "data source=210.94.128.101;database=markus;user id=doftech;password=xpdhtm!1" }; |
|
27 | 28 |
//args = new[] { "-en", "data source=10.11.142.77;database=markus;user id=doftech;password=dof1073#" }; |
28 | 29 |
} |
29 | 30 |
|
FinalService/KCOM_FinalService/FinalPDFClient/FinalPDFClient.csproj | ||
---|---|---|
103 | 103 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
104 | 104 |
<Name>KCOMDataModel</Name> |
105 | 105 |
</ProjectReference> |
106 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
107 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
108 |
<Name>MarkupToPDF</Name> |
|
109 |
</ProjectReference> |
|
110 | 106 |
</ItemGroup> |
111 | 107 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
112 | 108 |
</Project> |
FinalService/KCOM_FinalService/FinalProcess/FinalProcess.csproj | ||
---|---|---|
81 | 81 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
82 | 82 |
<Name>KCOMDataModel</Name> |
83 | 83 |
</ProjectReference> |
84 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
85 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
86 |
<Name>MarkupToPDF</Name> |
|
87 |
</ProjectReference> |
|
88 | 84 |
</ItemGroup> |
89 | 85 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
90 | 86 |
</Project> |
FinalService/KCOM_FinalService/FinalService_Config/FinalService_Config.csproj | ||
---|---|---|
99 | 99 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
100 | 100 |
<Name>KCOMDataModel</Name> |
101 | 101 |
</ProjectReference> |
102 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
103 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
104 |
<Name>MarkupToPDF</Name> |
|
105 |
</ProjectReference> |
|
106 | 102 |
</ItemGroup> |
107 | 103 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
108 | 104 |
</Project> |
FinalService/KCOM_FinalService/KCOM_FinalService.sln | ||
---|---|---|
45 | 45 |
EndProject |
46 | 46 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefinalDPF", "RefinalDPF\RefinalDPF.csproj", "{E465E364-BA2C-433E-9517-1813E92F9B8E}" |
47 | 47 |
EndProject |
48 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadFinal_DIG", "Upload\UploadFinal_DIG\UploadFinal_DIG.csproj", "{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}" |
|
49 |
EndProject |
|
48 | 50 |
Global |
49 | 51 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
50 | 52 |
Debug|Any CPU = Debug|Any CPU |
... | ... | |
263 | 265 |
{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x64.Build.0 = Release|Any CPU |
264 | 266 |
{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x86.ActiveCfg = Release|Any CPU |
265 | 267 |
{E465E364-BA2C-433E-9517-1813E92F9B8E}.Release|x86.Build.0 = Release|Any CPU |
268 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
|
269 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
270 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|x64.ActiveCfg = Debug|Any CPU |
|
271 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|x64.Build.0 = Debug|Any CPU |
|
272 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|x86.ActiveCfg = Debug|Any CPU |
|
273 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Debug|x86.Build.0 = Debug|Any CPU |
|
274 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
275 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|Any CPU.Build.0 = Release|Any CPU |
|
276 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|x64.ActiveCfg = Release|Any CPU |
|
277 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|x64.Build.0 = Release|Any CPU |
|
278 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|x86.ActiveCfg = Release|Any CPU |
|
279 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5}.Release|x86.Build.0 = Release|Any CPU |
|
266 | 280 |
EndGlobalSection |
267 | 281 |
GlobalSection(SolutionProperties) = preSolution |
268 | 282 |
HideSolutionNode = FALSE |
269 | 283 |
EndGlobalSection |
270 | 284 |
GlobalSection(NestedProjects) = preSolution |
271 | 285 |
{BA75F8CB-9124-4C72-99EA-BEAA7694E4FF} = {3678893C-6BB1-469D-A595-2B3C5266AA92} |
286 |
{70B9FF4A-8848-4284-9183-13C9F3ACDFE5} = {3678893C-6BB1-469D-A595-2B3C5266AA92} |
|
272 | 287 |
EndGlobalSection |
273 | 288 |
GlobalSection(ExtensibilityGlobals) = postSolution |
274 | 289 |
SolutionGuid = {33A8665E-880F-495D-950D-15CA626E83F0} |
FinalService/KCOM_FinalService/KCOM_FinalService/KCOM_FinalService.csproj | ||
---|---|---|
59 | 59 |
</ItemGroup> |
60 | 60 |
<ItemGroup> |
61 | 61 |
<Compile Include="Common\Logger.cs" /> |
62 |
<Compile Include="CreateConvertPath.cs" /> |
|
62 | 63 |
<Compile Include="FinalService.cs"> |
63 | 64 |
<SubType>Component</SubType> |
64 | 65 |
</Compile> |
... | ... | |
95 | 96 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
96 | 97 |
<Name>KCOMDataModel</Name> |
97 | 98 |
</ProjectReference> |
98 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
99 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
100 |
<Name>MarkupToPDF</Name> |
|
101 |
</ProjectReference> |
|
102 | 99 |
</ItemGroup> |
103 | 100 |
<ItemGroup> |
104 | 101 |
<None Include="app.config" /> |
FinalService/KCOM_FinalService/KCOM_FinalService/Remoting/RemFinalPDFStation.cs | ||
---|---|---|
387 | 387 |
|
388 | 388 |
string savepath = CommonLib.Common.GetConfigString("DebugSavePath", "URL", ""); |
389 | 389 |
|
390 |
string sFolder = _item.DOCUMENT_ID.All(char.IsDigit) ? (Convert.ToInt32(_item.DOCUMENT_ID) / 100).ToString() : _item.DOCUMENT_ID.Substring(0, 5);
|
|
390 |
string sFolder = _item.DOCUMENT_ID.All(char.IsDigit) ? (Convert.ToInt64(_item.DOCUMENT_ID) / 100).ToString() : _item.DOCUMENT_ID.Substring(0, 5);
|
|
391 | 391 |
string saveFolder = String.Format(savepath, _item.PROJECT_NO, sFolder, _item.DOCUMENT_ID); |
392 | 392 |
if (!System.IO.Directory.Exists(saveFolder)) |
393 | 393 |
{ |
FinalService/KCOM_FinalService/KCOM_FinalServiceConsole/KCOM_FinalServiceConsole.csproj | ||
---|---|---|
64 | 64 |
<Project>{2be3f054-d494-4712-927f-47e2ffb52170}</Project> |
65 | 65 |
<Name>KCOM_FinalService</Name> |
66 | 66 |
</ProjectReference> |
67 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
68 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
69 |
<Name>MarkupToPDF</Name> |
|
70 |
</ProjectReference> |
|
71 | 67 |
<ProjectReference Include="..\UploadFinal\UploadFinal_Daelim.csproj"> |
72 | 68 |
<Project>{9cf3737a-e04d-4a55-924e-c88725dfbec7}</Project> |
73 | 69 |
<Name>UploadFinal_Daelim</Name> |
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs | ||
---|---|---|
38 | 38 |
public List<DOCPAGE> DocPageItem = null; |
39 | 39 |
public MARKUP_INFO MarkupInfoItem = null; |
40 | 40 |
public List<MARKUP_DATA> MarkupDataSet = null; |
41 |
public List<MARKUP_DATA> MarkupDataSet = null; |
|
41 | 42 |
//private string _PrintPDFStorgeLocal = null; |
42 | 43 |
//private string _PrintPDFStorgeRemote = null; |
43 | 44 |
public event EventHandler<MakeFinalErrorArgs> FinalMakeError; |
FinalService/KCOM_FinalService/Upload/UploadFinal_Bseng/UploadFinal_Bseng.csproj | ||
---|---|---|
67 | 67 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
68 | 68 |
<Name>KCOMDataModel</Name> |
69 | 69 |
</ProjectReference> |
70 |
<ProjectReference Include="..\..\MarkupToPDF\MarkupToPDF.csproj"> |
|
71 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
72 |
<Name>MarkupToPDF</Name> |
|
73 |
</ProjectReference> |
|
74 | 70 |
</ItemGroup> |
75 | 71 |
<ItemGroup> |
76 | 72 |
<PackageReference Include="log4net"> |
FinalService/KCOM_FinalService/UploadFinal/UploadFinal_Daelim.csproj | ||
---|---|---|
67 | 67 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
68 | 68 |
<Name>KCOMDataModel</Name> |
69 | 69 |
</ProjectReference> |
70 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
71 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
72 |
<Name>MarkupToPDF</Name> |
|
73 |
</ProjectReference> |
|
74 | 70 |
</ItemGroup> |
75 | 71 |
<ItemGroup> |
76 | 72 |
<PackageReference Include="log4net"> |
FinalService/KCOM_FinalService/UploadTest/App.xaml | ||
---|---|---|
1 |
<Application x:Class="UploadTest.App" |
|
2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
4 |
xmlns:local="clr-namespace:UploadTest" |
|
5 |
StartupUri="MainWindow.xaml"> |
|
6 |
<Application.Resources> |
|
7 |
|
|
8 |
</Application.Resources> |
|
1 |
<Application |
|
2 |
x:Class="UploadTest.App" |
|
3 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
4 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
5 |
xmlns:local="clr-namespace:UploadTest" |
|
6 |
StartupUri="MainWindow.xaml"> |
|
7 |
<Application.Resources /> |
|
9 | 8 |
</Application> |
FinalService/KCOM_FinalService/UploadTest/MainWindow.xaml.cs | ||
---|---|---|
32 | 32 |
{ |
33 | 33 |
try |
34 | 34 |
{ |
35 |
UploadCall2(); |
|
35 |
//UploadCall2();
|
|
36 | 36 |
UploadCall(); |
37 | 37 |
} |
38 | 38 |
catch (Exception ex) |
FinalService/KCOM_FinalService/UploadTest/UploadTest.csproj | ||
---|---|---|
16 | 16 |
<Deterministic>true</Deterministic> |
17 | 17 |
</PropertyGroup> |
18 | 18 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
19 |
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
19 |
<PlatformTarget>x64</PlatformTarget>
|
|
20 | 20 |
<DebugSymbols>true</DebugSymbols> |
21 | 21 |
<DebugType>full</DebugType> |
22 | 22 |
<Optimize>false</Optimize> |
... | ... | |
24 | 24 |
<DefineConstants>DEBUG;TRACE</DefineConstants> |
25 | 25 |
<ErrorReport>prompt</ErrorReport> |
26 | 26 |
<WarningLevel>4</WarningLevel> |
27 |
<Prefer32Bit>false</Prefer32Bit> |
|
27 | 28 |
</PropertyGroup> |
28 | 29 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
29 | 30 |
<PlatformTarget>AnyCPU</PlatformTarget> |
... | ... | |
88 | 89 |
<Generator>ResXFileCodeGenerator</Generator> |
89 | 90 |
<LastGenOutput>Resources.Designer.cs</LastGenOutput> |
90 | 91 |
</EmbeddedResource> |
92 |
<None Include="FinalService.ini"> |
|
93 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
|
94 |
</None> |
|
91 | 95 |
<None Include="Properties\Settings.settings"> |
92 | 96 |
<Generator>SettingsSingleFileGenerator</Generator> |
93 | 97 |
<LastGenOutput>Settings.Designer.cs</LastGenOutput> |
... | ... | |
101 | 105 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project> |
102 | 106 |
<Name>KCOMDataModel</Name> |
103 | 107 |
</ProjectReference> |
104 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
|
105 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project> |
|
106 |
<Name>MarkupToPDF</Name> |
|
107 |
</ProjectReference> |
|
108 |
<ProjectReference Include="..\UploadFinal\UploadFinal_Daelim.csproj"> |
|
109 |
<Project>{9cf3737a-e04d-4a55-924e-c88725dfbec7}</Project> |
|
110 |
<Name>UploadFinal_Daelim</Name> |
|
108 |
<ProjectReference Include="..\Upload\UploadFinal_DIG\UploadFinal_DIG.csproj"> |
|
109 |
<Project>{70b9ff4a-8848-4284-9183-13c9f3acdfe5}</Project> |
|
110 |
<Name>UploadFinal_DIG</Name> |
|
111 | 111 |
</ProjectReference> |
112 | 112 |
</ItemGroup> |
113 | 113 |
<ItemGroup> |
ImageComparer/ComparerTestWPF/ComparerTestWPF.csproj | ||
---|---|---|
42 | 42 |
<ErrorReport>prompt</ErrorReport> |
43 | 43 |
<WarningLevel>4</WarningLevel> |
44 | 44 |
<Prefer32Bit>false</Prefer32Bit> |
45 |
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
45 | 46 |
</PropertyGroup> |
46 | 47 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
47 | 48 |
<PlatformTarget>AnyCPU</PlatformTarget> |
ImageComparer/ComparerTestWPF/MainWindow.xaml.cs | ||
---|---|---|
61 | 61 |
|
62 | 62 |
using (Markus.Image.ImageCompare imageCompare = new Markus.Image.ImageCompare()) |
63 | 63 |
{ |
64 |
var original = new System.Drawing.Bitmap(TxtOriginalImage.Text); |
|
65 |
var target = new System.Drawing.Bitmap(TxtTargetImage.Text); |
|
64 |
var original = new System.Drawing.Bitmap(TxtOriginalImage.Text,true);
|
|
65 |
var target = new System.Drawing.Bitmap(TxtTargetImage.Text, true);
|
|
66 | 66 |
|
67 | 67 |
var result = imageCompare.CompareDrawRects(original, target, new System.Drawing.Size(20, 20)); |
68 | 68 |
|
... | ... | |
77 | 77 |
target.Dispose(); |
78 | 78 |
} |
79 | 79 |
|
80 |
if (bitmapSource != null) |
|
81 |
{ |
|
82 |
ImageView imageView = new ImageView(bitmapSource); |
|
80 | 83 |
|
81 |
ImageView imageView = new ImageView(bitmapSource); |
|
82 |
|
|
83 |
imageView.Show(); |
|
84 |
imageView.Show(); |
|
85 |
} |
|
86 |
else |
|
87 |
{ |
|
88 |
MessageBox.Show("bitmapSource is null"); |
|
89 |
} |
|
84 | 90 |
|
85 | 91 |
|
86 | 92 |
//ImageView imageView2 = new ImageView(TargetSource); |
... | ... | |
130 | 136 |
private async void btTaskUri_Click(object sender, RoutedEventArgs e) |
131 | 137 |
{ |
132 | 138 |
BitmapSource bitmapSource = null; |
139 |
//http://10.10.130.12:8977/TileSource/12345_Tile/24771794/2477179440/1.png |
|
140 |
//http://10.10.130.12:8977/TileSource/12345_Tile/24771794/2477179438/1.png |
|
141 |
|
|
142 |
|
|
143 |
|
|
144 |
|
|
133 | 145 |
|
134 | 146 |
using (Markus.Image.ImageCompare imageComparer = new Markus.Image.ImageCompare()) |
135 | 147 |
{ |
136 |
var result = await imageComparer.CompareDrawRectsAsync("http://10.11.252.3/TileSource/LPG_Tile/215/21544/9.png" |
|
137 |
, "http://10.11.252.3/TileSource/LPG_Tile/211/21107/9.png", new System.Drawing.Size(20, 20)); |
|
148 |
var rects = imageComparer.CompareReturnRects(TxtOriginalImage.Text, TxtTargetImage.Text, new System.Drawing.Size(20, 20)); |
|
149 |
|
|
150 |
MessageBox.Show(rects.Count().ToString()); |
|
151 |
|
|
152 |
var result = await imageComparer.CompareDrawRectsAsync(TxtOriginalImage.Text |
|
153 |
, TxtTargetImage.Text, new System.Drawing.Size(20, 20)); |
|
138 | 154 |
|
139 | 155 |
bitmapSource = result; |
140 | 156 |
|
ImageComparer/Markus.ImageCompare/ImageCompare.cs | ||
---|---|---|
23 | 23 |
|
24 | 24 |
if (rects.Count != 0) |
25 | 25 |
{ |
26 |
if(Originalbitmap.PixelFormat == PixelFormat.Format8bppIndexed) |
|
27 |
{ |
|
28 |
Originalbitmap = ChangeBitmapFormatAndSize(Originalbitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb); |
|
29 |
//Originalbitmap = To24Bpp(Originalbitmap, Originalbitmap.Size); |
|
30 |
} |
|
31 |
|
|
26 | 32 |
using (Graphics g = Graphics.FromImage(Originalbitmap)) |
27 | 33 |
{ |
28 | 34 |
var rect = rects.Select(x => new System.Drawing.Rectangle((int)x.X, (int)x.Y, (int)x.Width, (int)x.Height)).ToList(); |
... | ... | |
103 | 109 |
List<System.Windows.Rect> rects = new List<System.Windows.Rect>(); |
104 | 110 |
|
105 | 111 |
var data = MathchesImageData(Originalbitmap, TargatBitmap); |
106 |
|
|
112 |
//OpenCvSharp.Cv2.ImShow("Result data : ", data); |
|
107 | 113 |
result = GetMatchPixels(data, ResultRectSize); |
108 | 114 |
|
109 | 115 |
//if (rects.Count() > 0) |
... | ... | |
141 | 147 |
|
142 | 148 |
if (rects.Count != 0) |
143 | 149 |
{ |
150 |
if (cloneOriginal.PixelFormat == PixelFormat.Format8bppIndexed) |
|
151 |
{ |
|
152 |
cloneOriginal = ChangeBitmapFormatAndSize(cloneOriginal, cloneOriginal.Size, PixelFormat.Format24bppRgb); |
|
153 |
//cloneOriginal = To24Bpp(cloneOriginal, cloneOriginal.Size); |
|
154 |
} |
|
155 |
|
|
144 | 156 |
using (Graphics g = Graphics.FromImage(cloneOriginal)) |
145 | 157 |
{ |
146 | 158 |
|
ImageComparer/Markus.ImageCompare/ImageCompareBase.cs | ||
---|---|---|
1 | 1 |
using OpenCvSharp; |
2 |
using OpenCvSharp.Extensions; |
|
2 | 3 |
using System; |
3 | 4 |
using System.Collections.Generic; |
4 | 5 |
using System.Drawing; |
... | ... | |
8 | 9 |
using System.Net; |
9 | 10 |
using System.Runtime.InteropServices; |
10 | 11 |
using System.Text; |
12 |
using System.Threading; |
|
11 | 13 |
using System.Threading.Tasks; |
14 |
using static System.Net.Mime.MediaTypeNames; |
|
12 | 15 |
using Point = System.Drawing.Point; |
13 | 16 |
using Size = System.Drawing.Size; |
14 | 17 |
|
... | ... | |
46 | 49 |
{ |
47 | 50 |
SetStatus("Image Load", 0, CompareStatus.Loading); |
48 | 51 |
|
52 |
//Originalbitmap = To24Bpp(Originalbitmap, Originalbitmap.Size); |
|
53 |
//TargatBitmap = To24Bpp(TargatBitmap, Originalbitmap.Size); |
|
54 |
|
|
49 | 55 |
Originalbitmap = ChangeBitmapFormatAndSize(Originalbitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb); |
50 | 56 |
TargatBitmap = ChangeBitmapFormatAndSize(TargatBitmap, Originalbitmap.Size, PixelFormat.Format24bppRgb); |
51 | 57 |
|
52 | 58 |
// 원본이미지의 크키와 Format24bppRgb로 타켓 이미지를 변경 |
53 | 59 |
// 크기가 틀린 경우 비교시 바이트배열 오류 발생 |
60 |
|
|
54 | 61 |
OriginalImageData = OpenCvSharp.Extensions.BitmapConverter.ToMat(Originalbitmap); |
55 | 62 |
TargatImageData = OpenCvSharp.Extensions.BitmapConverter.ToMat(TargatBitmap); |
63 |
var grayOriginal = new OpenCvSharp.Mat(); |
|
64 |
var grayTargat = new OpenCvSharp.Mat(); |
|
56 | 65 |
|
57 | 66 |
if (OriginalImageData.Size() != TargatImageData.Size()) |
58 | 67 |
{ |
59 | 68 |
Cv2.Resize(TargatImageData, TargatImageData, OriginalImageData.Size()); |
60 | 69 |
} |
61 |
|
|
62 |
Cv2.CvtColor(OriginalImageData, OriginalImageData, ColorConversionCodes.BGR2GRAY); |
|
63 |
Cv2.CvtColor(TargatImageData, TargatImageData, ColorConversionCodes.BGR2GRAY); |
|
70 |
|
|
71 |
Cv2.CvtColor(OriginalImageData, grayOriginal, ColorConversionCodes.BGR2GRAY); |
|
72 |
Cv2.CvtColor(TargatImageData, grayTargat, ColorConversionCodes.BGR2GRAY); |
|
73 |
//Cv2.ImShow("grayOriginal", grayOriginal); |
|
74 |
//Cv2.ImShow("grayTargat", grayTargat); |
|
64 | 75 |
|
65 |
Mat outputData = new Mat(TargatImageData.Size(), MatType.CV_8UC1);
|
|
76 |
Mat outputData = new Mat(grayTargat.Size(), MatType.CV_8UC1);
|
|
66 | 77 |
|
67 |
Cv2.Absdiff(OriginalImageData, TargatImageData, outputData);
|
|
78 |
Cv2.Absdiff(grayOriginal, grayTargat, outputData);
|
|
68 | 79 |
|
69 | 80 |
// 틀린부분을 반환 |
70 | 81 |
Cv2.BitwiseNot(outputData, result); |
82 |
//Cv2.ImShow("result", result); |
|
71 | 83 |
} |
72 | 84 |
catch (Exception ex) |
73 | 85 |
{ |
... | ... | |
80 | 92 |
return result; |
81 | 93 |
} |
82 | 94 |
|
83 |
protected System.Drawing.Bitmap ChangeBitmapFormatAndSize(System.Drawing.Bitmap bitmap, Size newSize, PixelFormat pixelFormat)
|
|
95 |
public System.Drawing.Bitmap ChangeBitmapFormatAndSize(System.Drawing.Bitmap bitmap, Size newSize, PixelFormat pixelFormat)
|
|
84 | 96 |
{ |
85 |
Bitmap result = bitmap; |
|
86 |
|
|
87 |
if (pixelFormat != bitmap.PixelFormat) |
|
88 |
{ |
|
89 |
Point originPoint = new Point(0, 0); |
|
90 |
Rectangle rect = new Rectangle(originPoint, bitmap.Size); |
|
91 |
result = bitmap.Clone(rect, pixelFormat); |
|
92 |
} |
|
93 |
|
|
94 |
if (bitmap.Size != newSize) |
|
95 |
{ |
|
96 |
result = new Bitmap(newSize.Width, newSize.Height); |
|
97 |
|
|
98 |
using (Graphics g = Graphics.FromImage(result)) |
|
99 |
{ |
|
100 |
g.DrawImage(bitmap, 0, 0, newSize.Width, newSize.Height); |
|
101 |
g.Dispose(); |
|
102 |
} |
|
103 |
} |
|
97 |
Bitmap result; |
|
98 |
|
|
99 |
result = new Bitmap(newSize.Width, newSize.Height, pixelFormat); |
|
100 |
Graphics g = Graphics.FromImage(result); |
|
101 |
g.DrawImage(bitmap, new Rectangle(0, 0, newSize.Width, newSize.Height), 0, 0, newSize.Width, newSize.Height, GraphicsUnit.Pixel); |
|
102 |
//g.DrawImage(bitmap, 0, 0, newSize.Width, newSize.Height); |
|
103 |
g.Save(); |
|
104 |
g.Dispose(); |
|
104 | 105 |
|
105 | 106 |
return result; |
106 | 107 |
} |
... | ... | |
130 | 131 |
|
131 | 132 |
OpenCvSharp.Point testpoint = new OpenCvSharp.Point(); |
132 | 133 |
|
133 |
Cv2.Threshold(data, data, 0, 30,ThresholdTypes.BinaryInv);
|
|
134 |
Cv2.Threshold(data, data, 0, 255, ThresholdTypes.Binary | ThresholdTypes.Otsu);
|
|
134 | 135 |
|
135 | 136 |
Cv2.FindContours(data, out contours, out hierarchy,RetrievalModes.List,ContourApproximationModes.ApproxNone, testpoint); |
136 | 137 |
|
137 | 138 |
SetStatus("Comparison", 0, CompareStatus.Comparison); |
138 | 139 |
contoursLongCount = contours.Sum(x => x.Count()); |
139 |
|
|
140 |
|
|
140 | 141 |
var rects = contours.AsParallel() |
141 | 142 |
.Select(points => GetRectList(points, block)) |
142 | 143 |
.SelectMany(x => x); |
143 | 144 |
|
144 | 145 |
results.AddRange(rects); |
145 |
|
|
146 |
|
|
147 |
System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks)); |
|
148 |
|
|
146 | 149 |
return results; |
147 | 150 |
} |
151 |
private List<System.Windows.Rect> GetRectList(OpenCvSharp.Point[] points, Size block) |
|
152 |
{ |
|
153 |
List<System.Windows.Rect> result = new List<System.Windows.Rect>(); |
|
154 |
|
|
155 |
Parallel.ForEach(points, point => |
|
156 |
{ |
|
157 |
var rect = new System.Windows.Rect |
|
158 |
{ |
|
159 |
X = point.X - block.Width / 2, |
|
160 |
Y = point.Y - block.Height / 2, |
|
161 |
Width = block.Width, |
|
162 |
Height = block.Height |
|
163 |
}; |
|
164 |
|
|
165 |
lock (result) |
|
166 |
{ |
|
167 |
if (!result.Any(r => r.IntersectsWith(rect))) |
|
168 |
{ |
|
169 |
result.Add(rect); |
|
170 |
} |
|
171 |
} |
|
172 |
|
|
173 |
//ComparisonCount++; |
|
174 |
|
|
175 |
//Interlocked.Increment(ref ComparisonCount); |
|
176 |
|
|
177 |
//SetStatus("Comparison", ComparisonCount / contoursLongCount * 100, CompareStatus.Comparison); |
|
178 |
}); |
|
179 |
|
|
180 |
return result; |
|
181 |
} |
|
148 | 182 |
|
149 |
private List<System.Windows.Rect> GetRectList(OpenCvSharp.Point[] points,Size block) |
|
183 |
private List<System.Windows.Rect> GetRectList_old(OpenCvSharp.Point[] points,Size block)
|
|
150 | 184 |
{ |
151 | 185 |
List<System.Windows.Rect> result = new List<System.Windows.Rect>(); |
152 | 186 |
|
... | ... | |
167 | 201 |
|
168 | 202 |
ComparisonCount++; |
169 | 203 |
|
170 |
SetStatus("Comparison", ComparisonCount/contoursLongCount*100, CompareStatus.Comparison); |
|
204 |
//SetStatus("Comparison", ComparisonCount/contoursLongCount*100, CompareStatus.Comparison);
|
|
171 | 205 |
} |
172 | 206 |
|
173 | 207 |
return result; |
ImageComparer/Markus.ImageCompare/Markus.ImageCompare.csproj | ||
---|---|---|
25 | 25 |
<ErrorReport>prompt</ErrorReport> |
26 | 26 |
<WarningLevel>4</WarningLevel> |
27 | 27 |
<PlatformTarget>x64</PlatformTarget> |
28 |
<AllowUnsafeBlocks>false</AllowUnsafeBlocks> |
|
28 | 29 |
</PropertyGroup> |
29 | 30 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
30 | 31 |
<DebugType>pdbonly</DebugType> |
31 | 32 |
<Optimize>true</Optimize> |
32 |
<OutputPath>bin\Release\</OutputPath>
|
|
33 |
<OutputPath>..\Release\</OutputPath>
|
|
33 | 34 |
<DefineConstants>TRACE</DefineConstants> |
34 | 35 |
<ErrorReport>prompt</ErrorReport> |
35 | 36 |
<WarningLevel>4</WarningLevel> |
ImageComparer/Markus.ImageCompare/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("1.8.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.8.1.0")] |
KCOM.sln | ||
---|---|---|
39 | 39 |
INI\MARKUS_BSENG.ini = INI\MARKUS_BSENG.ini |
40 | 40 |
INI\MARKUS_DAELIM.ini = INI\MARKUS_DAELIM.ini |
41 | 41 |
INI\MARKUS_DAELIM_REMOTE.ini = INI\MARKUS_DAELIM_REMOTE.ini |
42 |
INI\MARKUS_DIG.ini = INI\MARKUS_DIG.ini |
|
42 | 43 |
INI\MARKUS_DIG_DEBUG.ini = INI\MARKUS_DIG_DEBUG.ini |
43 | 44 |
INI\MARKUS_Doftech.ini = INI\MARKUS_Doftech.ini |
44 | 45 |
INI\MARKUS_Doftech_Remote.ini = INI\MARKUS_Doftech_Remote.ini |
... | ... | |
97 | 98 |
appCast_Daelim.bat = appCast_Daelim.bat |
98 | 99 |
appCast_Daelim_test.bat = appCast_Daelim_test.bat |
99 | 100 |
appCast_DIG.bat = appCast_DIG.bat |
101 |
appCast_DIG_DEBUG.bat = appCast_DIG_DEBUG.bat |
|
100 | 102 |
appCast_doftech.bat = appCast_doftech.bat |
101 | 103 |
appCast_HS.bat = appCast_HS.bat |
102 | 104 |
appCast_SNI.bat = appCast_SNI.bat |
... | ... | |
533 | 535 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DevDoftech|x86.Build.0 = Debug_DevDoftech|x86 |
534 | 536 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|Any CPU.ActiveCfg = Debug|Any CPU |
535 | 537 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|Any CPU.Build.0 = Debug|Any CPU |
536 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x64.ActiveCfg = Debug|x64 |
|
537 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x64.Build.0 = Debug|x64 |
|
538 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x64.ActiveCfg = Debug_DIG|x64
|
|
539 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x64.Build.0 = Debug_DIG|x64
|
|
538 | 540 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x86.ActiveCfg = Debug|x86 |
539 | 541 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_DIG|x86.Build.0 = Debug|x86 |
540 | 542 |
{F026B592-11B9-410C-B4FF-384E511A4666}.Debug_HyoSung|Any CPU.ActiveCfg = Debug_HyoSung|Any CPU |
KCOM/Events/Event_KeyEvent.cs | ||
---|---|---|
2 | 2 |
using KCOM.Events; |
3 | 3 |
using MarkupToPDF.Common; |
4 | 4 |
using MarkupToPDF.Controls.Parsing; |
5 |
using MarkupToPDF.Controls.Text; |
|
5 | 6 |
using System; |
6 | 7 |
using System.Collections.Generic; |
7 | 8 |
using System.ComponentModel; |
... | ... | |
125 | 126 |
{ |
126 | 127 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission)) |
127 | 128 |
{ |
128 |
//컨트롤을 그리는 도중일 경우 컨트롤 삭제 |
|
129 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
|
129 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).IsEditingMode == true).FirstOrDefault(); |
|
130 |
if (text_item_ != null) |
|
131 |
{ |
|
132 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
|
133 |
(text_item_ as TextControl).Base_TextBox.Visibility = Visibility.Collapsed; |
|
134 |
(text_item_ as TextControl).UnEditingMode(); |
|
135 |
|
|
136 |
SelectionSet.Instance.UnSelect(ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
137 |
} |
|
138 |
|
|
139 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode == true).FirstOrDefault(); |
|
140 |
if (Arrowtext_item_ != null && ((Arrowtext_item_ as ArrowTextControl).IsNew == false)) |
|
141 |
{ |
|
142 |
(Arrowtext_item_ as ArrowTextControl).IsEditingMode = false; |
|
143 |
(Arrowtext_item_ as ArrowTextControl).Base_TextBox.Focusable = false; |
|
144 |
(Arrowtext_item_ as ArrowTextControl).UnEditingMode(); |
|
145 |
|
|
146 |
SelectionSet.Instance.UnSelect(ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
147 |
} |
|
148 |
|
|
149 |
if (text_item_ == null && Arrowtext_item_ == null) |
|
150 |
{ //컨트롤을 그리는 도중일 경우 컨트롤 삭제 |
|
151 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
|
152 |
} |
|
153 |
|
|
130 | 154 |
this.dzMainMenu.currentControl = null; |
131 | 155 |
|
132 | 156 |
//this.dzTopMenu.SaveEvent(null, null); |
KCOM/KCOM.csproj | ||
---|---|---|
572 | 572 |
<Compile Include="Behaviors\WindowBehavior.cs" /> |
573 | 573 |
<Compile Include="Common\Converter\ColorListToBrushConverter.cs" /> |
574 | 574 |
<Compile Include="Common\Converter\StringToColorConverter.cs" /> |
575 |
<Compile Include="Common\Converter\NullToCollapsedConverter.cs" /> |
|
575 | 576 |
<Compile Include="Common\Converter\ZeroToCollapsedConverter.cs" /> |
576 | 577 |
<Compile Include="Common\DataSaveTask.cs" /> |
577 | 578 |
<Compile Include="Common\Check_Inferface.cs" /> |
... | ... | |
1536 | 1537 |
|
1537 | 1538 |
rem call "appCast_Daelim.bat" "@(VersionNumber)" |
1538 | 1539 |
call "appCast_DIG.bat" "@(VersionNumber)" |
1540 |
rem call "appCast_DIG_DEBUG.bat" "@(VersionNumber)" |
|
1539 | 1541 |
rem call "appCast_SNI_SDMS.bat" "@(VersionNumber)" |
1540 | 1542 |
rem call "appCast_SNI_XICNA.bat" "@(VersionNumber)" |
1541 | 1543 |
rem call "appCast_doftech.bat" "@(VersionNumber)" |
KCOM/KCOM.csproj.user | ||
---|---|---|
117 | 117 |
</PropertyGroup> |
118 | 118 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_DIG|x64'"> |
119 | 119 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
120 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjM1MjgwODY5NDQiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
|
|
120 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjI0NzcxNzk0NDAiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjEyMzQ1IiwiVXNlcklEIjoiMDAwMDBfMTAwMDAwMDA0In0=</StartArguments>
|
|
121 | 121 |
</PropertyGroup> |
122 | 122 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_DIG|x86'"> |
123 | 123 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
KCOM/MARKUS.ini | ||
---|---|---|
1 |
#DIG Project DEBUG |
|
2 |
|
|
3 | 1 |
[Internal] |
4 |
IP=192.168.0.67:8977
|
|
2 |
IP=localhost
|
|
5 | 3 |
[External] |
6 |
IP=192.168.0.67:8977
|
|
4 |
IP=125.129.196.207
|
|
7 | 5 |
[BaseClientAddress] |
8 |
URL=http://192.168.0.67:8977
|
|
6 |
URL=http://localhost:44301
|
|
9 | 7 |
[HubAddress] |
10 |
URL=http://192.168.0.67:8977/
|
|
8 |
URL=http://192.168.0.67:5100/
|
|
11 | 9 |
[UpdateVer64] |
12 |
URL=http://192.168.0.67:8977/TileSource/Version/version_x64.xml
|
|
10 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml
|
|
13 | 11 |
[UpdateVer86] |
14 |
URL=http://192.168.0.67:8977/TileSource/Version/version_x86.xml
|
|
12 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml
|
|
15 | 13 |
[excelFilePath] |
16 |
URL=http://192.168.0.67:8977/TileSource/Check_Test/CheckList_T.xlsx
|
|
14 |
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx
|
|
17 | 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
18 |
URL=http://192.168.0.67:8977/Get_FInalImage/Get_PdfImage.asmx
|
|
16 |
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
|
|
19 | 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
20 |
URL=http://192.168.0.67:8977/ImageUpload/FileUpload.asmx
|
|
18 |
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
|
|
21 | 19 |
[mainServerImageWebPath] |
22 |
URL=http://192.168.0.67:8977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
20 |
URL=http://10.10.130.12:8977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
23 | 21 |
[subServerImageWebPath] |
24 |
URL=http://192.168.0.67:8977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
22 |
URL=http://10.10.130.12:8977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
25 | 23 |
[Debug_BaseClientAddress] |
26 |
URL=http://192.168.0.67:8977
|
|
24 |
URL=http://192.168.0.67:5979
|
|
27 | 25 |
[HOST_DOMAIN] |
28 | 26 |
DOMAIN= |
29 | 27 |
[GetConversionStateFailed] |
... | ... | |
38 | 36 |
NAME=DAELIM |
39 | 37 |
[PortForwarding] |
40 | 38 |
HUB=5100:5100 |
41 |
RESOURCE=8977:8977
|
|
39 |
RESOURCE=5977:5977
|
|
42 | 40 |
BASE=5979:5979 |
43 | 41 |
[GetImageResourceFailed] |
44 | 42 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
43 |
|
|
44 |
|
|
45 |
[COMMON] |
|
46 |
IsDocumentHistory = false |
KCOM/Properties/AssemblyInfo.cs | ||
---|---|---|
51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
52 | 52 |
// 지정되도록 할 수 있습니다. |
53 | 53 |
// [assembly: AssemblyVersion("1.0.*")] |
54 |
[assembly: AssemblyVersion("5.4.1.0")]
|
|
55 |
[assembly: AssemblyFileVersion("5.4.1.0")]
|
|
54 |
[assembly: AssemblyVersion("5.4.3.0")]
|
|
55 |
[assembly: AssemblyFileVersion("5.4.3.0")]
|
|
56 | 56 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
KCOM/Services/BaseServices.cs | ||
---|---|---|
199 | 199 |
} |
200 | 200 |
else |
201 | 201 |
{ |
202 |
|
|
202 |
item.TO_VENDOR = HttpUtility.UrlDecode(item.TO_VENDOR); |
|
203 | 203 |
item.FROM_VENDOR = HttpUtility.UrlDecode(item.FROM_VENDOR); |
204 |
item.EnsembleLink = HttpUtility.UrlDecode(item.EnsembleLink); |
|
204 | 205 |
} |
205 | 206 |
} |
206 | 207 |
|
KCOM/Views/MainMenu.xaml | ||
---|---|---|
58 | 58 |
</Setter> |
59 | 59 |
</Style> |
60 | 60 |
<converter:PDFVisibleConverter x:Key="PDFVisibleConverter" /> |
61 |
<converter:NullToCollapsedConverter x:Key="NullToCollapsedConverter" /> |
|
61 | 62 |
<converter:ConsolidationBackgroudConverter x:Key="ConsolidationBackgroudConverter" /> |
62 | 63 |
<converter:StringToColorBrushConverter x:Key="StringToColorBrushConverter" /> |
63 | 64 |
<converter:StringToColorConverter x:Key="StringToColorConverter" /> |
... | ... | |
1570 | 1571 |
MouseLeftButtonDown="PdfLink_ButtonDown" |
1571 | 1572 |
Source="/KCOM;component/Resources/Images/MenuImage_New/PDF.png" |
1572 | 1573 |
Tag="{Binding FROM_VENDOR}" |
1573 |
Visibility="{Binding FROM_VENDOR, Converter={StaticResource PDFVisibleConverter}}" />
|
|
1574 |
Visibility="{Binding FROM_VENDOR, Converter={StaticResource NullToCollapsedConverter}}" />
|
|
1574 | 1575 |
</DataTemplate> |
1575 | 1576 |
</telerik:GridViewDataColumn.CellTemplate> |
1576 | 1577 |
</telerik:GridViewDataColumn> |
... | ... | |
1589 | 1590 |
MouseLeftButtonDown="PdfLink_ButtonDown" |
1590 | 1591 |
Source="/KCOM;component/Resources/Images/MenuImage_New/PDF.png" |
1591 | 1592 |
Tag="{Binding TO_VENDOR}" |
1592 |
Visibility="{Binding TO_VENDOR, Converter={StaticResource PDFVisibleConverter}}" />
|
|
1593 |
Visibility="{Binding TO_VENDOR, Converter={StaticResource NullToCollapsedConverter}}" />
|
|
1593 | 1594 |
</DataTemplate> |
1594 | 1595 |
</telerik:GridViewDataColumn.CellTemplate> |
1595 | 1596 |
</telerik:GridViewDataColumn> |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
272 | 272 |
|
273 | 273 |
private List<TempDt> tempDtList = new List<TempDt>(); |
274 | 274 |
|
275 |
private void SetCursor()
|
|
275 |
public void SetCursor()
|
|
276 | 276 |
{ |
277 | 277 |
this.Cursor = cursor; |
278 | 278 |
} |
... | ... | |
1471 | 1471 |
|
1472 | 1472 |
#endregion ZoomIn & ZoomOut |
1473 | 1473 |
|
1474 |
private void init()
|
|
1474 |
public void init()
|
|
1475 | 1475 |
{ |
1476 | 1476 |
foreach (var item in ViewerDataModel.Instance.MarkupControls) |
1477 | 1477 |
{ |
... | ... | |
4719 | 4719 |
gridViewMarkup.Select(consolidateItem); |
4720 | 4720 |
} |
4721 | 4721 |
} |
4722 |
//}
|
|
4723 |
//else
|
|
4724 |
//{
|
|
4725 |
// MessageBox.Show("오류");
|
|
4726 |
//}
|
|
4722 |
else
|
|
4723 |
{
|
|
4724 |
btnFinalPDF.IsEnabled = true;
|
|
4725 |
btnConsolidate.IsEnabled = true;
|
|
4726 |
} |
|
4727 | 4727 |
} |
4728 | 4728 |
|
4729 | 4729 |
/// <summary> |
KCOM/Views/TopMenu.xaml | ||
---|---|---|
1 |
<UserControl xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" x:Class="KCOM.Views.TopMenu" |
|
2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:common="clr-namespace:KCOM.Common" |
|
4 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
|
5 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|
6 |
xmlns:fonts="clr-namespace:Markus.Fonts;assembly=Markus.Fonts" |
|
7 |
xmlns:local="clr-namespace:KCOM.Views" |
|
8 |
mc:Ignorable="d" |
|
9 |
d:DesignHeight="250" d:DesignWidth="1600"> |
|
10 |
<!--d:DesignHeight="250" d:DesignWidth="1600">--> |
|
1 |
<UserControl |
|
2 |
x:Class="KCOM.Views.TopMenu" |
|
3 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
4 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
5 |
xmlns:common="clr-namespace:KCOM.Common" |
|
6 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|
7 |
xmlns:fonts="clr-namespace:Markus.Fonts;assembly=Markus.Fonts" |
|
8 |
xmlns:local="clr-namespace:KCOM.Views" |
|
9 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
|
10 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
|
11 |
d:DesignHeight="250" |
|
12 |
d:DesignWidth="1600" |
|
13 |
mc:Ignorable="d"> |
|
14 |
<!-- d:DesignHeight="250" d:DesignWidth="1600"> --> |
|
11 | 15 |
<UserControl.Resources> |
12 | 16 |
<Style TargetType="telerik:RadToggleButton"> |
13 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013"/> |
|
14 |
<Setter Property="BorderThickness" Value="0"/> |
|
15 |
<Setter Property="Background" Value="Transparent"/> |
|
17 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
|
|
18 |
<Setter Property="BorderThickness" Value="0" />
|
|
19 |
<Setter Property="Background" Value="Transparent" />
|
|
16 | 20 |
</Style> |
17 | 21 |
<Style TargetType="telerik:RadRibbonComboBox"> |
18 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013"/> |
|
22 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
|
|
19 | 23 |
</Style> |
20 | 24 |
<Style TargetType="telerik:RadRibbonButton"> |
21 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013"/> |
|
25 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
|
|
22 | 26 |
</Style> |
23 | 27 |
<Style TargetType="telerik:RadRibbonToggleButton"> |
24 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013"/> |
|
28 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
|
|
25 | 29 |
</Style> |
26 | 30 |
</UserControl.Resources> |
27 | 31 |
<Grid> |
28 |
<telerik:RadRibbonView Title="KCOM" ApplicationName="세부 내용 입력란" TitleBarVisibility="Collapsed" VerticalAlignment="Top" telerik:StyleManager.Theme="Office2016" |
|
29 |
ApplicationButtonVisibility="Collapsed" BorderThickness="0.5" SelectedIndex="1" |
|
30 |
x:Name="radRibbonView" MaxHeight="Infinity" IsApplicationMenuOpen="False" IsBackstageOpen="False" IsMinimizable="True" IsMinimized="False" |
|
31 |
QuickAccessToolBarPosition="AboveRibbon" MinimizeButtonVisibility="Visible"> |
|
32 |
<telerik:RadRibbonView |
|
33 |
x:Name="radRibbonView" |
|
34 |
Title="KCOM" |
|
35 |
MaxHeight="Infinity" |
|
36 |
VerticalAlignment="Top" |
|
37 |
telerik:StyleManager.Theme="Office2016" |
|
38 |
ApplicationButtonVisibility="Collapsed" |
|
39 |
ApplicationName="세부 내용 입력란" |
|
40 |
BorderThickness="0.5" |
|
41 |
IsApplicationMenuOpen="False" |
|
42 |
IsBackstageOpen="False" |
|
43 |
IsMinimizable="True" |
|
44 |
IsMinimized="False" |
|
45 |
MinimizeButtonVisibility="Visible" |
|
46 |
QuickAccessToolBarPosition="AboveRibbon" |
|
47 |
SelectedIndex="1" |
|
48 |
TitleBarVisibility="Collapsed"> |
|
32 | 49 |
<!--<telerik:RadRibbonView.QuickAccessToolBar> |
33 | 50 |
<telerik:QuickAccessToolBar telerik:StyleManager.Theme="Office2016"> |
34 | 51 |
<telerik:QuickAccessToolBar> |
... | ... | |
45 | 62 |
</telerik:QuickAccessToolBar> |
46 | 63 |
</telerik:RadRibbonView.QuickAccessToolBar>--> |
47 | 64 |
<telerik:RadRibbonView.BorderBrush> |
48 |
<SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ActiveBorderColorKey}}"/> |
|
65 |
<SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ActiveBorderColorKey}}" />
|
|
49 | 66 |
</telerik:RadRibbonView.BorderBrush> |
50 |
|
|
51 |
<telerik:RadRibbonTab Header="HOME" Visibility="Visible"> |
|
52 |
<telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed" |
|
53 |
telerik:ScreenTip.Description="Show the File Task options." |
|
54 |
telerik:ScreenTip.Title="File" |
|
55 |
Visibility="Visible"> |
|
67 |
|
|
68 |
<telerik:RadRibbonTab Header="HOME" Visibility="Visible"> |
|
69 |
<telerik:RadRibbonGroup |
|
70 |
telerik:ScreenTip.Description="Show the File Task options." |
|
71 |
telerik:ScreenTip.Title="File" |
|
72 |
DialogLauncherVisibility="Collapsed" |
|
73 |
Visibility="Visible"> |
|
56 | 74 |
<telerik:RadOrderedWrapPanel> |
57 | 75 |
<StackPanel Orientation="Horizontal"> |
58 |
<telerik:RadRibbonButton Content="Print" Size="Large" LargeImage="/KCOM;component/Resources/Images/MenuImage_new/printer.png" Click="PrintEvent"/> |
|
59 |
<telerik:RadRibbonButton Content="Export" Size="Large" LargeImage="/KCOM;component/Resources/Images/MenuImage_new/topdf.png" Click="PrintEvent"/> |
|
60 |
<telerik:RadRibbonButton Content="SAVE" Size="Large" LargeImage="/KCOM;component/Resources/Images/MenuImage_new/diskette2.png" Click="SaveEventCallback"/> |
|
76 |
<telerik:RadRibbonButton |
|
77 |
Click="PrintEvent" |
|
78 |
Content="Print" |
|
79 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/printer.png" |
|
80 |
Size="Large" /> |
|
81 |
<telerik:RadRibbonButton |
|
82 |
Click="PrintEvent" |
|
83 |
Content="Export" |
|
84 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/topdf.png" |
|
85 |
Size="Large" /> |
|
86 |
<telerik:RadRibbonButton |
|
87 |
Click="SaveEventCallback" |
|
88 |
Content="SAVE" |
|
89 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/diskette2.png" |
|
90 |
Size="Large" /> |
|
61 | 91 |
<Grid Margin="0,-1,0,0"> |
62 | 92 |
<Grid.ColumnDefinitions> |
63 |
<ColumnDefinition/>
|
|
93 |
<ColumnDefinition />
|
|
64 | 94 |
</Grid.ColumnDefinitions> |
65 | 95 |
<Grid.RowDefinitions> |
66 |
<RowDefinition/> |
|
67 |
<RowDefinition/>
|
|
96 |
<RowDefinition />
|
|
97 |
<RowDefinition />
|
|
68 | 98 |
</Grid.RowDefinitions> |
69 |
<CheckBox VerticalAlignment="Center" Grid.Column="0" Grid.Row="0" Margin="10,5,2,0" IsChecked="False" HorizontalAlignment="Left" Content="Auto Save" x:Name="cbAutoSave" Checked="cbAutoSave_Checked" Unchecked="cbAutoSave_Checked" /> |
|
70 |
|
|
71 |
<telerik:RadButtonGroup Margin="10,0,0,0" Height="20" Grid.Column="0" Grid.Row="1" |
|
72 |
BorderThickness="1" |
|
73 |
telerik:StyleManager.Theme="Windows8"> |
|
74 |
<TextBlock Width="40" |
|
75 |
HorizontalAlignment="Center" |
|
76 |
VerticalAlignment="Center" |
|
77 |
FontSize="10" |
|
78 |
Text="Interval" |
|
79 |
TextAlignment="Center" /> |
|
80 |
<telerik:RadNumericUpDown x:Name="cbSaveInterval" |
|
81 |
Width="60" |
|
82 |
Height="20" |
|
83 |
Margin="2" |
|
84 |
HorizontalAlignment="Stretch" |
|
85 |
VerticalAlignment="Center" |
|
86 |
HorizontalContentAlignment="Center" |
|
87 |
Maximum="100" |
|
88 |
Minimum="1" |
|
89 |
NumberDecimalDigits="0" |
|
90 |
telerik:StyleManager.Theme="Windows7" |
|
91 |
ToolTipService.ToolTip="Save Interval Value" |
|
92 |
ValueChanged="cbSaveInterval_ValueChanged" |
|
93 |
Value="{Binding SaveInterval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" |
|
94 |
/> |
|
99 |
<CheckBox |
|
100 |
x:Name="cbAutoSave" |
|
101 |
Grid.Row="0" |
|
102 |
Grid.Column="0" |
|
103 |
Margin="10,5,2,0" |
|
104 |
HorizontalAlignment="Left" |
|
105 |
VerticalAlignment="Center" |
|
106 |
Checked="cbAutoSave_Checked" |
|
107 |
Content="Auto Save" |
|
108 |
IsChecked="False" |
|
109 |
Unchecked="cbAutoSave_Checked" /> |
|
110 |
|
|
111 |
<telerik:RadButtonGroup |
|
112 |
Grid.Row="1" |
|
113 |
Grid.Column="0" |
|
114 |
Height="20" |
|
115 |
Margin="10,0,0,0" |
|
116 |
telerik:StyleManager.Theme="Windows8" |
|
117 |
BorderThickness="1"> |
|
118 |
<TextBlock |
|
119 |
Width="40" |
|
120 |
HorizontalAlignment="Center" |
|
121 |
VerticalAlignment="Center" |
|
122 |
FontSize="10" |
|
123 |
Text="Interval" |
|
124 |
TextAlignment="Center" /> |
|
125 |
<telerik:RadNumericUpDown |
|
126 |
x:Name="cbSaveInterval" |
|
127 |
Width="60" |
|
128 |
Height="20" |
|
129 |
Margin="2" |
|
130 |
HorizontalAlignment="Stretch" |
|
131 |
VerticalAlignment="Center" |
|
132 |
HorizontalContentAlignment="Center" |
|
133 |
telerik:StyleManager.Theme="Windows7" |
|
134 |
Maximum="100" |
|
135 |
Minimum="1" |
|
136 |
NumberDecimalDigits="0" |
|
137 |
ToolTipService.ToolTip="Save Interval Value" |
|
138 |
ValueChanged="cbSaveInterval_ValueChanged" |
|
139 |
Value="{Binding SaveInterval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" /> |
|
95 | 140 |
</telerik:RadButtonGroup> |
96 | 141 |
|
97 | 142 |
</Grid> |
98 |
<!--<telerik:RadRibbonButton Content="GO"
|
|
143 |
<!--<telerik:RadRibbonButton Content="GO" |
|
99 | 144 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/print.png" |
100 | 145 |
Size="Large"/>--> |
101 | 146 |
</StackPanel> |
... | ... | |
128 | 173 |
telerik:ScreenTip.Title="File" |
129 | 174 |
Visibility="Visible"> |
130 | 175 |
<telerik:RadCollapsiblePanel>--> |
131 |
<!--<telerik:RadRibbonButton
|
|
176 |
<!--<telerik:RadRibbonButton |
|
132 | 177 |
CollapseToMedium="WhenGroupIsMedium" |
133 | 178 |
CollapseToSmall="WhenGroupIsSmall" |
134 | 179 |
CommandParameter="Print" |
... | ... | |
137 | 182 |
telerik:ScreenTip.Description="Use basic pen." |
138 | 183 |
telerik:ScreenTip.Title="Free Mark Pen" |
139 | 184 |
Text="From File" />--> |
140 |
<!--<telerik:RadRibbonButton
|
|
185 |
<!--<telerik:RadRibbonButton |
|
141 | 186 |
CollapseToMedium="WhenGroupIsMedium" |
142 | 187 |
CollapseToSmall="WhenGroupIsSmall" |
143 | 188 |
CommandParameter="PDF" |
... | ... | |
146 | 191 |
telerik:ScreenTip.Description="Use basic pen." |
147 | 192 |
telerik:ScreenTip.Title="Free Mark Pen" |
148 | 193 |
Text="Sync" />--> |
149 |
<!--</telerik:RadCollapsiblePanel>
|
|
194 |
<!--</telerik:RadCollapsiblePanel> |
|
150 | 195 |
</telerik:RadRibbonGroup>--> |
151 | 196 |
</telerik:RadRibbonTab> |
152 |
|
|
197 |
|
|
153 | 198 |
<telerik:RadRibbonTab Header="COMMENT"> |
154 | 199 |
|
155 |
<telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed" |
|
156 |
Icon="/KCOM;component/Resources/Images/MenuImage_New/small/control.png" |
|
157 |
Header="CONTROL" |
|
158 |
IsEnabled="True"> |
|
200 |
<telerik:RadRibbonGroup |
|
201 |
DialogLauncherVisibility="Collapsed" |
|
202 |
Header="CONTROL" |
|
203 |
Icon="/KCOM;component/Resources/Images/MenuImage_New/small/control.png" |
|
204 |
IsEnabled="True"> |
|
159 | 205 |
<telerik:RadCollapsiblePanel> |
160 |
<telerik:RadRibbonToggleButton
|
|
161 |
CollapseToMedium="WhenGroupIsMedium"
|
|
162 |
CollapseToSmall="WhenGroupIsSmall"
|
|
163 |
CommandParameter="Undo"
|
|
164 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/undo3.png"
|
|
165 |
Size="Medium"
|
|
166 |
Click="ControlEvent"
|
|
167 |
Tag="Undo"
|
|
168 |
telerik:ScreenTip.Description="Undo the work"
|
|
169 |
telerik:ScreenTip.Title="Undo"
|
|
170 |
Text="Undo" />
|
|
171 |
<telerik:RadRibbonToggleButton
|
|
172 |
CollapseToMedium="WhenGroupIsMedium"
|
|
173 |
CollapseToSmall="WhenGroupIsSmall"
|
|
174 |
CommandParameter="Copy"
|
|
175 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/copy2.png"
|
|
176 |
Size="Medium"
|
|
177 |
Click="ControlEvent"
|
|
178 |
Tag="Copy"
|
|
179 |
telerik:ScreenTip.Description="Copy markup"
|
|
180 |
telerik:ScreenTip.Title="Copy"
|
|
181 |
Text="Copy" />
|
|
182 |
<telerik:RadRibbonToggleButton
|
|
183 |
CollapseToMedium="WhenGroupIsMedium"
|
|
184 |
CollapseToSmall="WhenGroupIsSmall"
|
|
185 |
CommandParameter="Ink"
|
|
186 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/eraser.png"
|
|
187 |
Size="Medium"
|
|
188 |
Click="ControlEvent"
|
|
189 |
Tag="Eraser"
|
|
190 |
telerik:ScreenTip.Description="Delete the Markup"
|
|
191 |
telerik:ScreenTip.Title="Eraser"
|
|
192 |
Text="Eraser" />
|
|
206 |
<telerik:RadRibbonToggleButton |
|
207 |
telerik:ScreenTip.Description="Undo the work"
|
|
208 |
telerik:ScreenTip.Title="Undo"
|
|
209 |
Click="ControlEvent"
|
|
210 |
CollapseToMedium="WhenGroupIsMedium"
|
|
211 |
CollapseToSmall="WhenGroupIsSmall"
|
|
212 |
CommandParameter="Undo"
|
|
213 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/undo3.png"
|
|
214 |
Size="Medium"
|
|
215 |
Tag="Undo"
|
|
216 |
Text="Undo" /> |
|
217 |
<telerik:RadRibbonToggleButton |
|
218 |
telerik:ScreenTip.Description="Copy markup"
|
|
219 |
telerik:ScreenTip.Title="Copy"
|
|
220 |
Click="ControlEvent"
|
|
221 |
CollapseToMedium="WhenGroupIsMedium"
|
|
222 |
CollapseToSmall="WhenGroupIsSmall"
|
|
223 |
CommandParameter="Copy"
|
|
224 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/copy2.png"
|
|
225 |
Size="Medium"
|
|
226 |
Tag="Copy"
|
|
227 |
Text="Copy" /> |
|
228 |
<telerik:RadRibbonToggleButton |
|
229 |
telerik:ScreenTip.Description="Delete the Markup"
|
|
230 |
telerik:ScreenTip.Title="Eraser"
|
|
231 |
Click="ControlEvent"
|
|
232 |
CollapseToMedium="WhenGroupIsMedium"
|
|
233 |
CollapseToSmall="WhenGroupIsSmall"
|
|
234 |
CommandParameter="Ink"
|
|
235 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/eraser.png"
|
|
236 |
Size="Medium"
|
|
237 |
Tag="Eraser"
|
|
238 |
Text="Eraser" /> |
|
193 | 239 |
</telerik:RadCollapsiblePanel> |
194 | 240 |
<telerik:RadCollapsiblePanel> |
195 |
<telerik:RadRibbonToggleButton
|
|
196 |
CollapseToMedium="WhenGroupIsMedium"
|
|
197 |
CollapseToSmall="WhenGroupIsSmall"
|
|
198 |
CommandParameter="Redo"
|
|
199 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/Redo3.png"
|
|
200 |
Size="Medium"
|
|
201 |
Click="ControlEvent"
|
|
202 |
Tag="Redo"
|
|
203 |
telerik:ScreenTip.Description="Undo the work"
|
|
204 |
telerik:ScreenTip.Title="Eraser"
|
|
205 |
Text="Redo" />
|
|
206 |
<telerik:RadRibbonToggleButton
|
|
207 |
CollapseToMedium="WhenGroupIsMedium"
|
|
208 |
CollapseToSmall="WhenGroupIsSmall"
|
|
209 |
CommandParameter="Cut"
|
|
210 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/cut1.png"
|
|
211 |
Size="Medium"
|
|
212 |
Click="ControlEvent"
|
|
213 |
Tag="Cut"
|
|
214 |
telerik:ScreenTip.Description="Cut selected markup"
|
|
215 |
telerik:ScreenTip.Title="Cut"
|
|
216 |
Text="Cut" />
|
|
217 |
<telerik:RadRibbonToggleButton
|
|
218 |
CollapseToMedium="WhenGroupIsMedium"
|
|
219 |
CollapseToSmall="WhenGroupIsSmall"
|
|
220 |
CommandParameter="Delete"
|
|
221 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/delete3.png"
|
|
222 |
Size="Medium"
|
|
223 |
Click="ControlEvent"
|
|
224 |
Tag="Delete"
|
|
225 |
telerik:ScreenTip.Description="Delete selected markup"
|
|
226 |
telerik:ScreenTip.Title="Delete"
|
|
227 |
Text="Delete" />
|
|
241 |
<telerik:RadRibbonToggleButton |
|
242 |
telerik:ScreenTip.Description="Undo the work"
|
|
243 |
telerik:ScreenTip.Title="Eraser"
|
|
244 |
Click="ControlEvent"
|
|
245 |
CollapseToMedium="WhenGroupIsMedium"
|
|
246 |
CollapseToSmall="WhenGroupIsSmall"
|
|
247 |
CommandParameter="Redo"
|
|
248 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/Redo3.png"
|
|
249 |
Size="Medium"
|
|
250 |
Tag="Redo"
|
|
251 |
Text="Redo" /> |
|
252 |
<telerik:RadRibbonToggleButton |
|
253 |
telerik:ScreenTip.Description="Cut selected markup"
|
|
254 |
telerik:ScreenTip.Title="Cut"
|
|
255 |
Click="ControlEvent"
|
|
256 |
CollapseToMedium="WhenGroupIsMedium"
|
|
257 |
CollapseToSmall="WhenGroupIsSmall"
|
|
258 |
CommandParameter="Cut"
|
|
259 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/cut1.png"
|
|
260 |
Size="Medium"
|
|
261 |
Tag="Cut"
|
|
262 |
Text="Cut" /> |
|
263 |
<telerik:RadRibbonToggleButton |
|
264 |
telerik:ScreenTip.Description="Delete selected markup"
|
|
265 |
telerik:ScreenTip.Title="Delete"
|
|
266 |
Click="ControlEvent"
|
|
267 |
CollapseToMedium="WhenGroupIsMedium"
|
|
268 |
CollapseToSmall="WhenGroupIsSmall"
|
|
269 |
CommandParameter="Delete"
|
|
270 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/delete3.png"
|
|
271 |
Size="Medium"
|
|
272 |
Tag="Delete"
|
|
273 |
Text="Delete" /> |
|
228 | 274 |
</telerik:RadCollapsiblePanel> |
229 | 275 |
<telerik:RadCollapsiblePanel> |
230 |
<telerik:RadRibbonToggleButton
|
|
231 |
CollapseToMedium="WhenGroupIsMedium"
|
|
232 |
CollapseToSmall="WhenGroupIsSmall"
|
|
233 |
CommandParameter="Select"
|
|
234 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/select.png"
|
|
235 |
Size="Medium"
|
|
236 |
Click="ControlEvent"
|
|
237 |
Tag="Select"
|
|
238 |
x:Name="btnSelection"
|
|
239 |
telerik:ScreenTip.Description="Select an area of markup"
|
|
240 |
telerik:ScreenTip.Title="Eraser"
|
|
241 |
Text="Selection"/>
|
|
242 |
<telerik:RadRibbonToggleButton
|
|
243 |
CollapseToMedium="WhenGroupIsMedium"
|
|
244 |
CollapseToSmall="WhenGroupIsSmall"
|
|
245 |
CommandParameter="Paste"
|
|
246 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/paste1.png"
|
|
247 |
Size="Medium"
|
|
248 |
Click="ControlEvent"
|
|
249 |
Tag="Ink"
|
|
250 |
telerik:ScreenTip.Description="Paste markup"
|
|
251 |
telerik:ScreenTip.Title="Paste"
|
|
252 |
Text="Paste" />
|
|
253 |
<telerik:RadRibbonToggleButton ></telerik:RadRibbonToggleButton>
|
|
276 |
<telerik:RadRibbonToggleButton |
|
277 |
x:Name="btnSelection"
|
|
278 |
telerik:ScreenTip.Description="Select an area of markup"
|
|
279 |
telerik:ScreenTip.Title="Eraser"
|
|
280 |
Click="ControlEvent"
|
|
281 |
CollapseToMedium="WhenGroupIsMedium"
|
|
282 |
CollapseToSmall="WhenGroupIsSmall"
|
|
283 |
CommandParameter="Select"
|
|
284 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/select.png"
|
|
285 |
Size="Medium"
|
|
286 |
Tag="Select"
|
|
287 |
Text="Selection" />
|
|
288 |
<telerik:RadRibbonToggleButton |
|
289 |
telerik:ScreenTip.Description="Paste markup"
|
|
290 |
telerik:ScreenTip.Title="Paste"
|
|
291 |
Click="ControlEvent"
|
|
292 |
CollapseToMedium="WhenGroupIsMedium"
|
|
293 |
CollapseToSmall="WhenGroupIsSmall"
|
|
294 |
CommandParameter="Paste"
|
|
295 |
LargeImage="/KCOM;component/Resources/Images/MenuImage_new/paste1.png"
|
|
296 |
Size="Medium"
|
|
297 |
Tag="Ink"
|
|
298 |
Text="Paste" /> |
|
299 |
<telerik:RadRibbonToggleButton />
|
|
254 | 300 |
</telerik:RadCollapsiblePanel> |
255 | 301 |
</telerik:RadRibbonGroup> |
256 | 302 |
|
257 |
<telerik:RadRibbonGroup x:Name="LineControlGroup" DialogLauncherVisibility="Collapsed" |
|
258 |
Header="LINE" |
|
259 |
Icon="/KCOM;component/Resources/Images/MenuImage_New/small/line.png" |
|
260 |
telerik:ScreenTip.Description="Show the File Task options." |
|
261 |
telerik:ScreenTip.Title="File" |
|
262 |
Visibility="Visible"> |
|
303 |
<telerik:RadRibbonGroup |
|
304 |
x:Name="LineControlGroup" |
|
305 |
telerik:ScreenTip.Description="Show the File Task options." |
|
306 |
telerik:ScreenTip.Title="File" |
|
307 |
DialogLauncherVisibility="Collapsed" |
|
308 |
Header="LINE" |
|
309 |
Icon="/KCOM;component/Resources/Images/MenuImage_New/small/line.png" |
|
310 |
Visibility="Visible"> |
|
263 | 311 |
<Grid Margin="0,-1,0,0"> |
264 | 312 |
<Grid.ColumnDefinitions> |
265 |
<ColumnDefinition/> |
|
266 |
<ColumnDefinition/> |
|
267 |
<ColumnDefinition/> |
|
268 |
<ColumnDefinition/> |
|
313 |
<ColumnDefinition />
|
|
314 |
<ColumnDefinition />
|
|
315 |
<ColumnDefinition />
|
|
316 |
<ColumnDefinition />
|
|
269 | 317 |
</Grid.ColumnDefinitions> |
270 | 318 |
<Grid.RowDefinitions> |
271 |
<RowDefinition/> |
|
272 |
<RowDefinition/> |
|
273 |
<RowDefinition/> |
|
319 |
<RowDefinition />
|
|
320 |
<RowDefinition />
|
|
321 |
<RowDefinition />
|
|
274 | 322 |
</Grid.RowDefinitions> |
275 | 323 |
|
276 |
<telerik:RadToggleButton CommandParameter="Line" Grid.Column="0" Grid.Row="0" Tag="Line3" Width="30" Height="30" Click="ControlEvent"> |
|
277 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/line.png" /> |
|
278 |
</telerik:RadToggleButton> |
|
279 |
<telerik:RadToggleButton CommandParameter="Arrow" Grid.Column="1" Grid.Row="0" Tag="Normal" Width="30" Height="30" Click="ControlEvent"> |
|
280 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/Arrow.png" /> |
|
281 |
</telerik:RadToggleButton> |
|
282 |
<telerik:RadToggleButton CommandParameter="ArrowMulti" Grid.Column="2" Grid.Row="0" Tag="Normal" Width="30" Height="30" Click="ControlEvent"> |
|
283 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arrowTrans.png" /> |
|
284 |
</telerik:RadToggleButton> |
|
285 |
<telerik:RadToggleButton CommandParameter="TwinLine" Tag="Arrow" Grid.Column="0" Grid.Row="1" Width="30" Height="30" Click="ControlEvent"> |
|
286 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/dimension.png" /> |
|
287 |
</telerik:RadToggleButton> |
|
288 |
<telerik:RadToggleButton CommandParameter="DimLine" Tag="Dim" Grid.Column="1" Grid.Row="1" Width="30" Height="30" Click="ControlEvent"> |
|
289 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/dimensionEx.png" /> |
|
290 |
</telerik:RadToggleButton> |
|
291 |
<telerik:RadToggleButton CommandParameter="CancelLine" Grid.Column="2" Grid.Row="1" Tag="Line3" Width="30" Height="30" Click="ControlEvent"> |
|
292 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/lineDelete.png" /> |
|
293 |
</telerik:RadToggleButton> |
|
294 |
<telerik:RadToggleButton CommandParameter="Arc" Grid.Column="0" Grid.Row="2" Tag="Arc" Width="30" Height="30" Click="ControlEvent"> |
|
295 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arc.png" /> |
|
296 |
</telerik:RadToggleButton> |
|
297 |
<telerik:RadToggleButton CommandParameter="ArrowArc" Grid.Column="1" Grid.Row="2" Tag="ArrowArc" Width="30" Height="30" Click="ControlEvent"> |
|
298 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arrowarc.png" /> |
|
299 |
</telerik:RadToggleButton> |
|
300 |
<telerik:RadToggleButton CommandParameter="ChainLine" Grid.Column="2" Grid.Row="2" Tag="Chain" Width="30" Height="30" Click="ControlEvent"> |
|
301 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/lineChain.png" /> |
|
302 |
</telerik:RadToggleButton> |
|
324 |
<telerik:RadToggleButton |
|
325 |
Grid.Row="0" |
|
326 |
Grid.Column="0" |
|
327 |
Width="30" |
|
328 |
Height="30" |
|
329 |
Click="ControlEvent" |
|
330 |
CommandParameter="Line" |
|
331 |
Tag="Line3"> |
|
332 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/line.png" /> |
|
333 |
</telerik:RadToggleButton> |
|
334 |
<telerik:RadToggleButton |
|
335 |
Grid.Row="0" |
|
336 |
Grid.Column="1" |
|
337 |
Width="30" |
|
338 |
Height="30" |
|
339 |
Click="ControlEvent" |
|
340 |
CommandParameter="Arrow" |
|
341 |
Tag="Normal"> |
|
342 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/Arrow.png" /> |
|
343 |
</telerik:RadToggleButton> |
|
344 |
<telerik:RadToggleButton |
|
345 |
Grid.Row="0" |
|
346 |
Grid.Column="2" |
|
347 |
Width="30" |
|
348 |
Height="30" |
|
349 |
Click="ControlEvent" |
|
350 |
CommandParameter="ArrowMulti" |
|
351 |
Tag="Normal"> |
|
352 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arrowTrans.png" /> |
|
353 |
</telerik:RadToggleButton> |
|
354 |
<telerik:RadToggleButton |
|
355 |
Grid.Row="1" |
|
356 |
Grid.Column="0" |
|
357 |
Width="30" |
|
358 |
Height="30" |
|
359 |
Click="ControlEvent" |
|
360 |
CommandParameter="TwinLine" |
|
361 |
Tag="Arrow"> |
|
362 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/dimension.png" /> |
|
363 |
</telerik:RadToggleButton> |
|
364 |
<telerik:RadToggleButton |
|
365 |
Grid.Row="1" |
|
366 |
Grid.Column="1" |
|
367 |
Width="30" |
|
368 |
Height="30" |
|
369 |
Click="ControlEvent" |
|
370 |
CommandParameter="DimLine" |
|
371 |
Tag="Dim"> |
|
372 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/dimensionEx.png" /> |
|
373 |
</telerik:RadToggleButton> |
|
374 |
<telerik:RadToggleButton |
|
375 |
Grid.Row="1" |
|
376 |
Grid.Column="2" |
|
377 |
Width="30" |
|
378 |
Height="30" |
|
379 |
Click="ControlEvent" |
|
380 |
CommandParameter="CancelLine" |
|
381 |
Tag="Line3"> |
|
382 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/lineDelete.png" /> |
|
383 |
</telerik:RadToggleButton> |
|
384 |
<telerik:RadToggleButton |
|
385 |
Grid.Row="2" |
|
386 |
Grid.Column="0" |
|
387 |
Width="30" |
|
388 |
Height="30" |
|
389 |
Click="ControlEvent" |
|
390 |
CommandParameter="Arc" |
|
391 |
Tag="Arc"> |
|
392 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arc.png" /> |
|
393 |
</telerik:RadToggleButton> |
|
394 |
<telerik:RadToggleButton |
|
395 |
Grid.Row="2" |
|
396 |
Grid.Column="1" |
|
397 |
Width="30" |
|
398 |
Height="30" |
|
399 |
Click="ControlEvent" |
|
400 |
CommandParameter="ArrowArc" |
|
401 |
Tag="ArrowArc"> |
|
402 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arrowarc.png" /> |
|
403 |
</telerik:RadToggleButton> |
|
404 |
<telerik:RadToggleButton |
|
405 |
Grid.Row="2" |
|
406 |
Grid.Column="2" |
|
407 |
Width="30" |
|
408 |
Height="30" |
|
409 |
Click="ControlEvent" |
|
410 |
CommandParameter="ChainLine" |
|
411 |
Tag="Chain"> |
|
412 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/lineChain.png" /> |
|
413 |
</telerik:RadToggleButton> |
|
303 | 414 |
<!--<CheckBox Margin="10,5,2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="2" Grid.Row="0" Content="Fill" Checked="FillShapeEvent" Unchecked="FillShapeEvent" x:Name="cbFillShape" IsChecked="{Binding checkFillShape, Source={x:Static common:ViewerDataModel.Instance}}" />--> |
304 |
<CheckBox VerticalAlignment="Center" Grid.Column="3" Grid.Row="0" Margin="10,5,2,0" HorizontalAlignment="Left" Content="Axis Lock" |
|
305 |
IsChecked="{Binding IsAxisLock, Source={x:Static common:ViewerDataModel.Instance}}" /> |
|
415 |
<CheckBox |
|
416 |
Grid.Row="0" |
|
417 |
Grid.Column="3" |
|
418 |
Margin="10,5,2,0" |
|
419 |
HorizontalAlignment="Left" |
|
420 |
VerticalAlignment="Center" |
|
421 |
Content="Axis Lock" |
|
422 |
IsChecked="{Binding IsAxisLock, Source={x:Static common:ViewerDataModel.Instance}}" /> |
|
423 |
|
|
424 |
<telerik:RadButtonGroup |
|
425 |
Grid.Row="1" |
|
426 |
Grid.Column="3" |
|
427 |
Height="20" |
|
428 |
Margin="10,0,0,0" |
|
429 |
telerik:StyleManager.Theme="Windows8" |
|
430 |
BorderThickness="1"> |
|
431 |
<TextBlock |
|
432 |
Width="40" |
|
433 |
HorizontalAlignment="Center" |
|
434 |
VerticalAlignment="Center" |
|
435 |
FontSize="10" |
|
436 |
Text="Interval" |
|
437 |
TextAlignment="Center" /> |
|
438 |
<telerik:RadNumericUpDown |
|
439 |
x:Name="cbIntervalSize" |
|
440 |
Width="60" |
|
441 |
Height="20" |
|
442 |
Margin="2" |
|
443 |
HorizontalAlignment="Stretch" |
|
444 |
VerticalAlignment="Center" |
|
445 |
HorizontalContentAlignment="Center" |
|
446 |
telerik:StyleManager.Theme="Windows7" |
|
447 |
Maximum="100" |
|
448 |
Minimum="5" |
|
449 |
NumberDecimalDigits="0" |
|
450 |
ToolTipService.ToolTip="Interval Value" |
|
451 |
ValueChanged="cbIntervalSize_ValueChanged" |
|
452 |
Value="{Binding Interval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" /> |
|
453 |
</telerik:RadButtonGroup> |
|
306 | 454 |
|
307 |
<telerik:RadButtonGroup Margin="10,0,0,0" Height="20" Grid.Column="3" Grid.Row="1" |
|
308 |
BorderThickness="1" |
|
309 |
telerik:StyleManager.Theme="Windows8"> |
|
310 |
<TextBlock Width="40" |
|
311 |
HorizontalAlignment="Center" |
|
312 |
VerticalAlignment="Center" |
|
313 |
FontSize="10" |
|
314 |
Text="Interval" |
|
315 |
TextAlignment="Center" /> |
|
316 |
<telerik:RadNumericUpDown x:Name="cbIntervalSize" |
|
317 |
Width="60" |
|
318 |
Height="20" |
|
319 |
Margin="2" |
|
320 |
HorizontalAlignment="Stretch" |
|
321 |
VerticalAlignment="Center" |
|
322 |
HorizontalContentAlignment="Center" |
내보내기 Unified diff