/ - Diff - MARKUS - 일정관리

+                }
                 return null;
+            }
             public static async Task<IPHostEntry> GetHostEntryAsync()
+            {
                 IPHostEntry result = null;
                 try
+                {
                     var ipaddress = CommonLib.DNSHelper.GetDnsAdress();
                     await Task.Factory.StartNew(() =>
+                    {
                         result = Dns.GetHostEntry(ipaddress);
                     });
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());
+                }
                 return result;
+            }
             public static IPHostEntry GetHostEntryTask()
+            {
                 IPHostEntry result = null;
                 try
+                {
                     var ipaddress = CommonLib.DNSHelper.GetDnsAdress();
                     var task = Task.Factory.StartNew(() =>
+                    {
                         result = Dns.GetHostEntry(ipaddress);
                     });
                     task.Wait();
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());
+                }
                 return result;
+            }
+        }
+    }

ConvertService/ServiceBase/ConvertionWebService/Conversion.asmx.cs
76	76	string _result = null;
77	77	try
78	78	{
	79	logger.Info($"Conversion Web Service ConvertRun call rev_No :{rev_No} document_No : {document_No} document_Name : {document_Name} group_No : {group_No} prj_No : {prj_No} document_Id : {document_Id} document_Url : {document_Url}");
	80
79	81	using (DeepView_Entity deepViewEntity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString()))
80	82	{
81	83	//_result = ConnectStringBuilder.DeepViewConnectionString().ToString();
...	...
95	97	}
96	98	catch (Exception ex)
97	99	{
98		logger.Error("Conversion Web Service ConvertRun Error", ex);
	100	logger.Error($"Conversion Web Service ConvertRun Error rev_No :{rev_No} document_No : {document_No} document_Name : {document_Name} group_No : {group_No} prj_No : {prj_No} document_Id : {document_Id} document_Url : {document_Url}", ex);
99	101	_result = ex.Message.ToString();
100	102	SendNotice("Project NO : " + prj_No + "\r\n DocumentUrl : " + document_Url + "\r\n Error" + ex.ToString());
101	103	}
...	...
217	219	}
218	220	catch (Exception ex)
219	221	{
220		logger.Error("Conversion Web Service UpdateSlip Error", ex);
	222	logger.Error($"Conversion Web Service UpdateSlip Error EnsembleId : {EnsembleId} SlipNo : {SlipNo} slipLink: {slipLink}", ex);
221	223	_result = ex.Message.ToString();
222	224	}
223	225	return _result;

       </ItemGroup>
       <ItemGroup>
         <Content Include="Conversion.asmx" />
         <Content Include="..\Markus.Service.Station\Log.config">
         <None Include="..\Markus.Service.Station\Log.config">
           <Link>Log.config</Link>
         </Content>
           <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
         <None Include="DeepViewDataModel.dll.config">
           <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>

ConvertService/ServiceBase/Markus.Service.DataBase/MarkusEntities.cs
15	15	public MarkusEntities(string ConnectionString)
16	16	: base(ConnectionStringBuilder(ConnectionString).ToString())
17	17	{
	18	this.Database.CommandTimeout = 300;
18	19	}
	20
19	21	private static EntityConnectionStringBuilder ConnectionStringBuilder(string ConnectionString)
20	22	{
21	23	//SqlConnectionStringBuilder _bl = new SqlConnectionStringBuilder(string.Format(Properties.Settings.Default.ProjectCIConnectionString, "DeepView"));

ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs
140	140	{
141	141	try
142	142	{
143		if (ServiceStation.AliveConvertQueue.Count() < MultiProcessCount)
	143	if (AliveConvertQueue.Count(c => c.UniqueKey == convertItem.UniqueKey) == 0)
	144	{
	145	if (ServiceStation.AliveConvertQueue.Count() < MultiProcessCount)
	146	{
	147	ConvertProcessStart(convertItem);
	148	result = true.ToString();
	149	}
	150	}
	151	else
144	152	{
145		ConvertProcessStart(convertItem);
146	153	result = true.ToString();
147	154	}
148	155	}

     Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonLib", "CommonLib\CommonLib.csproj", "{DEF47FC2-B898-4C92-AD8D-D7B9E994495E}"
     EndProject
     Global
     	GlobalSection(Performance) = preSolution
     		HasPerformanceSessions = true
     	EndGlobalSection
     	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     		Debug|Any CPU = Debug|Any CPU
     		Debug|x64 = Debug|x64

             private string versionPath = null;
             //public SplashScreen splash = new SplashScreen("splash.png");
             public static SplashScreenWindow splashScreen = new SplashScreenWindow();
             protected override void OnStartup(StartupEventArgs e)
+            {
             public App()
+            {
+            }
             protected override async void OnStartup(StartupEventArgs e)
+            {
                 try
+                {
                     splashScreen.Show();
-...
                     string sBaseServiceURL = string.Empty;//CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");
                     string localdomain = CommonLib.Common.GetConfigString("HOST_DOMAIN", "DOMAIN", "");
                     var ipaddress = CommonLib.DNSHelper.GetDnsAdress();
                     try
+                    {
                         var hostName = Dns.GetHostEntry(ipaddress).HostName;
                     var hostEntry = CommonLib.DNSHelper.GetHostEntryTask();
                         if (!hostName.EndsWith(localdomain))
+                        {
                             // 외부 사용자
                             isExternal = true;
+                        }
+                    }
                     catch (Exception ex)
                     if (hostEntry == null || !hostEntry.HostName.EndsWith(localdomain))
+                    {
                         System.Diagnostics.Debug.WriteLine(ex.ToString());
                         // 외부 사용자
                         isExternal = true;
+                    }
     #if DEBUG
                     //sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", isExternal);
                     sBaseServiceURL = CommonLib.Common.GetConfigString("Debug_BaseClientAddress", "URL", "",isExternal);
                     sBaseServiceURL = CommonLib.Common.GetConfigString("Debug_BaseClientAddress", "URL", "", isExternal);
     #else
                     sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", isExternal);
                     sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", IsExternal);
     #endif
                     _EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
                     Task.Factory.StartNew(() =>
+                    {
                         int value = 100 / ISplashMessage.SplashMessageCnt;
                         for (int i = 1; i <= ISplashMessage.SplashMessageCnt; i++)
+                        {
                             System.Threading.Thread.Sleep(3);
                             splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i * value);
+                        }
                         this.Dispatcher.Invoke(() =>
+                        {
                             base.OnStartup(e);
                             splashScreen.Close();
                         });
                     });
                     await SplashScreenAsnyc();
                     base.OnStartup(e);
                     //this.MainWindow = new MainWindow();
+                }
                 catch (Exception ex)
+                {
-...
+                }
                 finally
+                {
                     Task.Factory.StartNew(() =>
+                    {
                         int value = 100 / ISplashMessage.SplashMessageCnt;
                         for (int i = 1; i < ISplashMessage.SplashMessageCnt; i++)
+                        {
                             System.Threading.Thread.Sleep(3);
                             splashScreen.Dispatcher.Invoke(() => splashScreen.Progress = i * value);
+                        }
                         this.Dispatcher.Invoke(() =>
+                        {
                             //base.OnStartup(e);
                             splashScreen.Close();
                         });
                     });
                     await SplashScreenAsnyc();
+                }
+            }
             private async Task<bool> SplashScreenAsnyc()
+            {
                 int value = 100 / ISplashMessage.SplashMessageCnt;
                 for (int i = 1; i < ISplashMessage.SplashMessageCnt; i++)
+                {
                     System.Threading.Thread.Sleep(3);
                     await splashScreen.Dispatcher.InvokeAsync(() => splashScreen.Progress = i * value);
+                }
                 splashScreen.Close();
                 return true;
+            }
             public static void splashString(string text)
+            {
                 Task.Factory.StartNew(() =>

     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     using System.Windows.Media;
     using System.Windows.Media.Imaging;
     namespace KCOM.Common
+    {
         public static class ImageSourceHelper
+        {
             public static async System.Threading.Tasks.Task<BitmapImage> GetDownloadImageAsync( Uri uri, double pageWidth, double pageHeight)
+            {
                 System.Net.Http.HttpClient httpClient = null;
                 System.IO.Stream responseStream = null;
                 System.IO.MemoryStream memoryStream = null;
                 BitmapImage image = null;
                 try
+                {
                     using (httpClient = new System.Net.Http.HttpClient())
+                    {
                         using (responseStream = await httpClient.GetStreamAsync(uri))
+                        {
                             using (memoryStream = new System.IO.MemoryStream())
+                            {
                                 System.Diagnostics.Debug.WriteLine("이미지 다운로드");
                                 await responseStream.CopyToAsync(memoryStream);
                                 image = new BitmapImage();
                                 image.BeginInit();
                                 image.CacheOption = BitmapCacheOption.OnLoad;
                                 image.StreamSource = memoryStream;
                                 image.DecodePixelWidth = (int)pageWidth;
                                 image.DecodePixelHeight = (int)pageHeight;
                                 image.EndInit();
                                 image.Freeze();
                                 return image;
+                            }
+                        }
+                    }
+                }
                 catch (Exception ex)
+                {
                     throw new Exception("Image Load Error ", ex);
+                }
                 finally
+                {
                     httpClient?.Dispose();
                     responseStream?.Dispose();
                     memoryStream?.Dispose();
                     image = null;
+                }
+            }
+        }
+    }

+            {
                 DisplayColorItems = new List<SetColorMarkupItem>();
+            }
             public Uri ImageUri { get; set; }
             public List<SetColorMarkupItem> DisplayColorItems { get; set; }
             public int PageNumber { get; set; }
             public int Angle { get; set; }
-...
             //강인구 추가
             public double Width { get; set; }
             public double Height { get; set; }
             /// <summary>
             /// 페이지 경로
             /// 2019.07.03 김태성 추가
             /// </summary>
             public Uri PageUri { get; set; }
+        }
         //public class SetColorMarkupItem

KCOM/Common/ViewerDataModel.cs
1021	1021	}
1022	1022	}
1023	1023
1024		private System.Windows.Media.Imaging.BitmapImage _ImageViewPath { get; set; }
1025		public System.Windows.Media.Imaging.BitmapImage ImageViewPath
	1024	private System.Windows.Media.ImageSource _ImageViewPath { get; set; }
	1025	public System.Windows.Media.ImageSource ImageViewPath
1026	1026	{
1027	1027	get
1028	1028	{

KCOM/Controls/PageNavigator.xaml.cs
162	162	var _pageNo = page.PAGE_NUMBER;
163	163	bool _addFlag = false;
164	164
	165
165	166	this._thumbnailItems.Add(new ThumbnailItem
166	167	{
167	168	ImageUri = new Uri(uri.Replace("{PageNo}", _pageNo.ToString())),

KCOM/Controls/Sample.xaml.cs
542	542	this._thumbnailItems.Add(new ThumbnailItem
543	543	{
544	544	ImageUri = new Uri(uri.Replace("{PageNo}", _pageNo.ToString())),
	545	PageUri = new Uri(uri.Replace("{PageNo}", _pageNo.ToString()).Replace("jpg","png")),
545	546	PageNumber = _pageNo,
546	547	Angle = page.PAGE_ANGLE,
547	548	});

         <NuGetPackageImportStamp>
         </NuGetPackageImportStamp>
         <TargetFrameworkProfile />
         <PublishUrl>publish\</PublishUrl>
         <Install>true</Install>
         <InstallFrom>Disk</InstallFrom>
         <UpdateEnabled>false</UpdateEnabled>
         <UpdateMode>Foreground</UpdateMode>
         <UpdateInterval>7</UpdateInterval>
         <UpdateIntervalUnits>Days</UpdateIntervalUnits>
         <UpdatePeriodically>false</UpdatePeriodically>
         <UpdateRequired>false</UpdateRequired>
         <MapFileExtensions>true</MapFileExtensions>
         <ApplicationRevision>0</ApplicationRevision>
         <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
         <IsWebBootstrapper>false</IsWebBootstrapper>
         <UseApplicationTrust>false</UseApplicationTrust>
         <BootstrapperEnabled>true</BootstrapperEnabled>
       </PropertyGroup>
       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>AnyCPU</PlatformTarget>
-...
         <ErrorReport>prompt</ErrorReport>
         <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
         <Prefer32Bit>false</Prefer32Bit>
         <WarningLevel>3</WarningLevel>
       </PropertyGroup>
       <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
         <OutputPath>..\Setup\</OutputPath>
-...
         <Compile Include="Common\Converter\SvgConverter.cs" />
         <Compile Include="Common\Converter\SvgImageConverter.cs" />
         <Compile Include="Common\FileStreamToBase64.cs" />
         <Compile Include="Common\ImageSourceHelper.cs" />
         <Compile Include="Common\ISplashMessage.cs" />
         <Compile Include="Common\SelectionSet.cs" />
         <Compile Include="Common\TempFile.cs" />
-...
           <Name>ZoomAndPan</Name>
         </ProjectReference>
       </ItemGroup>
       <ItemGroup>
         <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
           <Visible>False</Visible>
           <ProductName>.NET Framework 3.5 SP1</ProductName>
           <Install>false</Install>
         </BootstrapperPackage>
       </ItemGroup>
       <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
       <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
       <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

       <PropertyGroup>
         <ReferencePath>C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x64\;C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x86\</ReferencePath>
         <ProjectView>ProjectFiles</ProjectView>
         <PublishUrlHistory>publish\</PublishUrlHistory>
         <InstallUrlHistory />
         <SupportUrlHistory />
         <UpdateUrlHistory />
         <BootstrapperUrlHistory />
         <ErrorReportUrlHistory />
         <FallbackCulture>ko-KR</FallbackCulture>
         <VerifyUploadedFiles>false</VerifyUploadedFiles>
       </PropertyGroup>
       <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
         <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments>

                                                                   MouseMove="zoomAndPanControl_MouseMove"
                                                                   MouseUp="zoomAndPanControl_MouseUp"
                                                                   MouseLeave="zoomAndPanControl_MouseLeave"
                                                                   ScaleChanged="ZoomAndPanControl_ScaleChanged"
                                                                   MouseDoubleClick="zoomAndPanControl_MouseDoubleClick"
                                                                   ContentScale="{Binding ContentScale, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
                                                                   ContentOffsetX="{Binding ContentOffsetX, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
-...
                                                     <!--<MarkupToPDF:RectangleControl Height="200" HorizontalAlignment="Center" Name="rectangle2" StrokeColor="Black" VerticalAlignment="Top" Width="00" FillColor="Red"/>-->
                                                 </InkCanvas>
                                                 <!--강인구 추가-->
                                                     <Image Panel.ZIndex="0" x:Name="mainPanel"
                                                        Source="{Binding ImageViewPath, Source={x:Static common:ViewerDataModel.Instance}}"
                                                        Width="{Binding ImageViewWidth, Source={x:Static common:ViewerDataModel.Instance}}"
                                                        Height="{Binding ImageViewHeight, Source={x:Static common:ViewerDataModel.Instance}}" >
                                                 </Image>
                                                 <Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/>
                                                         <Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled"
                                                             Source="{Binding ImageViewPath,Mode=TwoWay,IsAsync=True, Source={x:Static common:ViewerDataModel.Instance}}"
                                                                Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
                                                             Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}">
                                                         </Image>
                                                     <Canvas x:Name="SelectLayer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="32766"/>
                                                     <Border x:Name="dragSelectionBorder" Visibility="Collapsed"
                                                         BorderBrush="Blue"
                                                         BorderThickness="1"

                 //}
+            }
             DispatcherTimer renderTesttimer;
             /// <summary>
             /// start page changing
             ///  - save controls if page is modified
-...
             /// </summary>
             /// <param name="sender"></param>
             /// <param name="e"></param>
             private void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e)
             private async void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e)
+            {
                 CompareMode.IsChecked = false;
                 var BalancePoint = ViewerDataModel.Instance.PageBalanceMode == true ? e.PageNumber + ViewerDataModel.Instance.PageBalanceNumber : e.PageNumber;
-...
                 ViewerDataModel.Instance.PageNumber = BalancePoint;
                 string uri = "";
                 if (userData.COMPANY != "EXT")
+                {
                     uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);
+                }
                 else
+                {
                     uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);
+                }
                 var pageWidth = Convert.ToDouble(e.CurrentPage.PAGE_WIDTH);
                 var pageHeight = Convert.ToDouble(e.CurrentPage.PAGE_HEIGHT);
                 var pageUri = pageNavigator.CurrentPage.PageUri;
                 var contentScale = zoomAndPanControl.ContentScale;
                 var defaultBitmapImage = new BitmapImage();
                 defaultBitmapImage.BeginInit();
                 defaultBitmapImage.CreateOptions = BitmapCreateOptions.IgnoreImageCache;
                 defaultBitmapImage.CacheOption = BitmapCacheOption.OnLoad;
                 defaultBitmapImage.UriSource = new Uri(uri);
                 defaultBitmapImage.DecodePixelWidth = Convert.ToInt32(pageWidth );
                 defaultBitmapImage.DecodePixelHeight = Convert.ToInt32(pageHeight);// * zoomAndPanControl.ContentScale
                 defaultBitmapImage.EndInit();
                 #region 이미지 로딩 수정
                 ViewerDataModel.Instance.ImageViewPath = null;
                 Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage Downloading", 1);
                 if (defaultBitmapImage.IsDownloading)
+                {
                     Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage IsDownloading", 1);
                     defaultBitmapImage.DownloadCompleted += (ex, arg) =>
+                    {
                         defaultBitmapImage.Freeze();
                         ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage;
                         ViewerDataModel.Instance.ImageViewWidth = pageWidth;
                         ViewerDataModel.Instance.ImageViewHeight = pageHeight;
                         mainPanel.UpdateLayout();
                         this.pageNavigator.ChangePage(e.PageNumber);
                         //image dispose
                         defaultBitmapImage = null;
                         GC.Collect();
                     };
+                }
                 ViewerDataModel.Instance.ImageViewPath = await ImageSourceHelper.GetDownloadImageAsync(pageUri, pageWidth * contentScale, pageHeight * contentScale);
                 zoomAndPanCanvas.Width = Convert.ToDouble(e.CurrentPage.PAGE_WIDTH);
                 zoomAndPanCanvas.Height = Convert.ToDouble(e.CurrentPage.PAGE_HEIGHT);
                 ViewerDataModel.Instance.ImageViewWidth = pageWidth;
                 ViewerDataModel.Instance.ImageViewHeight = pageHeight;
                 zoomAndPanCanvas.Width = pageWidth;
                 zoomAndPanCanvas.Height = pageHeight;
                 Common.ViewerDataModel.Instance.ContentWidth = zoomAndPanCanvas.Width;
                 Common.ViewerDataModel.Instance.ContentHeight = zoomAndPanCanvas.Height;
                 inkBoard.Width = zoomAndPanCanvas.Width;
                 inkBoard.Height = zoomAndPanCanvas.Height;
                 Common.ViewerDataModel.Instance.ContentWidth = pageWidth;
                 Common.ViewerDataModel.Instance.ContentHeight = pageHeight;
                 inkBoard.Width = pageWidth;
                 inkBoard.Height = pageHeight;
                 #endregion
                 if (!testPanel2.IsHidden)
+                {
-...
                     tlSyncPageNum.Text = String.Format("Current Page : {0}", BalancePoint);
+                }
                 this.pageNavigator.ChangePage(e.PageNumber);
+            }
             public async System.Threading.Tasks.Task<BitmapImage> GetDownloadImageAsync2(Uri uri,double pageWidth,double pageHeight)
+            {
                 BitmapImage defaultBitmapImage = new BitmapImage();
                 using (System.Net.Http.HttpClient httpClient = new System.Net.Http.HttpClient())
+                {
                     using (var responseStream = await httpClient.GetStreamAsync(uri))
+                    {
                         using (var memoryStream = new System.IO.MemoryStream())
+                        {
                             await responseStream.CopyToAsync(memoryStream);
                             defaultBitmapImage.BeginInit();
                             defaultBitmapImage.CacheOption = BitmapCacheOption.OnLoad;
                             defaultBitmapImage.StreamSource = memoryStream;
                             defaultBitmapImage.DecodePixelWidth = (int)(pageWidth * (zoomAndPanControl.ContentScale * 10));
                             defaultBitmapImage.DecodePixelHeight = (int)(pageHeight * (zoomAndPanControl.ContentScale * 10));
                             defaultBitmapImage.EndInit();
                             defaultBitmapImage.Freeze();
+                        }
+                    }
+                }
                 //defaultBitmapImage.Dispatcher.Invoke(() => {
                 //    defaultBitmapImage.BeginInit();
                 //    defaultBitmapImage.CreateOptions = BitmapCreateOptions.IgnoreImageCache;
                 //    defaultBitmapImage.CacheOption = BitmapCacheOption.OnLoad;
                 //    defaultBitmapImage.UriSource = uri;
                 //    defaultBitmapImage.DecodePixelWidth = Convert.ToInt32(pageWidth);
                 //    defaultBitmapImage.DecodePixelHeight = Convert.ToInt32(pageHeight);// * zoomAndPanControl.ContentScale
                 //    defaultBitmapImage.EndInit();
                 //    ViewerDataModel.Instance.ImageViewPath = null;
                 //    Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage Downloading", 1);
                 //    if (defaultBitmapImage.IsDownloading)
                 //    {
                 //        Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage IsDownloading", 1);
                 //        defaultBitmapImage.DownloadCompleted += (ex, arg) =>
                 //        {
                 //            defaultBitmapImage.Freeze();
                 //            ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage;
                 //            ViewerDataModel.Instance.ImageViewWidth = pageWidth;
                 //            ViewerDataModel.Instance.ImageViewHeight = pageHeight;
                 //            //image dispose
                 //            defaultBitmapImage = null;
                 //            GC.Collect();
                 //        };
                 //    }
                 //});
                 System.Diagnostics.Debug.WriteLine("이미지 다운로드");
                 return defaultBitmapImage;
+            }
             /// <summary>
-...
+                                {
                                     //if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
                                     //{
                                         var _sign = GetUserSign.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO);
                                         var _sign = GetUserSign.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO,App.isExternal);
                                         if (_sign == null)
+                                        {
-...
                 e.Effects = DragDropEffects.None;
+            }
             private async void ZoomAndPanControl_ScaleChanged(object sender, RoutedEventArgs e)
+            {
                 var pageWidth = ViewerDataModel.Instance.ImageViewWidth;
                 var pageHeight = ViewerDataModel.Instance.ImageViewHeight;
                 var pageUri = pageNavigator.CurrentPage.PageUri;
                 var contentScale = zoomAndPanControl.ContentScale;
                 ViewerDataModel.Instance.ImageViewPath = await ImageSourceHelper.GetDownloadImageAsync(pageUri, pageWidth * contentScale, pageHeight * contentScale);
+            }
             private void thumbnailPanel_SizeChanged(object sender, SizeChangedEventArgs e)
+            {
                 CommonLib.Common.WriteConfigString("SetThumbnail", "WIDTH", thumbnailPanel.Width.ToString());
+            }
             /*
             private void zoomAndPanControl_Drop(object sender, DragEventArgs e)
+            {

             /// <param name="UserID"></param>
             /// <param name="ProjectNo"></param>
             /// <returns></returns>
             public static string GetSign(string UserID, string ProjectNo)
             public static string GetSign(string UserID, string ProjectNo,bool isExternal= false)
+            {
                 BasicHttpBinding _binding;
                 EndpointAddress _EndPoint;
-...
                 _binding.TextEncoding = System.Text.Encoding.UTF8;
                 _binding.TransferMode = TransferMode.Buffered;
                 string localdomain = CommonLib.Common.GetConfigString("HOST_DOMAIN", "DOMAIN", "");
                 var ipaddress = CommonLib.DNSHelper.GetDnsAdress();
                 bool isExternal = false;
                 try
+                {
                     var hostName = Dns.GetHostEntry(ipaddress).HostName;
                     if (!hostName.EndsWith(localdomain))
+                    {
                         // 외부 사용자
                         isExternal = true;
+                    }
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());
+                }
                 string sBaseServiceURL = CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "", isExternal);
                 //CommonLib.Common.GetConfigString("BaseClientAddress", "URL", "");

             /// </summary>
             private FrameworkElement content;
             public event RoutedEventHandler ScaleChanged;
             /// <summary>
             /// The transform that is applied to the content to scale it by 'ContentScale'
             /// </summary>
-...
                     c.scrollOwner.InvalidateScrollInfo();
+                }
                 if(c.ScaleChanged != null)
+                {
                     c.ScaleChanged(c, new RoutedEventArgs());
+                }
+            }
             #endregion

ID	cdfb57ff4780f16447f02fb0203c397a3732c3cd
상위	dbc1e5b6
하위	96c13fad

프로젝트

일반

사용자정보

MARKUS

개정판 cdfb57ff