개정판 503cb09e
service controller 참조 DLL 추가
Change-Id: I71275da928adc2181aa4c8da4b377eccabe90669
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
---|---|---|
107 | 107 |
<Reference Include="System.Xaml"> |
108 | 108 |
<RequiredTargetFramework>4.0</RequiredTargetFramework> |
109 | 109 |
</Reference> |
110 |
<Reference Include="Telerik.Windows.Controls"> |
|
111 |
<HintPath>..\packages\telerik\Telerik.Windows.Controls.dll</HintPath> |
|
110 |
<Reference Include="Telerik.Windows.Controls, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
111 |
<SpecificVersion>False</SpecificVersion> |
|
112 |
<HintPath>..\Telerik\Telerik.Windows.Controls.dll</HintPath> |
|
112 | 113 |
</Reference> |
113 |
<Reference Include="Telerik.Windows.Controls.GridView"> |
|
114 |
<HintPath>..\packages\telerik\Telerik.Windows.Controls.GridView.dll</HintPath> |
|
114 |
<Reference Include="Telerik.Windows.Controls.GridView, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
115 |
<SpecificVersion>False</SpecificVersion> |
|
116 |
<HintPath>..\Telerik\Telerik.Windows.Controls.GridView.dll</HintPath> |
|
115 | 117 |
</Reference> |
116 |
<Reference Include="Telerik.Windows.Controls.Input"> |
|
117 |
<HintPath>..\packages\telerik\Telerik.Windows.Controls.Input.dll</HintPath> |
|
118 |
<Reference Include="Telerik.Windows.Controls.Input, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
119 |
<SpecificVersion>False</SpecificVersion> |
|
120 |
<HintPath>..\Telerik\Telerik.Windows.Controls.Input.dll</HintPath> |
|
118 | 121 |
</Reference> |
119 |
<Reference Include="Telerik.Windows.Controls.Navigation"> |
|
120 |
<HintPath>..\packages\telerik\Telerik.Windows.Controls.Navigation.dll</HintPath> |
|
122 |
<Reference Include="Telerik.Windows.Controls.Navigation, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
123 |
<SpecificVersion>False</SpecificVersion> |
|
124 |
<HintPath>..\Telerik\Telerik.Windows.Controls.Navigation.dll</HintPath> |
|
121 | 125 |
</Reference> |
122 |
<Reference Include="Telerik.Windows.Data"> |
|
123 |
<HintPath>..\packages\telerik\Telerik.Windows.Data.dll</HintPath> |
|
126 |
<Reference Include="Telerik.Windows.Data, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
127 |
<SpecificVersion>False</SpecificVersion> |
|
128 |
<HintPath>..\Telerik\Telerik.Windows.Data.dll</HintPath> |
|
124 | 129 |
</Reference> |
125 | 130 |
<Reference Include="Telerik.Windows.Themes.VisualStudio2013"> |
126 |
<HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R3 2019\Binaries.NoXaml\WPF45\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
|
|
131 |
<HintPath>..\Telerik\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
|
|
127 | 132 |
</Reference> |
128 |
<Reference Include="Telerik.Windows.Zip"> |
|
129 |
<HintPath>..\packages\telerik\Telerik.Windows.Zip.dll</HintPath> |
|
133 |
<Reference Include="Telerik.Windows.Zip, Version=2019.3.903.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
134 |
<SpecificVersion>False</SpecificVersion> |
|
135 |
<HintPath>..\Telerik\Telerik.Windows.Zip.dll</HintPath> |
|
130 | 136 |
</Reference> |
131 | 137 |
<Reference Include="WindowsBase" /> |
132 | 138 |
<Reference Include="PresentationCore" /> |
INI/MARKUS_HyoSung_Debug.ini | ||
---|---|---|
1 |
[Internal] |
|
2 |
IP=10.11.252.3:8975 |
|
3 |
[External] |
|
4 |
IP=10.11.252.3:8975 |
|
5 |
[BaseClientAddress] |
|
6 |
URL=http://localhost:8080 |
|
7 |
[HubAddress] |
|
8 |
URL=http://10.11.252.3:8975/ |
|
9 |
[UpdateVer64] |
|
10 |
URL=http://10.11.252.3:8975/TileSource/Version/version_x64.xml |
|
11 |
[UpdateVer86] |
|
12 |
URL=http://10.11.252.3:8975/TileSource/Version/version_x86.xml |
|
13 |
[excelFilePath] |
|
14 |
URL=http://10.11.252.3:8975/TileSource/Check_Test/CheckList_T.xlsx |
|
15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
|
16 |
URL=http://10.11.252.3:8975/Get_FInalImage/Get_PdfImage.asmx |
|
17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
|
18 |
URL=http://10.11.252.3:8975/ImageUpload/FileUpload.asmx |
|
19 |
[mainServerImageWebPath] |
|
20 |
URL=http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png |
|
21 |
[subServerImageWebPath] |
|
22 |
URL=http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png |
|
23 |
[Debug_BaseClientAddress] |
|
24 |
URL=http://10.11.252.3 |
|
25 |
[HOST_DOMAIN] |
|
26 |
DOMAIN= |
|
27 |
[GetConversionStateFailed] |
|
28 |
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6Q= |
|
29 |
[SetFinalPDFError] |
|
30 |
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA== |
|
31 |
[SetFinalPDFSuccess] |
|
32 |
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU |
|
33 |
[SetThumbnail] |
|
34 |
WIDTH=100 |
|
35 |
[Site] |
|
36 |
NAME=DAELIM |
|
37 |
[PortForwarding] |
|
38 |
HUB=5100:5100 |
|
39 |
RESOURCE=5977:5977 |
|
40 |
BASE=5979:5979 |
|
41 |
[GetImageResourceFailed] |
|
42 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
ImageComparer/Markus.ImageComparer/ImageComparer.cs | ||
---|---|---|
27 | 27 |
{ |
28 | 28 |
using (Graphics g = Graphics.FromImage(Originalbitmap)) |
29 | 29 |
{ |
30 |
var rect = rects.Select(x => new System.Drawing.Rectangle((int)x.X, (int)x.Y, (int)x.Width, (int)x.Height)); |
|
30 |
var rect = rects.Select(x => new System.Drawing.Rectangle((int)x.X, (int)x.Y, (int)x.Width, (int)x.Height)).ToList();
|
|
31 | 31 |
|
32 | 32 |
g.DrawRectangles(new Pen(Brushes.Blue, 3f), rect.ToArray()); |
33 | 33 |
g.Save(); |
... | ... | |
39 | 39 |
return Originalbitmap; |
40 | 40 |
} |
41 | 41 |
|
42 |
// JoinRects: will return a rectangle composed of r1 and r2. |
|
43 |
private System.Windows.Rect JoinRects(System.Windows.Rect r1, System.Windows.Rect r2) |
|
44 |
{ |
|
45 |
return new System.Windows.Rect(Math.Min(r1.X, r2.X), |
|
46 |
Math.Min(r1.Y, r2.Y), |
|
47 |
Math.Max(r1.Y + r1.Width, r2.Y + r2.Width), |
|
48 |
Math.Max(r1.X + r1.Height, r2.X + r2.Height)); |
|
49 |
} |
|
50 |
|
|
51 |
private System.Windows.Rect RectSizeUp(System.Windows.Rect rect,int UpSize) |
|
52 |
{ |
|
53 |
return new System.Windows.Rect(rect.X - UpSize, rect.Y - UpSize, rect.Width + UpSize, rect.Height + UpSize); |
|
54 |
} |
|
55 |
|
|
42 | 56 |
public System.Windows.Media.Imaging.BitmapSource CompareDrawRects(System.Windows.Media.Imaging.BitmapSource Originalbitmap, System.Windows.Media.Imaging.BitmapSource TargatBitmap, Size ResultRectSize) |
43 | 57 |
{ |
44 | 58 |
var _Originalbitmap = CreateBitmapFromSource(Originalbitmap); |
... | ... | |
103 | 117 |
|
104 | 118 |
try |
105 | 119 |
{ |
120 |
List<System.Windows.Rect> rects = new List<System.Windows.Rect>(); |
|
121 |
|
|
106 | 122 |
byte[,,] data = MathchesImageData(Originalbitmap, TargatBitmap); |
107 | 123 |
|
108 |
result = GetMatchPixels(data, ResultRectSize); |
|
124 |
rects = GetMatchPixels(data, ResultRectSize); |
|
125 |
|
|
126 |
if (rects.Count() > 0) |
|
127 |
{ |
|
128 |
result = Merge(rects, ResultRectSize.Height); |
|
129 |
} |
|
130 |
|
|
131 |
//result = JoinRectList(rects); |
|
109 | 132 |
} |
110 | 133 |
catch (Exception ex) |
111 | 134 |
{ |
... | ... | |
119 | 142 |
return result; |
120 | 143 |
} |
121 | 144 |
|
145 |
private List<System.Windows.Rect> JoinRectList(List<System.Windows.Rect> rects) |
|
146 |
{ |
|
147 |
List<System.Windows.Rect> result = new List<System.Windows.Rect>(); |
|
148 |
|
|
149 |
if (rects.Count() > 0) |
|
150 |
{ |
|
151 |
System.Windows.Rect rect = rects[0]; |
|
152 |
System.Windows.Rect joinRect = rects[0]; |
|
153 |
|
|
154 |
while (rects.Count() > 0) |
|
155 |
{ |
|
156 |
var joinItems = rects.Where(x => RectSizeUp(joinRect, 1).Contains(x)).ToList(); |
|
157 |
|
|
158 |
if (joinItems.Count() == 0) |
|
159 |
{ |
|
160 |
result.Add(joinRect); |
|
161 |
} |
|
162 |
else |
|
163 |
{ |
|
164 |
for (int i = 0; i < joinItems.Count(); i++) |
|
165 |
{ |
|
166 |
rect = JoinRects(rect, joinItems[i]); |
|
167 |
rects.Remove(joinItems[i]); |
|
168 |
} |
|
169 |
|
|
170 |
if (rects.Count() > 0) |
|
171 |
{ |
|
172 |
rects.RemoveAt(0); |
|
173 |
} |
|
174 |
|
|
175 |
result.Add(joinRect); |
|
176 |
} |
|
177 |
} |
|
178 |
} |
|
179 |
|
|
180 |
return result; |
|
181 |
} |
|
182 |
|
|
183 |
private List<System.Windows.Rect> Merge(List<System.Windows.Rect> r,int rectHeight) |
|
184 |
{ |
|
185 |
// Computing the bound |
|
186 |
System.Windows.Rect bound = new System.Windows.Rect(r[0].X, r[0].Y, r[0].Width, r[0].Height); |
|
187 |
for (int i = 1; i < r.Count(); ++i) |
|
188 |
{ |
|
189 |
bound.X = Math.Min(bound.X, r[i].X); |
|
190 |
bound.Y = Math.Min(bound.Y, r[i].Y); |
|
191 |
bound.Width = Math.Max(bound.Right, r[i].Right) - bound.X; |
|
192 |
bound.Height = Math.Max(bound.Bottom, r[i].Bottom) - bound.Y; |
|
193 |
} |
|
194 |
|
|
195 |
// Create number of rectangle will be created by vertical strip expansion |
|
196 |
System.Windows.Rect[] m = new System.Windows.Rect[(int)bound.Height / (int)rectHeight]; |
|
197 |
for (int i = 0; i < m.Length; ++i) |
|
198 |
{ |
|
199 |
m[i] = new System.Windows.Rect(Int32.MaxValue,bound.Y + i * rectHeight, 0, rectHeight); |
|
200 |
} |
|
201 |
|
|
202 |
for (int i = 0; i < r.Count(); ++i) |
|
203 |
{ |
|
204 |
int index = ((int)r[i].Y - (int)bound.Y) / rectHeight; |
|
205 |
|
|
206 |
if (m[index].Width <= 0) |
|
207 |
{ |
|
208 |
m[index].Width = r[i].Width; |
|
209 |
m[index].X = r[i].X; |
|
210 |
} |
|
211 |
else |
|
212 |
{ |
|
213 |
int right = (int)m[index].Right; |
|
214 |
m[index].X = Math.Min(m[index].X, r[i].X); |
|
215 |
m[index].Width = Math.Max(right, r[i].Right) - m[index].X; |
|
216 |
} |
|
217 |
} |
|
218 |
|
|
219 |
// Merge horozontally |
|
220 |
for (int i = m.Length - 1; i > 0; --i) |
|
221 |
{ |
|
222 |
// can only merge when two rect has the same X and Width |
|
223 |
if ((m[i].X == m[i - 1].X) && (m[i].Width == m[i - 1].Width)) |
|
224 |
{ |
|
225 |
m[i - 1].Height += m[i].Height; // expanse the rectangle |
|
226 |
m[i].Width = 0; // remove one rectangle |
|
227 |
} |
|
228 |
} |
|
229 |
|
|
230 |
// Remove all the empty rectangle |
|
231 |
List<System.Windows.Rect> result = new List<System.Windows.Rect>(); |
|
232 |
for (int i = m.Length - 1; i >= 0; --i) |
|
233 |
{ |
|
234 |
if (m[i].Width > 0) |
|
235 |
result.Add(m[i]); |
|
236 |
} |
|
237 |
|
|
238 |
return result; |
|
239 |
} |
|
122 | 240 |
/// <summary> |
123 | 241 |
/// 이미지를 비교 후 원본 이미지에 Rect를 그린다. |
124 | 242 |
/// 메모리 문제 발생 |
... | ... | |
137 | 255 |
{ |
138 | 256 |
using (Graphics g = Graphics.FromImage(cloneOriginal)) |
139 | 257 |
{ |
258 |
|
|
140 | 259 |
var rect = rects.Select(x => new System.Drawing.Rectangle((int)x.X, (int)x.Y, (int)x.Width, (int)x.Height)); |
141 | 260 |
|
142 | 261 |
g.DrawRectangles(new Pen(Brushes.Blue, 3f), rect.ToArray()); |
... | ... | |
326 | 445 |
byte[,,] data = MathchesImageData(Originalbitmap, TargatBitmap); |
327 | 446 |
|
328 | 447 |
result = await GetMatchPixelsAsnc(data, ResultRectSize); |
329 |
|
|
448 |
|
|
449 |
//result = JoinRectList(result); |
|
450 |
if (result.Count() > 0) |
|
451 |
{ |
|
452 |
result = Merge(result, ResultRectSize.Height); |
|
453 |
} |
|
454 |
|
|
330 | 455 |
data = null; |
331 | 456 |
} |
332 | 457 |
catch (Exception ex) |
KCOM.sln | ||
---|---|---|
39 | 39 |
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "INI", "INI", "{01F177C4-03F9-41A7-8996-89D190BD3E10}" |
40 | 40 |
ProjectSection(SolutionItems) = preProject |
41 | 41 |
INI\MARKUS _PEMSS.ini = INI\MARKUS _PEMSS.ini |
42 |
INI\MARKUS.ini = INI\MARKUS.ini |
|
42 | 43 |
INI\MARKUS_DAELIM.ini = INI\MARKUS_DAELIM.ini |
43 | 44 |
INI\MARKUS_Doftech.ini = INI\MARKUS_Doftech.ini |
44 | 45 |
INI\MARKUS_Doftech_Remote.ini = INI\MARKUS_Doftech_Remote.ini |
45 | 46 |
INI\MARKUS_Doftech_Remote_123port.ini = INI\MARKUS_Doftech_Remote_123port.ini |
47 |
INI\MARKUS_HyoSung.ini = INI\MARKUS_HyoSung.ini |
|
48 |
INI\MARKUS_HyoSung_Debug.ini = INI\MARKUS_HyoSung_Debug.ini |
|
46 | 49 |
INI\MARKUS_LOCAL.ini = INI\MARKUS_LOCAL.ini |
47 | 50 |
Site\SNI\MARKUS_SNI.ini = Site\SNI\MARKUS_SNI.ini |
48 | 51 |
EndProjectSection |
KCOM/KCOM.csproj | ||
---|---|---|
115 | 115 |
<PlatformTarget>AnyCPU</PlatformTarget> |
116 | 116 |
<ErrorReport>prompt</ErrorReport> |
117 | 117 |
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> |
118 |
<Prefer32Bit>false</Prefer32Bit> |
|
118 | 119 |
</PropertyGroup> |
119 | 120 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x64'"> |
120 | 121 |
<DebugSymbols>true</DebugSymbols> |
... | ... | |
1589 | 1590 |
) |
1590 | 1591 |
|
1591 | 1592 |
if $(ConfigurationName) == Debug_HyoSung ( |
1592 |
copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung.ini" "C:\ProgramData\MARKUS\MARKUS.ini" |
|
1593 |
copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung_Debug.ini" "C:\ProgramData\MARKUS\MARKUS.ini"
|
|
1593 | 1594 |
) |
1594 | 1595 |
|
1595 | 1596 |
if $(ConfigurationName) == Debug_SNI ( |
KCOM/KCOM.csproj.user | ||
---|---|---|
27 | 27 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments> |
28 | 28 |
</PropertyGroup> |
29 | 29 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|AnyCPU'"> |
30 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6Ijc0MzUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6InBwNCIsIlVzZXJJRCI6ImNqaGdoIiwiTW9kZSI6MH0=</StartArguments>
|
|
30 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIwMDUyIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IkxQRyIsIlVzZXJJRCI6IlJFUE9JTlRcXHN5c3RlbSIsIk1vZGUiOjB9/</StartArguments>
|
|
31 | 31 |
</PropertyGroup> |
32 | 32 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x64'"> |
33 | 33 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
... | ... | |
55 | 55 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
56 | 56 |
</PropertyGroup> |
57 | 57 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|AnyCPU'"> |
58 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6Ijc0MzUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6InBwNCIsIlVzZXJJRCI6ImNqaGdoIiwiTW9kZSI6MH0=</StartArguments>
|
|
58 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQzODMwIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IlBQNCIsIlVzZXJJRCI6IlJFUE9JTlRcXHN5c3RlbSIsIk1vZGUiOjB9/</StartArguments>
|
|
59 | 59 |
</PropertyGroup> |
60 | 60 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|x64'"> |
61 | 61 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
KCOM/Services/BaseServices.cs | ||
---|---|---|
245 | 245 |
|
246 | 246 |
if (e.Error != null) |
247 | 247 |
{ |
248 |
DialogMessage_Alert("페이지정보를 가져올 수 없습니다.", "Alert");
|
|
248 |
DialogMessage_Alert("The page cannot be displayed.", "Alert");
|
|
249 | 249 |
return; |
250 | 250 |
} |
251 | 251 |
|
... | ... | |
662 | 662 |
else |
663 | 663 |
{ |
664 | 664 |
//System.Windows.Forms.MessageBox.Show("해당 프로젝트에 가입되지 않은 유저입니다. 관리자에게 등록신청을 해주세요", "안내"); |
665 |
DialogMessage_Alert("해당 프로젝트에 가입되지 않은 유저입니다. 관리자에게 등록신청을 해주세요", "안내");
|
|
665 |
DialogMessage_Alert("You are not belong to this project. Please ask admin for an authority.", "Info");
|
|
666 | 666 |
//this.ParentOfType<MainPage>().DialogMessage_Alert("해당 프로젝트에 가입되지 않은 유저입니다. 관리자에게 등록신청을 해주세요", "안내"); |
667 | 667 |
} |
668 | 668 |
|
KCOM_API/KCOM_API.csproj | ||
---|---|---|
56 | 56 |
<HintPath>..\packages\EMGU.CV.4.1.1.3497\lib\net35\Emgu.CV.World.dll</HintPath> |
57 | 57 |
</Reference> |
58 | 58 |
<Reference Include="Markus.Image, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |
59 |
<HintPath>..\packages\Markus.Image.ImageComparer.1.0.1\lib\net45\Markus.Image.dll</HintPath>
|
|
59 |
<HintPath>..\packages\Markus.Image.ImageComparer.1.1.2\lib\net45\Markus.Image.dll</HintPath>
|
|
60 | 60 |
</Reference> |
61 | 61 |
<Reference Include="Microsoft.CSharp" /> |
62 | 62 |
<Reference Include="System.Data.DataSetExtensions" /> |
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user | ||
---|---|---|
52 | 52 |
<publishTime>09/19/2015 15:28:04</publishTime> |
53 | 53 |
</File> |
54 | 54 |
<File Include="bin/IFinalPDF.dll"> |
55 |
<publishTime>02/25/2020 10:44:46</publishTime>
|
|
55 |
<publishTime>02/26/2020 17:19:31</publishTime>
|
|
56 | 56 |
</File> |
57 | 57 |
<File Include="bin/IFinalPDF.pdb"> |
58 |
<publishTime>02/25/2020 10:44:46</publishTime>
|
|
58 |
<publishTime>02/26/2020 17:19:31</publishTime>
|
|
59 | 59 |
</File> |
60 | 60 |
<File Include="bin/IKCOM.dll"> |
61 |
<publishTime>02/25/2020 10:44:49</publishTime>
|
|
61 |
<publishTime>02/27/2020 10:01:48</publishTime>
|
|
62 | 62 |
</File> |
63 | 63 |
<File Include="bin/IKCOM.pdb"> |
64 |
<publishTime>02/25/2020 10:44:49</publishTime>
|
|
64 |
<publishTime>02/27/2020 10:01:48</publishTime>
|
|
65 | 65 |
</File> |
66 | 66 |
<File Include="bin/it/ZedGraph.resources.dll"> |
67 | 67 |
<publishTime>09/19/2015 15:28:04</publishTime> |
... | ... | |
79 | 79 |
<publishTime>02/25/2020 10:44:46</publishTime> |
80 | 80 |
</File> |
81 | 81 |
<File Include="bin/KCOM_API.dll"> |
82 |
<publishTime>02/25/2020 10:45:22</publishTime>
|
|
82 |
<publishTime>02/28/2020 08:53:06</publishTime>
|
|
83 | 83 |
</File> |
84 | 84 |
<File Include="bin/KCOM_API.pdb"> |
85 |
<publishTime>02/25/2020 10:45:22</publishTime>
|
|
85 |
<publishTime>02/28/2020 08:53:06</publishTime>
|
|
86 | 86 |
</File> |
87 | 87 |
<File Include="bin/Leadtools.Codecs.Cmp.dll"> |
88 | 88 |
<publishTime>06/29/2017 11:38:22</publishTime> |
... | ... | |
109 | 109 |
<publishTime>09/14/2015 12:37:22</publishTime> |
110 | 110 |
</File> |
111 | 111 |
<File Include="bin/Markus.Image.dll"> |
112 |
<publishTime>01/07/2020 08:27:28</publishTime>
|
|
112 |
<publishTime>02/27/2020 09:51:16</publishTime>
|
|
113 | 113 |
</File> |
114 | 114 |
<File Include="bin/OpenCvSharp.dll"> |
115 | 115 |
<publishTime>11/17/2017 00:22:52</publishTime> |
... | ... | |
190 | 190 |
<publishTime>07/10/2019 14:11:36</publishTime> |
191 | 191 |
</File> |
192 | 192 |
<File Include="Web.config"> |
193 |
<publishTime>02/25/2020 10:45:23</publishTime>
|
|
193 |
<publishTime>02/28/2020 08:53:07</publishTime>
|
|
194 | 194 |
</File> |
195 | 195 |
</ItemGroup> |
196 | 196 |
</Project> |
KCOM_API/ServiceDeepView.svc.cs | ||
---|---|---|
2156 | 2156 |
[ServiceKnownType(typeof(MEMBER))] |
2157 | 2157 |
public MEMBER GetMember(string project_no, string user_id) |
2158 | 2158 |
{ |
2159 |
MEMBER rstmember = new MEMBER();
|
|
2159 |
MEMBER rstmember = null;
|
|
2160 | 2160 |
try |
2161 | 2161 |
{ |
2162 | 2162 |
string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString; |
2163 | 2163 |
using (CIEntities Entity = new CIEntities(sCIConnString)) |
2164 | 2164 |
{ |
2165 |
var tmp = (from member in Entity.MEMBER |
|
2166 |
where member.ID == user_id && member.PROJECT_NO == project_no |
|
2167 |
select member).FirstOrDefault(); |
|
2168 |
rstmember.DEPARTMENT = tmp.DEPARTMENT; |
|
2169 |
rstmember.ID = tmp.ID; |
|
2170 |
rstmember.NAME = tmp.NAME; |
|
2165 |
string query = "SELECT members.ID,members.NAME,members.DEPARTMENT FROM CIEntities.MEMBER as members where members.ID = @userId"; |
|
2166 |
|
|
2167 |
var param = new[] { new System.Data.Objects.ObjectParameter("userId", user_id) }; |
|
2168 |
|
|
2169 |
System.Data.Objects.ObjectQuery<System.Data.Common.DbDataRecord> memberQuery |
|
2170 |
= Entity.CreateQuery<System.Data.Common.DbDataRecord>(query, param); |
|
2171 |
|
|
2172 |
if (memberQuery.Count() > 0) |
|
2173 |
{ |
|
2174 |
string userName = memberQuery.First()["NAME"]?.ToString().Trim(); |
|
2175 |
string ID = memberQuery.First()["ID"]?.ToString().Trim(); |
|
2176 |
string depatment = memberQuery.First()["DEPARTMENT"]?.ToString().Trim(); |
|
2177 |
|
|
2178 |
rstmember.NAME = userName; |
|
2179 |
rstmember.ID = ID; |
|
2180 |
rstmember.DEPARTMENT = depatment; |
|
2181 |
} |
|
2171 | 2182 |
} |
2172 | 2183 |
} |
2173 | 2184 |
catch (Exception ex) |
KCOM_API/Web.config | ||
---|---|---|
10 | 10 |
</sectionGroup> |
11 | 11 |
</configSections> |
12 | 12 |
<connectionStrings> |
13 |
<!--효성 Connection String--> |
|
13 | 14 |
<add name="ConnectionString" |
14 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
15 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
15 | 16 |
providerName="System.Data.EntityClient"/> |
16 | 17 |
<add name="CIConnectionString" |
17 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
18 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
18 | 19 |
providerName="System.Data.EntityClient"/> |
19 | 20 |
</connectionStrings> |
20 | 21 |
<!-- |
... | ... | |
81 | 82 |
<applicationSettings> |
82 | 83 |
<KCOM_API.Properties.Settings> |
83 | 84 |
<setting name="TileSoucePath" serializeAs="String"> |
84 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
85 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
85 | 86 |
</setting> |
86 | 87 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
87 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
88 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
88 | 89 |
</setting> |
89 | 90 |
<setting name="IsProjectNoPass" serializeAs="String"> |
90 | 91 |
<value>True</value> |
KCOM_API/packages.config | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<packages> |
3 | 3 |
<package id="EMGU.CV" version="4.1.1.3497" targetFramework="net461" /> |
4 |
<package id="Markus.Image.ImageComparer" version="1.0.1" targetFramework="net461" />
|
|
4 |
<package id="Markus.Image.ImageComparer" version="1.1.2" targetFramework="net461" />
|
|
5 | 5 |
<package id="ZedGraph" version="5.1.7" targetFramework="net461" /> |
6 | 6 |
</packages> |
내보내기 Unified diff