/ - Diff - MARKUS - 일정관리

개정판 6707a5c7

ID	6707a5c7d16ccd6271385271c0ffd927f7d7ade0
상위	4ca11b36
하위	44c5e27e

이지연이(가) 약 6년 전에 추가함

issue #680 temp file save add

KCOM/App.xaml.cs
62	62	return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenProperties>(jsonBack);
63	63	}
64	64
65		//20180921 LJY
66		//public ServiceDeepViewClient _Client;
67
68
69	65	private string versionPath = null;
70	66
71	67	protected override void OnStartup(StartupEventArgs e)
...	...
136	132	#else
137	133	_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
138	134	#endif
139
140		//20180913 LJY 어셈블리 버전
141		//string assemblyVersion = Assembly.LoadFile('your assembly file').GetName().Version.ToString();
142		//string fileVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion;
143		//string productVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
144		//_Client = new ServiceDeepViewClient(App._binding, App._EndPoint);
145		//var serverVersion = _Client.GetCurrentVersion();
146	135
147	136	if (Environment.Is64BitProcess == true) //64 bit machine
148	137	{
...	...
163	152
164	153	if (assemblyVersion != node.InnerText) // node.InnerText 가 null이면 catch로 빠짐
165	154	{
166		if(MessageBox.Show("Ver. " + node.InnerText + " 업데이트가 있습니다.\r\nSmartUpdate를 실행합니다.", "MARKUS", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
	155	//if(MessageBox.Show("Ver. " + node.InnerText + " 업데이트가 있습니다.\r\nSmartUpdate를 실행합니다.", "MARKUS", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
	156	//{
	157	if(MessageBox.Show("Ver. " + node.InnerText , "MARKUS", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
167	158	{
168	159	UpdateCheck(e);
169	160	}
...	...
188	179	}
189	180	catch (Exception ex)
190	181	{
191		MessageBox.Show("에러 메시지" + ex.Message);
	182	MessageBox.Show("Err" + ex.Message);
192	183	}
193	184	}
194	185

     using IKCOM;
     using KCOM.Common;
     using KCOMDataModel.DataModel;
     using KCOM.Common;
     using KCOM.Controls;
     using KCOM.Views;
     using MarkupToPDF.Common;
     using MarkupToPDF.Controls.Etc;
     using MarkupToPDF.Controls.Text;
     using MarkupToPDF.Serialize.Core;
     using MarkupToPDF.Serialize.S_Control;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Converters;
     using Newtonsoft.Json.Linq;
     using Newtonsoft.Json.Serialization;
     using System;
     using System.Collections;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Data;
     using System.IO;
     using System.Linq;
     using System.Reflection;
     using System.Runtime.Serialization.Formatters;
     using System.Runtime.Serialization.Formatters.Binary;
     using System.Runtime.Serialization.Json;
     using System.Text;
     using System.Xml;
     using System.Net;
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Documents;
     using System.Windows.Ink;
     using System.Windows.Input;
     using System.Windows.Media;
     using System.Windows.Media.Animation;
     using System.Windows.Shapes;
     using MarkupToPDF.Controls;
     using MarkupToPDF.Controls.Line;
     using MarkupToPDF.Controls.Shape;
     using MarkupToPDF.Controls.Polygon;
     using MarkupToPDF.Controls.Common.ValueConverter;
     using System.Collections.ObjectModel;
     using MarkupToPDF.Controls.Common;
     using System.Xml;
     using System.Xml.Serialization;
     namespace KCOM
+    {
+    {
         public class TempFile
+        {
             // public Undo_data UndoData { get; set; }
             public class MarkupReturn
+            {
                 public string ConvertData { get; set; }
-...
                 public string CommentID { get; set; }
+            }
             public string shortGuid()
+            {
                 byte[] bytes = new byte[16];
                 using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create())
+                {
                     provider.GetBytes(bytes);
+                }
                 var guid = new Guid(bytes);
                 return Convert.ToBase64String(guid.ToByteArray())
                     .Substring(0, 10)
                     .Replace("/", "")
                     .Replace("+", "") + DateTime.UtcNow.Ticks.ToString("x");
+            }
             //MarkupReturn Data = new MarkupReturn();
             public MarkupReturn MarkupToString(CommentUserInfo Control, string UserId)
+            {
                 MarkupReturn Data = new MarkupReturn();
                 Data.ConvertData = "";
                 Data.DATA_TYPE = 0;
                 Data.CommentID = Control.CommentID;
                 if (Data.CommentID == null)
+                {
                     Data.CommentID = shortGuid();
+                }
                 String ConvertData = "";
                 //int DATA_TYPE = 0;
                 #region ######### 마크업 파싱##########
                 switch (Control.GetType().Name.ToString())
+                {
                     #region Line
                     #region Arrow_Multi
                     case "ArrowControl_Multi":
                         using (S_ArrowControl_Multi STemp = new S_ArrowControl_Multi())
+                        {
                             var instance = Control as ArrowControl_Multi;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.UserID = UserId;
                             STemp.Opac = instance.Opacity;
                             STemp.DashSize = instance.DashSize;
                             STemp.MidPoint = instance.MiddlePoint;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #region Line
                     case "LineControl":
                         using (S_LineControl STemp = new S_LineControl())
+                        {
                             var instance = Control as LineControl;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.LineStyleSet = instance.LineStyleSet;
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.UserID = UserId;
                             STemp.Opac = instance.Opacity;
                            // STemp.DashSize = instance.DashSize;
                             STemp.Interval = instance.Interval;
                             STemp.DimSize = instance.DimSize;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             //var item = JsonSerializerHelper.UnCompressString(Data.ConvertData); //언패킹작업
                             //using (S_LineControl s = JsonSerializerHelper.JsonDeserialize<S_LineControl>(item))
                             //{
                             //    LineControl ins = new LineControl()
                             //    {
                             //        Memo = s.Memo
                             //    };
                             //}
                         };
                         break;
                     #endregion
                     #region Arc
                     case "ArcControl":
                         using (S_ArcControl STemp = new S_ArcControl())
+                        {
                             var instance = Control as ArcControl;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             //STemp.StrokeColor = "#FF000FFF";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.UserID = UserId;
                             STemp.Opac = instance.Opacity;
                             STemp.MidPoint = instance.MidPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.IsTransOn = instance.isTransOn;
                             STemp.DashSize = instance.DashSize;
                             STemp.Clock = instance.Clock;
                             //STemp.ArcStyleSet = instance.ControlType;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #endregion
                     #region Shape
                     #region RectCloud
                     case "RectCloudControl":
+                        {
                             using (S_RectCloudControl STemp = new S_RectCloudControl())
+                            {
                                 var instance = Control as RectCloudControl;
                                 STemp.TransformPoint = "0|0";
                                 STemp.PointSet = instance.PointSet;
                                 STemp.SizeSet = String.Format("{0}", instance.LineSize);
                                 //STemp.StrokeColor = "#FF00FF00";
                                 STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                                 STemp.StartPoint = instance.StartPoint;
                                 STemp.UserID = UserId;
                                 STemp.Opac = instance.Opacity;
                                 STemp.TR = instance.TopRightPoint;
                                 STemp.LB = instance.LeftBottomPoint;
                                 STemp.EndPoint = instance.EndPoint;
                                 STemp.PaintState = instance.Paint;
                                 STemp.DashSize = instance.DashSize;
                                 STemp.ArcLength = instance.ArcLength;
                                 STemp.Name = instance.GetType().Name.ToString();
                                 ///강인구 추가(2017.11.02)
                                 ///Memo 추가
                                 STemp.Memo = instance.Memo;
                                 ///강인구 추가(2017.11.02)
                                 ///DATA_TYPE추가로 인한 클래스 변수 대입
                                 //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                                 Data.DATA_TYPE = (int)(instance.ControlType);
                                 Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                            }
+                        }
                         break;
                     #endregion
                     #region Circle
                     case "CircleControl":
                         using (S_CircleControl STemp = new S_CircleControl())
+                        {
                             var instance = Control as CircleControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.PaintState = instance.Paint;
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             if (instance.FillColor != null)
+                            {
                                 STemp.FillColor = instance.FillColor.Color.ToString();
+                            }
                             STemp.StartPoint = instance.StartPoint;
                             STemp.UserID = UserId;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.TRP = instance.TopRightPoint;
                             STemp.LBP = instance.LeftBottomPoint;
                             STemp.Opac = instance.Opacity;
                             STemp.Angle = instance.Angle;
                             STemp.PointSet = instance.PointSet;
                             STemp.DashSize = instance.DashSize;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #region Rectangle
                     case "RectangleControl":
                         using (S_RectControl STemp = new S_RectControl())
+                        {
                             var instance = Control as RectangleControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.PaintState = instance.Paint;
                             STemp.PointSet = instance.PointSet;
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             if (instance.FillColor != null)
+                            {
                                 STemp.FillColor = instance.FillColor.Color.ToString();
+                            }
                             STemp.StartPoint = instance.StartPoint;
                             STemp.UserID = UserId;
                             //STemp.Angle = instance.a;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.LB = instance.LeftBottomPoint;
                             STemp.TR = instance.TopRightPoint;
                             STemp.DashSize = instance.DashSize;
                             STemp.Opac = instance.Opacity;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #region Triangle
                     case "TriControl":
                         using (S_TriControl STemp = new S_TriControl())
+                        {
                             var instance = Control as TriControl;
                             STemp.TransformPoint = "0|0";
                             STemp.Paint = instance.Paint;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             if (instance.FillColor != null)
+                            {
                                 STemp.FillColor = instance.FillColor.Color.ToString();
+                            }
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.MidPoint = instance.MidPoint;
                             STemp.Opac = instance.Opacity;
                             STemp.UserID = UserId;
                             STemp.PointSet = instance.PointSet;
                             STemp.Angle = instance.Angle;
                             STemp.DashSize = instance.DashSize;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #endregion
                     #region Polygon
                     #region Poly
                     case "PolygonControl":
                         using (S_PolyControl STemp = new S_PolyControl())
+                        {
                             var instance = Control as PolygonControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             //STemp.StrokeColor = "#FF000FFF";
                             STemp.Name = instance.GetType().Name.ToString();
                             //STemp.Toler = instance.Toler;
                             STemp.PaintState = instance.Paint;
                             STemp.Opac = instance.Opacity;
                             STemp.UserID = UserId;
                             STemp.PaintState = instance.Paint;
                             //강인구 추가(Chain인지 Polygon인지 구분)
                             STemp.Type = instance.ControlType;
                             //STemp.IsTrans = instance.isTransOn;
                             //STemp.IsChain = instance.isChain;
                             STemp.PointSet = new List<Point>();
                             STemp.DashSize = instance.DashSize;
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.IsCompleted = instance.IsCompleted;
                             foreach (var point in instance.PointSet)
+                            {
                                 STemp.PointSet.Add(point);
+                            }
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #region InkControl
                     case "InkControl":
                         using (S_PolyControl STemp = new S_PolyControl())
+                        {
                             var instance = Control as InkControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             //STemp.StrokeColor = "#FF000FFF";
                             STemp.Name = instance.GetType().Name.ToString();
                             //STemp.Toler = instance.Toler;
                             STemp.PaintState = instance.Paint;
                             STemp.Opac = instance.Opacity;
                             STemp.UserID = UserId;
                             STemp.PaintState = instance.Paint;
                             //강인구 추가(Chain인지 Polygon인지 구분)
                             STemp.Type = instance.ControlType;
                             //STemp.IsTrans = instance.isTransOn;
                             //STemp.IsChain = instance.isChain;
                             STemp.PointSet = new List<Point>();
                             STemp.DashSize = instance.DashSize;
                             STemp.IsCompleted = instance.IsCompleted;
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             foreach (var point in instance.PointSet)
+                            {
                                 STemp.PointSet.Add(point);
+                            }
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #region Cloud
                     case "CloudControl":
                         using (S_CloudControl STemp = new S_CloudControl())
+                        {
                             var instance = Control as CloudControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             //STemp.StrokeColor = "#FF000FFF";
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.Name = instance.GetType().Name.ToString();
                             STemp.Toler = instance.Toler;
                             STemp.PaintState = instance.Paint;
                             STemp.Opac = instance.Opacity;
                             STemp.UserID = UserId;
                             STemp.IsTrans = instance.isTransOn;
                             STemp.IsChain = instance.isChain;
                             STemp.PointSet = new List<Point>();
                             STemp.DashSize = instance.DashSize;
                             STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.ArcLength = instance.ArcLength;
                             foreach (var point in instance.PointSet)
+                            {
                                 STemp.PointSet.Add(point);
+                            }
                             //STemp.CloudFill = instance.Fill;
                             STemp.ArcLength = instance.ArcLength;
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #endregion
                     #region Text
                     #region Text
                     case "TextControl":
                         using (S_TextControl STemp = new S_TextControl())
+                        {
                             var instance = Control as TextControl;
                             STemp.TransformPoint = "0|0";
                             STemp.SizeSet = String.Format("{0}|{1}", instance.LineSize.Left.ToString(), instance.TextSize.ToString());
                             STemp.Text = instance.Text;
                             STemp.UserID = UserId;
                             STemp.FontColor = instance.FontColor.Color.ToString();
                             //STemp.FontColor = "#FFFFFF00";
                             if (instance.StartPoint == new Point())
                                 STemp.StartPoint = new Point(instance.CanvasX, instance.CanvasY);
                             else
                                 STemp.StartPoint = instance.StartPoint;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.Opac = instance.Opacity;
                             STemp.PointSet = instance.PointSet;
                             STemp.Angle = instance.Angle;
                             STemp.paintMethod = instance.ControlType_No;
                             STemp.BoxW = instance.BoxWidth;
                             STemp.BoxH = instance.BoxHeight;
                             STemp.isHighLight = instance.IsHighLight;
                             STemp.Name = instance.GetType().Name.ToString();
                             STemp.fontConfig = new List<string>()
+                                {
                                     instance.TextFamily.ToString(),
                                     instance.TextStyle.ToString(),
                                     instance.TextWeight.ToString(),
                                 };
                             if (instance.UnderLine != null)
+                            {
                                 STemp.fontConfig.Add("true");
+                            }
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #region ArrowText
                     case "ArrowTextControl":
                         using (S_ArrowTextControl STemp = new S_ArrowTextControl())
+                        {
                             var instance = Control as ArrowTextControl;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize);
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.ArrowStyle = instance.ArrowTextStyle;
                             //STemp.StrokeColor = "#FF00FF00";
                             STemp.UserID = UserId;
                             STemp.ArrowText = instance.Base_TextBox.Text;
                             STemp.BorderSize = instance.BorderSize;
                             STemp.isHighLight = instance.isHighLight;
                             STemp.BoxHeight = instance.BoxHeight;
                             STemp.BoxWidth = instance.BoxWidth;
                             STemp.Opac = instance.Opacity;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.isFixed = instance.isFixed;
                             //STemp.DashSize = instance.DashSize;
                             STemp.Name = instance.GetType().Name.ToString();
                             STemp.isTrans = instance.isTrans;
                             STemp.MidPoint = instance.MidPoint;
                             STemp.Angle = instance.Angle;
                             STemp.fontConfig = new List<string>()
+                                {
                                     instance.TextFamily.ToString(),
                                     instance.TextStyle.ToString(),
                                     instance.TextWeight.ToString(),
                                     instance.TextSize.ToString(),
                                 };
                             if (instance.UnderLine != null)
+                            {
                                 STemp.fontConfig.Add("true");
+                            }
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                         };
                         break;
                     #endregion
                     #endregion
                     #region ETC
                     #region Sign
                     case "SignControl":
+                        {
                             //강인구 추가
                             using (S_SignControl STemp = new S_SignControl())
+                            {
                                 SignControl instance = Control as SignControl;
                                 STemp.Angle = instance.Angle;
                                 STemp.EndPoint = instance.EndPoint;
                                 STemp.UserID = UserId;
                                 STemp.LB = instance.LeftBottomPoint;
                                 STemp.Name = instance.GetType().Name;
                                 STemp.PointSet = instance.PointSet;
                                 STemp.StartPoint = instance.StartPoint;
                                 STemp.Opac = instance.Opacity;
                                 STemp.TR = instance.TopRightPoint;
                                 STemp.UserNumber = instance.UserNumber == null ? UserId : instance.UserNumber;
                                 ///강인구 추가(2017.11.02)
                                 ///Memo 추가
                                 STemp.Memo = instance.Memo;
                                 ///강인구 추가(2017.11.02)
                                 ///DATA_TYPE추가로 인한 클래스 변수 대입
                                 //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                                 Data.DATA_TYPE = (int)(instance.ControlType);
                                 Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                            }
+                        }
                         break;
                     #endregion
                     //변경 필요
                     #region Ink
                     case "InkPresenter":
+                        {
                             //var instance = item as InkPresenter;
                             //if (instance.Strokes.Count >= 1)
                             //{
                             //    using (S_PensilControl STemp = new S_PensilControl())
                             //    {
                             //        bool isRealData = true;
                             //        foreach (var strokeData in instance.Strokes)
                             //        {
                             //            if (strokeData.StylusPoints.Count == 0)
                             //            {
                             //                isRealData = false;
                             //            }
                             //        }
                             //        if (isRealData)
                             //        {
                             //            if (instance.Tag != null)
                             //            {
                             //                STemp.UserID = instance.Tag.ToString();
                             //            }
                             //            STemp.SCC = instance.Strokes;
                             //            STemp.Name = instance.GetType().Name;
                             //            STemp.Opac = instance.Opacity;
                             //            STemp.TransformPoint = "0|0";
                             //            ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             //        }
                             //    }
                             //}
+                        }
                         break;
                     #endregion
                     #region Date
                     case "DateControl":
+                        {
                             using (S_DateControl STemp = new S_DateControl())
+                            {
                                 DateControl instance = Control as DateControl;
                                 STemp.Angle = instance.Angle;
                                 STemp.EndPoint = instance.EndPoint;
                                 STemp.UserID = UserId;
                                 STemp.LB = instance.LeftBottomPoint;
                                 STemp.Name = instance.GetType().Name;
                                 STemp.PointSet = instance.PointSet;
                                 STemp.StartPoint = instance.StartPoint;
                                 STemp.Opac = instance.Opacity;
                                 STemp.TR = instance.TopRightPoint;
                                 STemp.TransformPoint = "0|0";
                                 STemp.FontColor = instance.FontColor.Color.ToString();
                                 //STemp.FontColor = "#FFFFFF00";
                                 STemp.SizeSet = String.Format("{0}", instance.LineSize);
                                 STemp.Text = instance.Text;
                                 ///강인구 추가(2017.11.02)
                                 ///Memo 추가
                                 STemp.Memo = instance.Memo;
                                 ///강인구 추가(2017.11.02)
                                 ///DATA_TYPE추가로 인한 클래스 변수 대입
                                 //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                                 Data.DATA_TYPE = (int)(instance.ControlType);
                                 Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                            }
+                        }
                         break;
                     #endregion
                     #region Symbol
                     case "SymControl":
                         using (S_SymControl STemp = new S_SymControl())
+                        {
                             var instance = Control as SymControl;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             STemp.UserID = UserId;
                             STemp.SizeSet = String.Format("{0}", instance.LineSize.ToString());
                             STemp.PaintState = instance.Paint;
                             STemp.PathInfo = instance.PathData.ToString();
                             STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.Angle = instance.Angle;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.LB = instance.LeftBottomPoint;
                             STemp.TR = instance.TopRightPoint;
                             STemp.Opac = instance.Opacity;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #region SymbolN
                     case "SymControlN":
                         using (S_SymControlN STemp = new S_SymControlN())
+                        {
                             var instance = Control as SymControlN;
                             STemp.TransformPoint = "0|0";
                             STemp.PointSet = instance.PointSet;
                             //STemp.XamlData = instance.PathXathData;
                             STemp.UserID = UserId;
                             STemp.DBData = instance.PathXathData;
                             //STemp.StrokeColor = instance.StrokeColor.Color.ToString();
                             STemp.StartPoint = instance.StartPoint;
                             STemp.Angle = instance.Angle;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.LB = instance.LeftBottomPoint;
                             STemp.TR = instance.TopRightPoint;
                             STemp.Opac = instance.Opacity;
                             STemp.Name = instance.GetType().Name.ToString();
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #region Image
                     case "ImgControl":
                         using (S_ImgControl STemp = new S_ImgControl())
+                        {
                             ImgControl instance = Control as ImgControl;
                             STemp.Angle = instance.Angle;
                             STemp.EndPoint = instance.EndPoint;
                             STemp.LB = instance.LeftBottomPoint;
                             STemp.Name = instance.GetType().Name;
                             STemp.PointSet = instance.PointSet;
                             STemp.StartPoint = instance.StartPoint;
                             STemp.UserID = UserId;
                             STemp.Opac = instance.Opacity;
                             STemp.TR = instance.TopRightPoint;
                             STemp.ImagePath = instance.FilePath;
                             ///강인구 추가(2017.11.02)
                             ///Memo 추가
                             STemp.Memo = instance.Memo;
                             ///강인구 추가(2017.11.02)
                             ///DATA_TYPE추가로 인한 클래스 변수 대입
                             //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
                             Data.DATA_TYPE = (int)(instance.ControlType);
                             Data.ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
+                        }
                         break;
                     #endregion
                     #endregion
                     default:
                         break;
+                }
                 #endregion
                 //return ConvertData;
                 return Data;
+            }
             public CommentUserInfo GetControlList() //추가 코드..!
+            {
                 CommentUserInfo aa = new CommentUserInfo();
                 return aa;
+            }
             MarkupToPDF.Controls.Parsing.LayerControl layerControl = new MarkupToPDF.Controls.Parsing.LayerControl();
             public void AddTemp(CommentUserInfo currentControl, int PageNumber)
             public static string PathString = AppDomain.CurrentDomain.BaseDirectory + "Temp";
             public static string FilePath = PathString + "\\" + App.ViewInfo.DocumentItemID + ".tmp";
             internal void WriteTemp(List<MainMenu.TempDt> tempDtList)
+            {
                 try
                 if (tempDtList.Count > 0)
+                {
                     XmlDocument xmlDoc;
                     XmlElement xmlEle1, xmlEle2, xmlEle3, xmlEle4;
                     XmlElement xmlEle1, xmlEle2, xmlEle3, xmlEle4, xmlEle5, xmlEle6;
                     XmlNode newNode;
                     XmlElement xmlEle;
                     xmlDoc = new XmlDocument();
                     if(!File.Exists(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"))
                     if ((System.IO.File.Exists(FilePath)) == false)
+                    {
                         if (!File.Exists(PathString))
+                        {
                             Directory.CreateDirectory(PathString);
+                        }
                         XmlWriterSettings settings = new XmlWriterSettings();
                         settings.Indent = true;
                         settings.NewLineOnAttributes = true;
                         XmlWriter xmlWriter = XmlWriter.Create(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml");
                         XmlWriter xmlWriter = XmlWriter.Create(FilePath);
                         xmlWriter.WriteStartDocument();
                         xmlWriter.WriteStartElement("Root");
                         xmlWriter.WriteEndDocument();
                         xmlWriter.Flush();
                         xmlWriter.Close();
+                    }
                     xmlDoc.Load(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 로딩
                     var root = layerControl.MarkupToString(currentControl, App.ViewInfo.UserID);
                     xmlDoc.Load(FilePath); // XML문서 로딩
                     var nodes = xmlDoc.SelectNodes("/Root/CommentID");
                     for (int i = 0; i < tempDtList.Count; i++)
+                    {
                         bool check = true;
                     newNode = xmlDoc.SelectSingleNode("Root"); // 추가할 부모 Node 찾기
                     xmlEle = xmlDoc.CreateElement("CommentID");
                     xmlEle.SetAttribute("Value", root.CommentID);
                     newNode.AppendChild(xmlEle);
                         foreach (XmlNode e in xmlDoc.GetElementsByTagName("CommentID"))
+                        {
                             if (e.Attributes["Value"].Value.Equals(tempDtList[i].CommentID)) //CommentID가 같은경우
+                            {
                                 //데이터 수정
                                 e.SelectSingleNode("ConvertData").InnerText = tempDtList[i].ConvertData;
                                 e.SelectSingleNode("DATA_TYPE").InnerText = tempDtList[i].DATA_TYPE.ToString();
                                 e.SelectSingleNode("MarkupInfoID").InnerText = tempDtList[i].MarkupInfoID;
                                 e.SelectSingleNode("PageNumber").InnerText = tempDtList[i].PageNumber.ToString();
                                 e.SelectSingleNode("IsUpdate").InnerText = tempDtList[i].IsUpdate.ToString();
                     xmlEle1 = xmlDoc.CreateElement("MarkupInfoID"); // 추가할 Node 생성
                     xmlEle1.InnerText = currentControl.MarkupInfoID;
                     xmlEle.AppendChild(xmlEle1);
                                 xmlDoc.Save(FilePath); // XML문서 저장
                     xmlEle2 = xmlDoc.CreateElement("ConvertData"); // 추가할 Node 생성
                     xmlEle2.InnerText = root.ConvertData;
                     xmlEle.AppendChild(xmlEle2);
                                 check = false;
                                 break;
+                            }
+                        }
                     xmlEle3 = xmlDoc.CreateElement("DATA_TYPE"); // 추가할 Node 생성
                     xmlEle3.InnerText = root.DATA_TYPE.ToString();
                     xmlEle.AppendChild(xmlEle3);
                         if (check == true)
+                        {
                             newNode = xmlDoc.SelectSingleNode("Root"); // 추가할 부모 Node 찾기
                             xmlEle1 = xmlDoc.CreateElement("CommentID");
                             xmlEle1.SetAttribute("Value", tempDtList[i].CommentID);
                             newNode.AppendChild(xmlEle1);
                     xmlEle4 = xmlDoc.CreateElement("PageNumber"); // 추가할 Node 생성
                     xmlEle4.InnerText = PageNumber.ToString();
                     xmlEle.AppendChild(xmlEle4);
                             xmlEle2 = xmlDoc.CreateElement("ConvertData"); // 추가할 Node 생성
                             xmlEle2.InnerText = tempDtList[i].ConvertData;
                             xmlEle1.AppendChild(xmlEle2);
                             xmlEle3 = xmlDoc.CreateElement("DATA_TYPE"); // 추가할 Node 생성
                             xmlEle3.InnerText = tempDtList[i].DATA_TYPE.ToString();
                             xmlEle1.AppendChild(xmlEle3);
                     xmlDoc.Save(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 저장..
                     xmlDoc = null;
                             xmlEle4 = xmlDoc.CreateElement("MarkupInfoID"); // 추가할 Node 생성
                             xmlEle4.InnerText = tempDtList[i].MarkupInfoID;
                             xmlEle1.AppendChild(xmlEle4);
+                }
                 catch(Exception ex)
+                {
                             xmlEle5 = xmlDoc.CreateElement("PageNumber"); // 추가할 Node 생성
                             xmlEle5.InnerText = tempDtList[i].PageNumber.ToString();
                             xmlEle1.AppendChild(xmlEle5);
+                }
+            }
                             xmlEle6 = xmlDoc.CreateElement("IsUpdate");
                             xmlEle6.InnerText = tempDtList[i].IsUpdate.ToString();
                             xmlEle1.AppendChild(xmlEle6);
             public void Remove() //저장 완료시 파일 삭제
+            {
                 FileInfo fileDel = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml");
                 if (fileDel.Exists) //삭제할 파일이 있는지
+                {
                     fileDel.Delete(); //없어도 에러안남
                             xmlDoc.Save(FilePath); // XML문서 저장..
+                        }
+                    }
                     xmlDoc = null;
+                }
+            }
             public const int DELETE = 0;
             public const int MOVE = 1;
             public void DataDel(string CommentID) //Control 삭제시
             public void AddTemp(MarkupToPDF.Common.Undo_data undoDataList, int PageNumber, double x, double y)
+            {
                 FileInfo fileEdit = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml");
                 if (fileEdit.Exists) //수정할 파일이 있는지
+                {
                     XmlDocument xmlDoc;
                     xmlDoc = new XmlDocument();
                     xmlDoc.Load(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 로딩
                 XmlDocument xmlDoc;
                 XmlElement xmlEle1, xmlEle2, xmlEle3, xmlEle4, xmlEle5, xmlEle6;
                 XmlNode newNode;
                 xmlDoc = new XmlDocument();
                     var nodes = xmlDoc.SelectNodes("/Root/CommentID");
                     XmlElement root = xmlDoc.DocumentElement;
                     foreach (XmlNode node in nodes)
                 if ((System.IO.File.Exists(FilePath)) == false)
+                {
                     if (!File.Exists(PathString))
+                    {
                         string sCommentID = node.Attributes["Value"].Value;
                         Directory.CreateDirectory(PathString);
+                    }
                         if (sCommentID == CommentID)
+                        {
                             root.RemoveChild(xmlDoc.SelectNodes("//CommentID[@Value='" + CommentID + "']")[0]);
+                        }
+                    }
                     XmlWriterSettings settings = new XmlWriterSettings();
                     settings.Indent = true;
                     settings.NewLineOnAttributes = true;
                     xmlDoc.Save(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 저장
                     xmlDoc = null;
                     XmlWriter xmlWriter = XmlWriter.Create(FilePath);
                     xmlWriter.WriteStartDocument();
                     xmlWriter.WriteStartElement("Root");
                     xmlWriter.WriteEndDocument();
                     xmlWriter.Flush();
                     xmlWriter.Close();
+                }
                 else
                 xmlDoc.Load(FilePath); // XML문서 로딩
                 var nodes = xmlDoc.SelectNodes("/Root/CommentID");
                 for (int i = 0; i < undoDataList.Markup_List.Count; i++)
+                {
                     MessageBox.Show("TEST : 임시파일이없음!!에러!!");
+                }
+            }
                     var root = layerControl.MarkupToString(undoDataList.Markup_List[i].Markup, App.ViewInfo.UserID);
                     bool check = true;
                     foreach (XmlNode e in xmlDoc.GetElementsByTagName("CommentID"))
+                    {
                         if (e.Attributes["Value"].Value.Equals(root.CommentID)) //CommentID가 같은경우
+                        {
                             //데이터 수정
                             e.SelectSingleNode("ConvertData").InnerText = root.ConvertData;
                             e.SelectSingleNode("DATA_TYPE").InnerText = root.DATA_TYPE.ToString();
                             e.SelectSingleNode("MarkupInfoID").InnerText = undoDataList.Markup_List[i].Markup.MarkupInfoID;
                             e.SelectSingleNode("PageNumber").InnerText = PageNumber.ToString();
                             e.SelectSingleNode("IsUpdate").InnerText = 1.ToString();
                             xmlDoc.Save(FilePath); // XML문서 저장
             public void DELADDTemp(CommentUserInfo currentControl, int PageNumber)
+            {
                 try
+                {
                     XmlDocument xmlDoc;
                     XmlElement xmlEle1, xmlEle2, xmlEle3, xmlEle4;
                     XmlNode newNode;
                     XmlElement xmlEle;
                     xmlDoc = new XmlDocument();
                             check = false;
                             break;
+                        }
+                    }
                     if (!File.Exists(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"))
                     if (check == true)
+                    {
                         XmlWriterSettings settings = new XmlWriterSettings();
                         settings.Indent = true;
                         settings.NewLineOnAttributes = true;
                         XmlWriter xmlWriter = XmlWriter.Create(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml");
                         xmlWriter.WriteStartDocument();
                         xmlWriter.WriteStartElement("Root");
                         newNode = xmlDoc.SelectSingleNode("Root");
                         xmlEle1 = xmlDoc.CreateElement("CommentID");
                         xmlEle1.SetAttribute("Value", root.CommentID);
                         newNode.AppendChild(xmlEle1);
                         xmlWriter.WriteEndDocument();
                         xmlEle2 = xmlDoc.CreateElement("ConvertData");
                         xmlEle2.InnerText = root.ConvertData;
                         xmlEle1.AppendChild(xmlEle2);
                         xmlWriter.Flush();
                         xmlWriter.Close();
+                    }
                         xmlEle3 = xmlDoc.CreateElement("DATA_TYPE");
                         xmlEle3.InnerText = root.DATA_TYPE.ToString();
                         xmlEle1.AppendChild(xmlEle3);
                     xmlDoc.Load(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 로딩
                         xmlEle4 = xmlDoc.CreateElement("MarkupInfoID");
                         xmlEle4.InnerText = undoDataList.Markup_List[i].Markup.MarkupInfoID;
                         xmlEle1.AppendChild(xmlEle4);
                     var nodes = xmlDoc.SelectNodes("/Root/CommentID");
                     XmlElement root = xmlDoc.DocumentElement;
                         xmlEle5 = xmlDoc.CreateElement("PageNumber");
                         xmlEle5.InnerText = PageNumber.ToString();
                         xmlEle1.AppendChild(xmlEle5);
                     foreach (XmlNode node in nodes)
+                    {
                         string sCommentID = node.Attributes["Value"].Value;
                         xmlEle6 = xmlDoc.CreateElement("IsUpdate");
                         xmlEle6.InnerText = 1.ToString();
                         xmlEle1.AppendChild(xmlEle6);
                         if (sCommentID == currentControl.CommentID)
+                        {
                             root.RemoveChild(xmlDoc.SelectNodes("//CommentID[@Value='" + currentControl.CommentID + "']")[0]);
+                        }
                         xmlDoc.Save(FilePath);
+                    }
+                }
                 xmlDoc = null;
+            }
             public void Remove()
+            {
                 FileInfo fileDel = new FileInfo(FilePath);
                 if (fileDel.Exists)
+                {
                     fileDel.Delete();
+                }
+            }
                     var root1 = layerControl.MarkupToString(currentControl, App.ViewInfo.UserID);
             internal void DelTemp(string CommentID, string PageNumber) //Control 삭제시
+            {
                 if ((System.IO.File.Exists(FilePath)) == false)
+                {
                     if (!File.Exists(PathString))
+                    {
                         Directory.CreateDirectory(PathString);
+                    }
                     newNode = xmlDoc.SelectSingleNode("Root"); // 추가할 부모 Node 찾기
                     xmlEle = xmlDoc.CreateElement("CommentID");
                     xmlEle.SetAttribute("Value", root1.CommentID);
                     newNode.AppendChild(xmlEle);
                     XmlWriterSettings settings = new XmlWriterSettings();
                     settings.Indent = true;
                     settings.NewLineOnAttributes = true;
                     xmlEle1 = xmlDoc.CreateElement("MarkupInfoID"); // 추가할 Node 생성
                     xmlEle1.InnerText = currentControl.MarkupInfoID;
                     xmlEle.AppendChild(xmlEle1);
                     XmlWriter xmlWriter = XmlWriter.Create(FilePath);
                     xmlWriter.WriteStartDocument();
                     xmlWriter.WriteStartElement("Root");
                     xmlWriter.WriteEndDocument();
                     xmlEle2 = xmlDoc.CreateElement("ConvertData"); // 추가할 Node 생성
                     xmlEle2.InnerText = root1.ConvertData;
                     xmlEle.AppendChild(xmlEle2);
                     xmlWriter.Flush();
                     xmlWriter.Close();
+                }
                     xmlEle3 = xmlDoc.CreateElement("DATA_TYPE"); // 추가할 Node 생성
                     xmlEle3.InnerText = root1.DATA_TYPE.ToString();
                     xmlEle.AppendChild(xmlEle3);
                 XmlDocument xmlDoc;
                 xmlDoc = new XmlDocument();
                 xmlDoc.Load(FilePath);
                     xmlEle4 = xmlDoc.CreateElement("PageNumber"); // 추가할 Node 생성
                     xmlEle4.InnerText = PageNumber.ToString();
                     xmlEle.AppendChild(xmlEle4);
                 var nodes = xmlDoc.SelectNodes("/Root/CommentID");
                 XmlElement root = xmlDoc.DocumentElement;
                     xmlDoc.Save(AppDomain.CurrentDomain.BaseDirectory + "ControlLog.xml"); // XML문서 저장..
                     xmlDoc = null;
                 bool check = true;
+                }
                 catch (Exception ex)
                 /*
                 foreach (XmlNode node in nodes)
+                {
                     string sCommentID = node.Attributes["Value"].Value;
                     if (sCommentID == CommentID)
+                    {
                         root.RemoveChild(xmlDoc.SelectNodes("//CommentID[@Value='" + CommentID + "']")[0]);
                         check = false;
+                    }
                 }*/
                 if (check == true)
+                {
                     XmlElement xmlEle1, xmlEle2, xmlEle3, xmlEle4, xmlEle5, xmlEle6;
                     XmlNode newNode;
                     newNode = xmlDoc.SelectSingleNode("Root");
                     xmlEle1 = xmlDoc.CreateElement("CommentID");
                     xmlEle1.SetAttribute("Value", CommentID);
                     newNode.AppendChild(xmlEle1);
                     xmlEle2 = xmlDoc.CreateElement("ConvertData");
                     xmlEle2.InnerText = "";
                     xmlEle1.AppendChild(xmlEle2);
                     xmlEle3 = xmlDoc.CreateElement("DATA_TYPE");
                     xmlEle3.InnerText = "";
                     xmlEle1.AppendChild(xmlEle3);
                     xmlEle4 = xmlDoc.CreateElement("MarkupInfoID");
                     xmlEle4.InnerText = "";
                     xmlEle1.AppendChild(xmlEle4);
                     xmlEle5 = xmlDoc.CreateElement("PageNumber");
                     xmlEle5.InnerText = PageNumber;
                     xmlEle1.AppendChild(xmlEle5);
                     xmlEle6 = xmlDoc.CreateElement("IsUpdate");
                     xmlEle6.InnerText = 2.ToString();
                     xmlEle1.AppendChild(xmlEle6);
+                }
+            }
                 xmlDoc.Save(FilePath);
                 xmlDoc = null;
+            }
+        }
+    }

     using KCOMDataModel.DataModel;
     //using Leadtools;
     using MarkupToPDF.Common;
     using Newtonsoft.Json;
     using System;
     using System.Collections;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
     using System.IO;
     using System.Linq;
     using System.Text;
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Ink;
     using System.Windows.Media;
     using System.Xml;
     using System.Xml.Serialization;
     //using IKCOM;
     namespace KCOM.Common
-...
             //private List<Check_Inferface> check_Item = new List<Check_Inferface>();
             private ObservableCollection<KCOMDataModel.DataModel.DOCPAGE> document_Info = new ObservableCollection<KCOMDataModel.DataModel.DOCPAGE>();
             private ObservableCollection<Undo_data> undoDataList = new ObservableCollection<Undo_data>();
             //public  UndoDataList { get; set; }
-...
                     return markupControls_Sync;
+                }
+            }
             public int current_page_commentcnt = 0;
             public ObservableCollection<CommentUserInfo> MarkupControls_USER
+            {
                 get
-...
                     return undoDataList;
+                }
+            }
             public StrokeCollection MarkupPens
+            {
                 get
-...
                 this.DashSize = new DoubleCollection();
                 this.SaveInterval = 5;
+            }
+            }
             #region INotifyPropertyChanged Event
             private void OnPropertyChanged(string name)

                         #endregion
                         #region 텍스트
                         if (item.Drawingtype == ControlType.TextControl)
+                        {
+                        {
                             Point dx = MathSet.RotateAbout(new Point(0, 0), new Point(e.HorizontalChange, e.VerticalChange), trRotate.Angle);
                             Canvas.SetLeft((item.DrawingData as TextControl), Canvas.GetLeft((item.DrawingData as TextControl)) + dx.X);
                             Canvas.SetTop((item.DrawingData as TextControl), Canvas.GetTop((item.DrawingData as TextControl)) + dx.Y);
                             (item.DrawingData as TextControl).StartPoint =
                             new Point(Canvas.GetLeft((item.DrawingData as TextControl)) + e.HorizontalChange / 5, Canvas.GetTop((item.DrawingData as TextControl)) + e.VerticalChange / 5);
                             (item.DrawingData as TextControl).EndPoint = (item.DrawingData as TextControl).StartPoint;
                             // Point endPointV = new Point(Data.Bounds.Right, Data.Bounds.Bottom);
                             //Point middle = MathSet.getMiddlePoint((item.DrawingData as TextControl).StartPoint, (item.DrawingData as TextControl).EndPoint);
                             TextControlChanger();
+                        }
                         #endregion
                         #region 날짜

KCOM/Events/Event_KeyEvent.cs
9	9	using System.Windows.Controls;
10	10	using System.Windows.Input;
11	11	using Telerik.Windows.Controls;
	12	using static KCOM.Views.MainMenu;
12	13
13	14	namespace KCOM
14	15	{
...	...
25	26	//강인구 추가
26	27	MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
27	28
	29	//임시파일관련
	30	TempFile temp = new TempFile();
	31
28	32	public void KeyEventDownAction(object sender, KeyEventArgs e)
29	33	{
30	34
...	...
205	209	if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
206	210	{
207	211	markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
208		MarkupData += "\|OR\|" + markupReturn.ConvertData;
	212	MarkupData += "\|OR\|" + markupReturn.ConvertData;
209	213	}
210	214	}
211	215	Clipboard.SetText(MarkupData);
...	...
214	218	this.dzMainMenu.SelectLayer.Children.Clear();
215	219	}
216	220	}
	221
217	222	}
218	223	break;
219	224	#endregion
...	...
287	292	//붙여 넣을때 원본 컨트롤과 겹치지 않도록 설정
288	293	//Canvas.SetLeft(final, 50);
289	294	//Canvas.SetTop(final, 50);
	295
290	296	}
291	297	//외부 이미지 붙여넣기
292	298	else if (Clipboard.GetImage() != null)
...	...
302	308	Markup_List = new List<Multi_Undo_data>()
303	309	};
304	310
305
306	311	string temppath = System.IO.Path.GetTempPath();
307	312	//string filename = KCOM.Events.Save.shortCommentKey();
308	313	string filename = KCOM.Events.Save.shortFileKey();
...	...
341	346	IntPtr hBitmap = bmp.GetHbitmap();
342	347	System.Windows.Media.ImageSource WpfBitmap = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(hBitmap, IntPtr.Zero, Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions());
343	348	Image img = new Image();
344		img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(filename));
345
	349	img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(filename));
346	350
347
348
349
350	351	var currentControl = new MarkupToPDF.Controls.Etc.ImgControl
351	352	{
352	353	PointSet = new List<Point>(),
...	...
387	388	double realPointX = this.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2);
388	389	double realPointY = this.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2);
389	390	final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY));
390
391
	391
392	392	#region 주석
393	393
394	394	//주석
...	...
443	443	//this.dzMainMenu.SelectLayer.Children.Add(final);
444	444	#endregion
445	445
446
447	446	}
448	447	}
	448
449	449	}
450	450	break;
451	451	#endregion
...	...
462	462	//this.dzTopMenu.SaveEvent(null, null);
463	463
464	464	this.dzTopMenu.SaveEvent(new object(), null);
465		}
	465
	466	//저장완료후 임시파일 삭제
	467	temp.Remove();
	468	}
466	469	}
467	470	break;
468	471	#endregion
...	...
484	487	if (ViewerDataModel.Instance.IsPressCtrl)
485	488	{
486	489	this.dzMainMenu.Undo();
487		}
	490	}
488	491	}
489	492	break;
490	493	#endregion
...	...
541	544
542	545	ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
543	546
544		//adornerSet.Add((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo));
	547	//임시파일에서도 삭제한다.
	548	temp.DelTemp((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID, dzMainMenu.pageNavigator.CurrentPage.PageNumber.ToString());
	549
	550	//adornerSet.Add((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo));
	551
545	552	}
546	553	}
547	554	}
548	555
549	556	ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
550	557	{
551		ViewerDataModel.Instance.UndoDataList.Remove(i);
	558	ViewerDataModel.Instance.UndoDataList.Remove(i);
552	559	});
553	560	ViewerDataModel.Instance.UndoDataList.Add(UndoData);
	561
	562
554	563	}
555	564	}
556	565
557		this.dzMainMenu.SelectLayer.Children.Clear();
	566	this.dzMainMenu.SelectLayer.Children.Clear();
558	567	}
559	568	break;
560	569	#endregion

                         multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
                         UndoData.Markup_List.Add(multi_Undo_Data);
                         multi_Undo_Data = new Multi_Undo_data();
                         temp.DELADDTemp(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, this.ParentOfType<MainWindow>().dzMainMenu.pageNavigator.CurrentPage.PageNumber);
+                    }
                     ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
-...
                     //    this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
                     //    return;
                     //}
                     //강인구 변경
                     // 변경
                     else
+                    {
                         foreach (var item in menu.gridViewMarkup.SelectedItems)
-...
                 Save save = new Save();
                 //강인구 추가
                 //추가
                 List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>();
                 foreach(var item in menu.gridViewMarkup.SelectedItems)
-...
                         multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
                         UndoData.Markup_List.Add(multi_Undo_Data);
                         multi_Undo_Data = new Multi_Undo_data();
                         //임시파일에 해당 commentid가 있으면 삭제후 다시 생성

... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 6707a5c7

프로젝트

일반

사용자정보

MARKUS

개정판 6707a5c7

연결된 일감