개정판 84605c0c
호셩 컴파일 옴션 추가
-btnConsolidateFinalPDF.Visibility = System.Windows.Visibility.Collapsed
Change-Id: I13e6a9ab634f41f3e3f6cfb38ae356a57a6fe3d1
| ImageComparer/Markus.ImageComparer/ImageComparer.cs | ||
|---|---|---|
| 121 | 121 |
|
| 122 | 122 |
byte[,,] data = MathchesImageData(Originalbitmap, TargatBitmap); |
| 123 | 123 |
|
| 124 |
rects = GetMatchPixels(data, ResultRectSize);
|
|
| 124 |
result = GetMatchPixels(data, ResultRectSize);
|
|
| 125 | 125 |
|
| 126 |
if (rects.Count() > 0) |
|
| 127 |
{
|
|
| 128 |
result = Merge(rects, ResultRectSize.Height); |
|
| 129 |
} |
|
| 126 |
//if (rects.Count() > 0)
|
|
| 127 |
//{
|
|
| 128 |
// result = Merge(rects, ResultRectSize.Height);
|
|
| 129 |
//}
|
|
| 130 | 130 |
|
| 131 | 131 |
//result = JoinRectList(rects); |
| 132 | 132 |
} |
| ... | ... | |
| 196 | 196 |
System.Windows.Rect[] m = new System.Windows.Rect[(int)bound.Height / (int)rectHeight]; |
| 197 | 197 |
for (int i = 0; i < m.Length; ++i) |
| 198 | 198 |
{
|
| 199 |
m[i] = new System.Windows.Rect(Int32.MaxValue,bound.Y + i * rectHeight, 0, rectHeight);
|
|
| 199 |
m[i] = new System.Windows.Rect(bound.X, bound.Y + i * rectHeight, bound.Y, rectHeight);
|
|
| 200 | 200 |
} |
| 201 | 201 |
|
| 202 | 202 |
for (int i = 0; i < r.Count(); ++i) |
| ... | ... | |
| 447 | 447 |
result = await GetMatchPixelsAsnc(data, ResultRectSize); |
| 448 | 448 |
|
| 449 | 449 |
//result = JoinRectList(result); |
| 450 |
if (result.Count() > 0) |
|
| 451 |
{
|
|
| 452 |
result = Merge(result, ResultRectSize.Height); |
|
| 453 |
} |
|
| 450 |
//if (result.Count() > 0)
|
|
| 451 |
//{
|
|
| 452 |
// result = Merge(result, ResultRectSize.Height);
|
|
| 453 |
//}
|
|
| 454 | 454 |
|
| 455 | 455 |
data = null; |
| 456 | 456 |
} |
| KCOM/KCOM.csproj | ||
|---|---|---|
| 110 | 110 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|AnyCPU'"> |
| 111 | 111 |
<DebugSymbols>true</DebugSymbols> |
| 112 | 112 |
<OutputPath>bin\Debug_HyoSung\</OutputPath> |
| 113 |
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
| 113 |
<DefineConstants>TRACE;DEBUG;Hyosung</DefineConstants>
|
|
| 114 | 114 |
<DebugType>full</DebugType> |
| 115 | 115 |
<PlatformTarget>AnyCPU</PlatformTarget> |
| 116 | 116 |
<ErrorReport>prompt</ErrorReport> |
| ... | ... | |
| 130 | 130 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x86'"> |
| 131 | 131 |
<DebugSymbols>true</DebugSymbols> |
| 132 | 132 |
<OutputPath>bin\x86\Debug_HyoSung\</OutputPath> |
| 133 |
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
| 133 |
<DefineConstants>TRACE;DEBUG;Hyosung</DefineConstants>
|
|
| 134 | 134 |
<DebugType>full</DebugType> |
| 135 | 135 |
<PlatformTarget>x86</PlatformTarget> |
| 136 | 136 |
<ErrorReport>prompt</ErrorReport> |
| ... | ... | |
| 227 | 227 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|AnyCPU'"> |
| 228 | 228 |
<DebugSymbols>true</DebugSymbols> |
| 229 | 229 |
<OutputPath>..\Release\HyoSung\AnyCPU\</OutputPath> |
| 230 |
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
| 230 |
<DefineConstants>TRACE;DEBUG;Hyosung</DefineConstants>
|
|
| 231 | 231 |
<DebugType>full</DebugType> |
| 232 | 232 |
<PlatformTarget>AnyCPU</PlatformTarget> |
| 233 | 233 |
<ErrorReport>prompt</ErrorReport> |
| ... | ... | |
| 249 | 249 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_Hyosung|x86'"> |
| 250 | 250 |
<DebugSymbols>true</DebugSymbols> |
| 251 | 251 |
<OutputPath>..\Release\HyoSung\x86\</OutputPath> |
| 252 |
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
| 252 |
<DefineConstants>TRACE;DEBUG;Hyosung</DefineConstants>
|
|
| 253 | 253 |
<DebugType>full</DebugType> |
| 254 | 254 |
<PlatformTarget>x86</PlatformTarget> |
| 255 | 255 |
<ErrorReport>prompt</ErrorReport> |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 62 | 62 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| 63 | 63 |
</PropertyGroup> |
| 64 | 64 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x86'"> |
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjgxNTgiLCJiUGFydG5lciI6ImZhbHNlIiwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoiZmFsc2UiLCJOZXdDb21tZW50UGVybWlzc2lvbiI6ImZhbHNlIiwiUHJvamVjdE5PIjoiUFA0IiwiVXNlcklEIjoiYWRtaW4iLCJNb2RlIjowfQ==/</StartArguments>
|
|
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6Ijc2NzEiLCJiUGFydG5lciI6ImZhbHNlIiwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoiZmFsc2UiLCJOZXdDb21tZW50UGVybWlzc2lvbiI6ImZhbHNlIiwiUHJvamVjdE5PIjoiUFA0IiwiVXNlcklEIjoiYnN5b29uIiwiTW9kZSI6MH0=/</StartArguments>
|
|
| 66 | 66 |
</PropertyGroup> |
| 67 | 67 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> |
| 68 | 68 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 872 | 872 |
} |
| 873 | 873 |
} |
| 874 | 874 |
|
| 875 |
System.Diagnostics.Debug.WriteLine("MarkupLoad - MarkupParser 2 " + new TimeSpan(stopwatch.ElapsedTicks).ToString());
|
|
| 876 |
|
|
| 877 | 875 |
SetCommentPages(); |
| 878 |
|
|
| 879 |
System.Diagnostics.Debug.WriteLine("MarkupLoad - SetCommentPages " + new TimeSpan(stopwatch.ElapsedTicks).ToString());
|
|
| 880 | 876 |
} |
| 881 | 877 |
|
| 882 | 878 |
public void SetCommentPages() |
| ... | ... | |
| 4332 | 4328 |
private void btnConsolidateFinalPDF_Loaded(object sender, RoutedEventArgs e) |
| 4333 | 4329 |
{
|
| 4334 | 4330 |
btnConsolidateFinalPDF = (sender as RadRibbonButton); |
| 4335 |
|
|
| 4331 |
#if Hyosung |
|
| 4332 |
btnConsolidateFinalPDF.Visibility = System.Windows.Visibility.Collapsed; |
|
| 4333 |
#else |
|
| 4336 | 4334 |
if (App.ViewInfo != null) |
| 4337 | 4335 |
{
|
| 4338 | 4336 |
if (!App.ViewInfo.NewCommentPermission || !App.ViewInfo.CreateFinalPDFPermission) |
| ... | ... | |
| 4340 | 4338 |
btnConsolidateFinalPDF.Visibility = System.Windows.Visibility.Collapsed; |
| 4341 | 4339 |
} |
| 4342 | 4340 |
} |
| 4341 |
#endif |
|
| 4343 | 4342 |
} |
| 4344 | 4343 |
|
| 4345 | 4344 |
private void SyncCompare_Click(object sender, RoutedEventArgs e) |
| ... | ... | |
| 5178 | 5177 |
RadWindow.Alert(parameters); |
| 5179 | 5178 |
} |
| 5180 | 5179 |
|
| 5181 |
#region 캡쳐 기능
|
|
| 5180 |
#region 캡쳐 기능 |
|
| 5182 | 5181 |
|
| 5183 | 5182 |
public BitmapSource CutAreaToImage(int x, int y, int width, int height) |
| 5184 | 5183 |
{
|
| ... | ... | |
| 5372 | 5371 |
Save_Capture(source, (int)x, (int)y, (int)width, (int)height); |
| 5373 | 5372 |
} |
| 5374 | 5373 |
} |
| 5375 |
#endregion
|
|
| 5374 |
#endregion |
|
| 5376 | 5375 |
|
| 5377 | 5376 |
public Multi_Undo_data Control_Style(CommentUserInfo control) |
| 5378 | 5377 |
{
|
내보내기 Unified diff
