/ - Diff - MARKUS - 일정관리

개정판 959b3ef2

ID	959b3ef22f27c7c39a29b05d4ed4215c2a88616f
상위	399976da
하위	de6499db, e05bed4e

백흠경이(가) 5년 이상 전에 추가함

issue #000: add DeleteCommand class

Change-Id: I3edc8872d4351d2e0f7c3b25691631606d20cbd3

     using KCOM.Common;
     using KCOM.Controls;
     using KCOM.Views;
     using MarkupToPDF.Common;
     using MarkupToPDF.Controls.Parsing;
     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.Windows;
     using System.Windows.Media;
     using System.Xml;
     using System.Xml.Serialization;
     namespace KCOM
+    {
         public class SelectionSet
+        {
             private static readonly SelectionSet _instance = new SelectionSet();
             // Explicit static constructor to tell C# compiler
             // not to mark type as beforefieldinit
             static SelectionSet()
+            {
+            }
             private SelectionSet()
+            {
+            }
             public static SelectionSet Instance
+            {
                 get
+                {
                     return _instance;
+                }
+            }
+        }
+    }

     using IKCOM;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
     namespace KCOM.Common
+    {
         public class ThumbnailItem
+        {
             public ThumbnailItem()
+            {
                 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 class SetColorMarkupItem
         //{
         //    public string markupID { get; set; }
         //    public string DisplayColor { get; set; }
         //}
+    }

     using KCOM.Messenger;
     using Leadtools;
     using MarkupToPDF.Common;
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
     using System.Linq;
     using System.Text;
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Ink;
     using System.Windows.Media;
     //using IKCOM;
     namespace KCOM.Common
+    {
         public class ViewerDataModel : INotifyPropertyChanged
+        {
             #region Data Members
             private static ViewerDataModel instance = new ViewerDataModel();
             //private ObservableCollection<CommentUserInfo> markupControls_Pre = new ObservableCollection<CommentUserInfo>();
             private ObservableCollection<CommentUserInfo> markupControls = new ObservableCollection<CommentUserInfo>();
             private ObservableCollection<CommentUserInfo> markupControls_Sync = new ObservableCollection<CommentUserInfo>();
             private ObservableCollection<CommentUserInfo> markupControls_User = new ObservableCollection<CommentUserInfo>();
             ////강인구 추가
             //private List<Check_Inferface> check_Item = new List<Check_Inferface>();
             private ObservableCollection<KCOMDataModel.DataModel.DOCPAGE> document_Info = new ObservableCollection<KCOMDataModel.DataModel.DOCPAGE>();
             private ObservableCollection<IKCOM.MarkupInfoItem> markupInfoList = new ObservableCollection<IKCOM.MarkupInfoItem>();
             private ObservableCollection<IKCOM.MarkupInfoItem> markupInfoRevList = new ObservableCollection<IKCOM.MarkupInfoItem>();
             //_markupInfoList
             private StrokeCollection markupPens = new StrokeCollection();
             //private ObservableCollection<RectangleData> rectangles = new ObservableCollection<RectangleData>();
             private double contentScale = 1;
             private double contentOffsetY = 0;
             private double contentOffsetX = 0;
             private double contentViewportHeight = 0;
             private double contentViewportWidth = 0;
             private double contentWidth = 0;
             private MessageCollection _k_talkMessageSet;
             private double contentHeight = 0;
             private double angle = 0;
             private double angleOffsetX = 0;
             private double angleOffsetY = 0;
             private ImageBrush backgroundImage;
             private RasterImage _rasterimage;
             #endregion Data Members
             #region Property Member
             public static ViewerDataModel Instance
+            {
                 get
+                {
                     return instance;
+                }
+            }
             private List<IKCOM.MarkupItemEx> _MarkupList_MY { get; set; }
             public List<IKCOM.MarkupItemEx> MarkupList_MY
+            {
                 get
+                {
                     if (_MarkupList_MY == null)
+                    {
                         _MarkupList_MY = new List<IKCOM.MarkupItemEx>();
+                    }
                     return _MarkupList_MY;
+                }
                 set
+                {
                     _MarkupList_MY = value;
                     OnPropertyChanged("MarkupList_MY");
+                }
+            }
             private List<IKCOM.MarkupItemEx> _MarkupList_USER { get; set; }
             public List<IKCOM.MarkupItemEx> MarkupList_USER
+            {
                 get
+                {
                     if (_MarkupList_USER == null)
+                    {
                         _MarkupList_USER = new List<IKCOM.MarkupItemEx>();
+                    }
                     return _MarkupList_USER;
+                }
                 set
+                {
                     _MarkupList_USER = value;
                     OnPropertyChanged("_MarkupList_USER");
+                }
+            }
             private List<IKCOM.MarkupItemEx> _MarkupList_Pre { get; set; }
             public List<IKCOM.MarkupItemEx> MarkupList_Pre
+            {
                 get
+                {
                     if (_MarkupList_Pre ==null)
+                    {
                         _MarkupList_Pre = new List<IKCOM.MarkupItemEx>();
+                    }
                     return _MarkupList_Pre;
+                }
                 set
+                {
                         _MarkupList_Pre = value;
                     OnPropertyChanged("MarkupList_Pre");
+                }
+            }
             /// <summary>
             /// 현재 상단 메뉴에서 선택된 컨트롤
             /// </summary>
             private string _SelectedControl { get; set; }
             public string SelectedControl
+            {
                 get
+                {
                     return _SelectedControl;
+                }
                 set
+                {
                     _SelectedControl = value;
                     OnPropertyChanged("SelectedControl");
+                }
+            }
             /// <summary>
             /// 현재 상단 메뉴의 선 굵기값
             /// </summary>
             private double _LineSize { get; set; }
             public double LineSize
+            {
                 get
+                {
                     return _LineSize;
+                }
                 set
+                {
                     _LineSize = value;
                     OnPropertyChanged("LineSize");
+                }
+            }
             private bool _IsPressShift { get; set; }
             public bool IsPressShift
+            {
                 get
+                {
                     return _IsPressShift;
+                }
                 set
+                {
                     _IsPressShift = value;
                     OnPropertyChanged("IsPressShift");
+                }
+            }
             //강인구 추가
             private bool _IsPressCtrl { get; set; }
             public bool IsPressCtrl
+            {
                 get
+                {
                     return _IsPressCtrl;
+                }
                 set
+                {
                     _IsPressCtrl = value;
                     OnPropertyChanged("IsPressCtrl");
+                }
+            }
             /// <summary>
             /// Dash 사이즈
             /// </summary>
             private DoubleCollection _DashSize { get; set; }
             public DoubleCollection DashSize
+            {
                 get
+                {
                     return _DashSize;
+                }
                 set
+                {
                     _DashSize = value;
                     OnPropertyChanged("DashSize");
+                }
+            }
             private string _ControlTag { get; set; }
             public string ControlTag
+            {
                 get
+                {
                     return _ControlTag;
+                }
                 set
+                {
                     _ControlTag = value;
                     OnPropertyChanged("ControlTag");
+                }
+            }
             //private bool _IsPageChanged { get; set; }
             //public bool IsPageChanged
             //{
             //    get
             //    {
             //        return _IsPageChanged;
             //    }
             //    set
             //    {
             //        _IsPageChanged = value;
             //        OnPropertyChanged("IsPageChanged");
             //    }
             //}
             ///// <summary>
             ///// 강인구 추가(Check List관련)
             ///// </summary>
             //public List<Check_Inferface> Check_Item
             //{
             //    get
             //    {
             //        return check_Item;
             //    }
             //}
             private bool _IsConsolidate { get; set; }
             public bool IsConsolidate
+            {
                 get
+                {
                     return _IsConsolidate;
+                }
                 set
+                {
                     _IsConsolidate = value;
                     OnPropertyChanged("IsConsolidate");
+                }
+            }
             ////////////////////////////////////////////////
             #region Angle 관련
             private Visibility _AngleVisibility { get; set; }
             public Visibility AngleVisibility
+            {
                 get
+                {
                     return _AngleVisibility;
+                }
                 set
+                {
                     _AngleVisibility = value;
                     OnPropertyChanged("AngleVisibility");
+                }
+            }
             private string _AngleValue { get; set; }
             public string AngleValue
+            {
                 get
+                {
                     return _AngleValue;
+                }
                 set
+                {
                     _AngleValue = value;
                     OnPropertyChanged("AngleValue");
+                }
+            }
             private string _HelperContent { get; set; }
             public string HelperContent
+            {
                 get
+                {
                     return _HelperContent;
+                }
                 set
+                {
                     _HelperContent = value;
                     OnPropertyChanged("HelperContent");
+                }
+            }
             private string _HelperHeader { get; set; }
             public string HelperHeader
+            {
                 get
+                {
                     return _HelperHeader;
+                }
                 set
+                {
                     _HelperHeader = value;
                     OnPropertyChanged("HelperHeader");
+                }
+            }
             private bool _HelperExit { get; set; }
             public bool HelperExit
+            {
                 get
+                {
                     return _HelperExit;
+                }
                 set
+                {
                     _HelperExit = value;
                     OnPropertyChanged("HelperExit");
+                }
+            }
             #endregion
             public ObservableCollection<CommentUserInfo> MarkupControls
+            {
                 get
+                {
                     return markupControls;
+                }
+            }
             public ObservableCollection<CommentUserInfo> MarkupControls_Sync
+            {
                 get
+                {
                     return markupControls_Sync;
+                }
+            }
             public ObservableCollection<CommentUserInfo> MarkupControls_USER
+            {
                 get
+                {
                     return markupControls_User;
+                }
+            }
             public StrokeCollection MarkupPens
+            {
                 get
+                {
                     return markupPens;
+                }
+            }
             #region 버튼 여부
             /// <summary>
             /// 상단 Fill 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkFillShape { get; set; }
             public bool checkFillShape
+            {
                 get
+                {
                     return _checkFillShape;
+                }
                 set
+                {
                     _checkFillShape = value;
                     OnPropertyChanged("checkFillShape");
+                }
+            }
             /// <summary>
             /// 상단 Hatch 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkHatchShape { get; set; }
             public bool checkHatchShape
+            {
                 get
+                {
                     return _checkHatchShape;
+                }
                 set
+                {
                     _checkHatchShape = value;
                     OnPropertyChanged("checkHatchShape");
+                }
+            }
             private double _controlOpacity { get; set; }
             public double ControlOpacity
+            {
                 get
+                {
                     return _controlOpacity;
+                }
                 set
+                {
                     _controlOpacity = value;
                     OnPropertyChanged("ControlOpacity");
+                }
+            }
             private MarkupToPDF.Controls.Common.PaintSet _paintSet { get; set; }
             public MarkupToPDF.Controls.Common.PaintSet paintSet
+            {
                 get
+                {
                     return _paintSet;
+                }
                 set
+                {
                     _paintSet = value;
                     OnPropertyChanged("paintSet");
+                }
+            }
             /// <summary>
             /// 강인구 추가
             /// 상단 TextStyle 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkTextStyle { get; set; }
             public bool checkTextStyle
+            {
                 get
+                {
                     return _checkTextStyle;
+                }
                 set
+                {
                     _checkTextStyle = value;
                     OnPropertyChanged("checkTextStyle");
+                }
+            }
             /// <summary>
             /// 강인구 추가
             /// 상단 TextWeight 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkTextWeight { get; set; }
             public bool checkTextWeight
+            {
                 get
+                {
                     return _checkTextWeight;
+                }
                 set
+                {
                     _checkTextWeight = value;
                     OnPropertyChanged("checkTextWeight");
+                }
+            }
             /// <summary>
             /// 강인구 추가
             /// 상단 UnderLine 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkUnderLine { get; set; }
             public bool checkUnderLine
+            {
                 get
+                {
                     return _checkUnderLine;
+                }
                 set
+                {
                     _checkUnderLine = value;
                     OnPropertyChanged("checkUnderLine");
+                }
+            }
             /// <summary>
             /// 상단 Hatch 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkHighShape { get; set; }
             public bool checkHighShape
+            {
                 get
+                {
                     return _checkHighShape;
+                }
                 set
+                {
                     _checkHighShape = value;
                     OnPropertyChanged("checkHighShape");
+                }
+            }
             /// <summary>
             /// 상단 Axis 버튼이 클릭 되어있는지
             /// </summary>
             private bool _checkAxis { get; set; }
             public bool checkAxis
+            {
                 get
+                {
                     return _checkAxis;
+                }
                 set
+                {
                     _checkAxis = value;
                     OnPropertyChanged("checkAxis");
+                }
+            }
             #endregion
             public ImageBrush BackgroundImage
+            {
                 get
+                {
                     return backgroundImage;
+                }
                 set
+                {
                     backgroundImage = value;
                     OnPropertyChanged("BackgroundImage");
+                }
+            }
             public RasterImage rasterimage
+            {
                 get
+                {
                     return _rasterimage;
+                }
                 set
+                {
                     _rasterimage = value;
                     OnPropertyChanged("rasterimage");
+                }
+            }
             public ObservableCollection<KCOMDataModel.DataModel.DOCPAGE> Document_Info
+            {
                 get
+                {
                     return document_Info;
+                }
+            }
             public double ContentScale
+            {
                 get
+                {
                     return contentScale;
+                }
                 set
+                {
                     contentScale = value;
                     double minOffsetX = 0.0;
                     double maxOffsetX = Math.Max(0.0, ContentWidth - ContentViewportWidth);
                     contentOffsetX = Math.Min(Math.Max(contentOffsetX, minOffsetX), maxOffsetX);
                     double minOffsetY = 0.0;
                     double maxOffsetY = Math.Max(0.0, ContentHeight - ContentViewportHeight);
                     contentOffsetY = Math.Min(Math.Max(contentOffsetY, minOffsetY), maxOffsetY);
                     OnPropertyChanged("ContentScale");
+                }
+            }
             public ObservableCollection<IKCOM.MarkupInfoItem> _markupInfoList
+            {
                 get
+                {
                     return markupInfoList;
+                }
                 set
+                {
                     markupInfoList = value;
                     OnPropertyChanged("_markupInfoList");
+                }
+            }
             public ObservableCollection<IKCOM.MarkupInfoItem> _markupInfoRevList
+            {
                 get
+                {
                     return markupInfoRevList;
+                }
                 set
+                {
                     markupInfoRevList = value;
                     OnPropertyChanged("_markupInfoRevList");
+                }
+            }
             public double ContentOffsetX
+            {
                 get
+                {
                     return contentOffsetX;
+                }
                 set
+                {
                     double minOffsetX = 0.0;
                     double maxOffsetX = Math.Max(0.0, ContentWidth - ContentViewportWidth);
                     contentOffsetX = Math.Min(Math.Max(value, minOffsetX), maxOffsetX);
                     OnPropertyChanged("ContentOffsetX");
+                }
+            }
             public double ContentOffsetY
+            {
                 get
+                {
                     return contentOffsetY;
+                }
                 set
+                {
                     double minOffsetY = 0.0;
                     double maxOffsetY = Math.Max(0.0, ContentHeight - ContentViewportHeight);
                     contentOffsetY = Math.Min(Math.Max(value, minOffsetY), maxOffsetY);
                     OnPropertyChanged("ContentOffsetY");
+                }
+            }
             public MessageCollection k_talkMessageSet
+            {
                 get
+                {
                     if (_k_talkMessageSet ==null)
+                    {
                         _k_talkMessageSet = new MessageCollection();
+                    }
                     return _k_talkMessageSet;
+                }
                 set
+                {
                     _k_talkMessageSet = value;
                     OnPropertyChanged("k_talkMessageSet");
+                }
+            }
             public double ContentWidth
+            {
                 get
+                {
                     return contentWidth;
+                }
                 set
+                {
                     contentWidth = value;
                     OnPropertyChanged("ContentWidth");
+                }
+            }
             public double ContentHeight
+            {
                 get
+                {
                     return contentHeight;
+                }
                 set
+                {
                     contentHeight = value;
                     OnPropertyChanged("ContentHeight");
+                }
+            }
             public double ContentViewportWidth
+            {
                 get
+                {
                     return contentViewportWidth;
+                }
                 set
+                {
                     contentViewportWidth = value;
                     OnPropertyChanged("ContentViewportWidth");
+                }
+            }
             public double ContentViewportHeight
+            {
                 get
+                {
                     return contentViewportHeight;
+                }
                 set
+                {
                     contentViewportHeight = value;
                     OnPropertyChanged("ContentViewportHeight");
+                }
+            }
             public MainWindow SystemMain { get; set; }
             public double Angle
+            {
                 get
+                {
                     return angle;
+                }
                 set
+                {
                     angle = value;
                     OnPropertyChanged("Angle");
+                }
+            }
             private bool _PageBalanceMode { get; set; }
             public bool PageBalanceMode
+            {
                 get
+                {
                     return _PageBalanceMode;
+                }
                 set
+                {
                     _PageBalanceMode = value;
                     OnPropertyChanged("PageBalanceMode");
+                }
+            }
             private int _PageBalanceNumber { get; set; }
             public int PageBalanceNumber
+            {
                 get
+                {
                     return _PageBalanceNumber;
+                }
                 set
+                {
                     _PageBalanceNumber = value;
                     OnPropertyChanged("PageBalanceNumber");
+                }
+            }
             private int _PageNumber { get; set; }
             public int PageNumber
+            {
                 get
+                {
                     return _PageNumber;
+                }
                 set
+                {
                     _PageNumber = value;
                     OnPropertyChanged("PageNumber");
+                }
+            }
             public double AngleOffsetX
+            {
                 get
+                {
                     return angleOffsetX;
+                }
                 set
+                {
                     angleOffsetX = value;
                     OnPropertyChanged("AngleOffsetX");
+                }
+            }
             public double AngleOffsetY
+            {
                 get
+                {
                     return angleOffsetY;
+                }
                 set
+                {
                     angleOffsetY = value;
                     OnPropertyChanged("AngleOffsetY");
+                }
+            }
             //강인구 추가(체크리스트)
             private string _CheckList_ID { get; set; }
             public string CheckList_ID
+            {
                 get
+                {
                     return _CheckList_ID;
+                }
                 set
+                {
                     _CheckList_ID = value;
                     OnPropertyChanged("CheckList_ID");
+                }
+            }
             //강인구 추가(캡쳐 모드)
             private double _Capture_Opacity { get; set; }
             public double Capture_Opacity
+            {
                 get
+                {
                     return _Capture_Opacity;
+                }
                 set
+                {
                     _Capture_Opacity = value;
                     OnPropertyChanged("Capture_Opacity");
+                }
+            }
             private Visibility _ViewVisible { get; set; }
             public Visibility ViewVisible
+            {
                 get
+                {
                     return _ViewVisible;
+                }
                 set
+                {
                     _ViewVisible = value;
                     OnPropertyChanged("ViewVisible");
+                }
+            }
             private bool _IsSync { get; set; }
             public bool IsSync
+            {
                 get
+                {
                     return _IsSync;
+                }
                 set
+                {
                     _IsSync = value;
                     OnPropertyChanged("IsSync");
+                }
+            }
             #endregion Property Member
             public System.IO.Stream GetStreamFromUrl(string url)
+            {
                 byte[] imageData = null;
                 using (var wc = new System.Net.WebClient())
                     imageData = wc.DownloadData(url);
                 return new System.IO.MemoryStream(imageData);
+            }
             public ViewerDataModel()
+            {
                 //rectangles.Add(new RectangleData(50, 50, 80, 150, Colors.Blue));
                 //rectangles.Add(new RectangleData(550, 350, 80, 150, Colors.Green));
                 //rectangles.Add(new RectangleData(850, 850, 30, 20, Colors.Purple));
                 //rectangles.Add(new RectangleData(1850, 1850, 80, 150, Colors.Red));
                 //RectangleControl rect1 = new RectangleControl();
                 //rect1.StartPoint = new Point(50, 50);
                 //rect1.LeftBottomPoint = new Point(100, 50);
                 //rect1.TopRightPoint = new Point(50, 100);
                 //rect1.EndPoint = new Point(100, 100);
                 //rect1.FillColor = new SolidColorBrush(Colors.Red);
                 //rectangles.Add(rect1);
                 //
                 // Populate the data model with some example data.
                 //
                 //rectangles.Add(new RectangleData(50, 50, 80, 150, Colors.Blue));
                 //rectangles.Add(new RectangleData(550, 350, 80, 150, Colors.Green));
                 //rectangles.Add(new RectangleData(850, 850, 30, 20, Colors.Purple));
                 //rectangles.Add(new RectangleData(1850, 1850, 80, 150, Colors.Red));
                 this.ControlOpacity = 1;
                 //강인구 추가
                 this.LineSize = 3;
                 this.DashSize = new DoubleCollection(99999999);
+            }
             #region INotifyPropertyChanged Event
             private void OnPropertyChanged(string name)
+            {
                 if (PropertyChanged != null)
+                {
                     PropertyChanged(this, new PropertyChangedEventArgs(name));
+                }
+            }
             public event PropertyChangedEventHandler PropertyChanged;
             #endregion
+        }
+    }

     using KCOM.Common;
     using KCOM.Controls;
     using KCOM.Views;
     using MarkupToPDF.Common;
     using MarkupToPDF.Controls.Parsing;
     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.Windows;
     using System.Windows.Media;
     using System.Xml;
     using System.Xml.Serialization;
     namespace KCOM
+    {
         public class DeleteCommand
+        {
             private static readonly DeleteCommand _instance = new DeleteCommand();
             // Explicit static constructor to tell C# compiler
             // not to mark type as beforefieldinit
             static DeleteCommand()
+            {
+            }
             private DeleteCommand()
+            {
+            }
             public static DeleteCommand Instance
+            {
                 get
+                {
                     return _instance;
+                }
+            }
             /// <summary>
             /// delete given comments
             /// </summary>
             /// <author>humkyung</author>
             /// <date>2019.06.12</date>
             /// <param name="comments"></param>
             public void Execute(ICollection<CommentUserInfo> comments)
+            {
                 MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
+                {
                     IsUndo = false,
                     Event = Event_Type.Delete,
                     EventTime = DateTime.Now,
                     Markup_List = new List<Multi_Undo_data>()
                 };
                 foreach (var comment in comments)
+                {
                     Multi_Undo_data multi_Undo_Data = new Multi_Undo_data()
+                    {
                         Markup = comment
                     };
                     UndoData.Markup_List.Add(multi_Undo_Data);
                     ViewerDataModel.Instance.MarkupControls_USER.Remove(comment);
                     ViewerDataModel.Instance.MarkupControls.Remove(comment);
                     var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == comment.CommentID).FirstOrDefault();
                     ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
+                }
                 ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
+                {
                     ViewerDataModel.Instance.UndoDataList.Remove(i);
                 });
                 ViewerDataModel.Instance.UndoDataList.Add(UndoData);
+            }
+        }
+    }

             MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn();
             private List<CommentUserInfo> SelectedItems
+            {
                 get
+                {
                     List<CommentUserInfo> res = new List<CommentUserInfo>();
                     foreach (var item in this.dzMainMenu.SelectLayer.Children)
+                    {
                         if (item.GetType().Name == "AdornerFinal")
+                        {
                             foreach (var InnerItem in (item as Controls.AdornerFinal).MemberSet.Cast<Controls.AdornerMember>())
+                            {
                                 res.Add(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo);
+                            }
+                        }
+                    }
                     return res;
+                }
+            }
             public void KeyEventDownAction(object sender, KeyEventArgs e)
+            {
-...
                     #region 삭제하기(Delete)
                     case Key.Delete:
+                        {
                             DeleteCommand.Instance.Execute(this.SelectedItems);
                             /*
                             if (this.dzMainMenu.SelectLayer.Children.Count > 0)
+                            {
                                 Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
                                 UndoData = new Undo_data()
+                                {
                                     IsUndo = false,
-...
+                                {
                                     if (item.GetType().Name == "AdornerFinal")
+                                    {
                                         //List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>();
                                         (item as Controls.AdornerFinal).unRegister();
                                         foreach (var InnerItem in (item as Controls.AdornerFinal).MemberSet.Cast<Controls.AdornerMember>())
+                                        {
                                             //if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
                                             if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData))
                                             Multi_Undo_data multi_Undo_Data = new Multi_Undo_data()
+                                            {
                                                 //this.dzMainMenu.ReleaseAdorner();
                                                 multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo;
                                                 UndoData.Markup_List.Add(multi_Undo_Data);
                                                 multi_Undo_Data = new Multi_Undo_data();
                                                 ViewerDataModel.Instance.MarkupControls.Remove(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo);
                                                 var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
                                                 //var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.MarkupInfoID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).MarkupInfoID).FirstOrDefault();
                                                 Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo
                                             };
                                             UndoData.Markup_List.Add(multi_Undo_Data);
                                                 ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
                                             ViewerDataModel.Instance.MarkupControls_USER.Remove(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo);
                                             ViewerDataModel.Instance.MarkupControls.Remove(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo);
                                                 //임시파일에서도 삭제한다.
                                                 TempFile.DelTemp((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID, dzMainMenu.pageNavigator.CurrentPage.PageNumber.ToString());
                                                 //adornerSet.Add((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo));
                                             var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
                                             ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
+                                            }
                                             //임시파일에서도 삭제한다.
                                             TempFile.DelTemp((InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID, dzMainMenu.pageNavigator.CurrentPage.PageNumber.ToString());
+                                        }
+                                    }
-...
                                         ViewerDataModel.Instance.UndoDataList.Remove(i);
                                     });
                                     ViewerDataModel.Instance.UndoDataList.Add(UndoData);
+                                }
+                            }
                             */
                             this.dzMainMenu.SelectLayer.Children.Clear();
+                        }

     using KCOM.Common;
     using MarkupToPDF.Common;
     using System;
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Linq;
     using System.Text;
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Input;
     using Telerik.Windows.Controls;
     namespace KCOM
+    {
         public partial class MainWindow : Window
+        {
             public double CumulativeWheel = 0;
             public MarkupToPDF.Common.Undo_data UndoData;
             //강인구 추가
             KCOM.Views.MainMenu mainMenu = new Views.MainMenu();
             //강인구 추가
             MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl();
             //강인구 추가
             MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
             public void KeyEventDownAction(object sender, KeyEventArgs e)
+            {
                 layer.ProjectNo = App.ViewInfo.ProjectNO;
                 switch (e.Key)
+                {
                     //강인구 추가
                     #region Ctrl
                     case Key.LeftCtrl:
+                        {
                             if (!ViewerDataModel.Instance.IsPressCtrl)
+                            {
                                 ViewerDataModel.Instance.IsPressCtrl = true;
+                            }
+                        }
                         break;
                     case Key.RightCtrl:
+                        {
+                        }
                         break;
                     #endregion
                     #region Shift
                     case Key.RightShift:
+                        {
+                        }
                         break;
                     case Key.LeftShift:
+                        {
                             if (!ViewerDataModel.Instance.IsPressShift)
+                            {
                                 ViewerDataModel.Instance.IsPressShift = true;
+                            }
                             //if (dzMain.deepZoomObject._MouseHelper.isMouseOver && !dzMain.DeepLayer.Drawing)
                             //{
                             //    dzMain.deepZoomObject._MouseHelper.isPressShift = true;
                             //    CumulativeWheel += dzMain.deepZoomObject._MouseHelper.wheelDelta;
                             //    dzMain.deepZoomObject._MouseHelper.wheelDelta = 0;
                             //    System.Diagnostics.Debug.WriteLine(CumulativeWheel);
                             //    if (CumulativeWheel == 3 && CumulativeWheel >= 0)
                             //    {
                             //        this.dzMain.pageNavigator.pagebeforetMove();
                             //        CumulativeWheel = 0;
                             //    }
                             //    else if (CumulativeWheel == -3 && CumulativeWheel <= 0)
                             //    {
                             //        this.dzMain.pageNavigator.pageNextMove();
                             //        CumulativeWheel = 0;
                             //    }
                             //}
+                        }
                         break;
                     #endregion
                     //강인구 추가
                     #region 단축키 선택
                     #region 전체 선택(Ctrl + A)
                     case Key.A:
+                        {
                             if (ViewerDataModel.Instance.IsPressCtrl)
+                            {
                                 this.dzMainMenu.InkControl_Convert();
                                 if (Common.ViewerDataModel.Instance.MarkupControls_USER.Count > 0)
+                                {
                                     //전체 선택 시 선택된 토글 해제
                                     var TogList = this.dzTopMenu.Parent.ChildrenOfType<RadToggleButton>();
                                     this.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.None;
                                     this.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
                                     //컨트롤을 그리는 도중일 경우 컨트롤 삭제
                                     ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl);
                                     this.dzMainMenu.currentControl = null;
                                     foreach (var tog in TogList)
+                                    {
                                         tog.IsChecked = false;
+                                    }
                                     //선택된 어도너가 있을 시 취소하고 전체 선택
                                     this.dzMainMenu.ReleaseAdorner();
                                     UndoData = new Undo_data()
+                                    {
                                         IsUndo = false,
                                         Event = Event_Type.Select,
                                         EventTime = DateTime.Now,
                                         Markup_List = new List<Multi_Undo_data>()
                                     };
                                     List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>();
                                     var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.GetType().Name != "").ToList();
                                     Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
                                     foreach (var item in control)
+                                    {
                                         adornerSet.Add(item);
                                         //multi_Undo_Data.Markup = item;
                                         multi_Undo_Data = this.dzMainMenu.Control_Style(item);
                                         UndoData.Markup_List.Add(multi_Undo_Data);
                                         multi_Undo_Data = new Multi_Undo_data();
                                         ViewerDataModel.Instance.MarkupControls_USER.Remove(item);
+                                    }
                                     if (adornerSet.Count > 0)
+                                    {
                                         Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet);
                                         this.dzMainMenu.SelectLayer.Children.Add(final);
+                                    }
                                     ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
+                                    {
                                         ViewerDataModel.Instance.UndoDataList.Remove(i);
                                     });
                                     ViewerDataModel.Instance.UndoDataList.Add(UndoData);
+                                }
+                            }
+                        }
                         break;
                     #endregion
                     #region 복사하기(Ctrl + C)
                     case Key.C:
+                        {
                             if (ViewerDataModel.Instance.IsPressCtrl)
+                            {
                                 if (this.dzMainMenu.SelectLayer.Children.Count > 0)
+                                {
                                     string MarkupData = "";
                                     foreach (var item in this.dzMainMenu.SelectLayer.Children)
+                                    {
                                         if (item.GetType().Name == "AdornerFinal")
+                                        {
                                             foreach (var InnerItem in (item as Controls.AdornerFinal).MemberSet.Cast<Controls.AdornerMember>())
+                                            {
                                                 if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
+                                                {
                                                     markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
                                                     MarkupData += "|OR|" + markupReturn.ConvertData;
+                                                }
+                                            }
                                             Clipboard.SetText(MarkupData);
+                                        }
+                                    }
+                                }
+                            }
+                        }
                         break;
                     #endregion
                     #region 잘라내기(Ctrl + X)
                     case Key.X:
+                        {
                             if (ViewerDataModel.Instance.IsPressCtrl)
+                            {
                                 if (this.dzMainMenu.SelectLayer.Children.Count > 0)
+                                {
                                     foreach (var item in this.dzMainMenu.SelectLayer.Children)
+                                    {
                                         string MarkupData = "";
                                         if (item.GetType().Name == "AdornerFinal")
+                                        {
                                             foreach (var InnerItem in (item as Controls.AdornerFinal).MemberSet.Cast<Controls.AdornerMember>())
+                                            {
                                                 if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
+                                                {
                                                     markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
                                                     MarkupData += "|OR|" + markupReturn.ConvertData;
+                                                }
+                                            }
                                             Clipboard.SetText(MarkupData);
+                                        }
+                                    }
                                     this.dzMainMenu.SelectLayer.Children.Clear();
+                                }
+                            }
+                        }
                         break;
                     #endregion
                     #region 붙여넣기(Ctrl + V)
                     case Key.V:
+                        {
                             if (ViewerDataModel.Instance.IsPressCtrl)
+                            {
                                 //마크업 붙여넣기
                                 if (Clipboard.GetText().Contains("|DZ|"))
+                                {
                                     List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>();
                                     string[] delimiterChars = { "|OR|" };
                                     string[] data = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries);
                                     this.dzMainMenu.ReleaseAdorner();
                                     Multi_Undo_data multi_Undo_Data = new Multi_Undo_data();
                                     //강인구 Undo/Redo 보류
                                     UndoData = new Undo_data()
+                                    {
                                         IsUndo = false,
                                         Event = Event_Type.Create,
                                         EventTime = DateTime.Now,
                                         Markup_List = new List<Multi_Undo_data>()
                                     };
                                     ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i =>
+                                    {
                                         ViewerDataModel.Instance.UndoDataList.Remove(i);
                                     });
                                     foreach (string parse in data)
+                                    {
                                         if(parse != "")
+                                        {
                                             System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER);
                                             (item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid();
                                             ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo);
                                             ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo);
                                             adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo);
                                             //Controls.AdornerFinal final = new Controls.AdornerFinal(item as MarkupToPDF.Common.CommentUserInfo);
                                             //this.dzMainMenu.SelectLayer.Children.Add(final);
                                             multi_Undo_Data = dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
                                             UndoData.Markup_List.Add(multi_Undo_Data);
                                             ViewerDataModel.Instance.UndoDataList.Add(UndoData);
+                                        }

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

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 959b3ef2