프로젝트

일반

사용자정보

개정판 036650a0

ID036650a01758a31b0f2f1a8e591ed6c8af870eef
상위 f286e80b
하위 d4e73fc9

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

issue #999: Add serialize method to all of controls

Change-Id: I74e404885e8cd107b48ad1921e768137ed14a3da

차이점 보기:

KCOM/Common/TempFile.cs
2 2
using KCOM.Controls;
3 3
using KCOM.Views;
4 4
using MarkupToPDF.Common;
5
using MarkupToPDF.Controls.Parsing;
5 6
using Newtonsoft.Json;
6 7
using Newtonsoft.Json.Converters;
7 8
using Newtonsoft.Json.Linq;
......
27 28
{
28 29
    public class TempFile
29 30
    {
30
        public class MarkupReturn
31
        {
32
            public string ConvertData { get; set; }
33
            public int DATA_TYPE { get; set; }
34
            public string CommentID { get; set; }
35
        }
36

  
37
        MarkupToPDF.Controls.Parsing.LayerControl layerControl = new MarkupToPDF.Controls.Parsing.LayerControl();
38

  
39 31
        public static string PathString = AppDomain.CurrentDomain.BaseDirectory + "Temp";
40 32
        public static string FilePath = PathString + "\\" + App.ViewInfo.DocumentItemID + ".tmp";        
41 33

  
......
159 151
            var nodes = xmlDoc.SelectNodes("/Root/CommentID");
160 152
            for (int i = 0; i < undoDataList.Markup_List.Count; i++)
161 153
            {
162
                var root = layerControl.MarkupToString(undoDataList.Markup_List[i].Markup, App.ViewInfo.UserID);
154
                var root = MarkupParser.MarkupToString(undoDataList.Markup_List[i].Markup, App.ViewInfo.UserID);
163 155
                bool check = true;
164 156
                                
165 157
                foreach (XmlNode e in xmlDoc.GetElementsByTagName("CommentID"))
KCOM/Controls/Symbol.xaml.cs
4 4
using KCOMDataModel.Common;
5 5
using KCOMDataModel.DataModel;
6 6
using MarkupToPDF.Common;
7
using MarkupToPDF.Controls.Parsing;
7 8
using Svg2Xaml;
8 9
using System;
9 10
using System.Collections.Generic;
......
209 210
        #region Private Symbol Add Event
210 211
        private void Create_Symbol(object sender, RoutedEventArgs e)
211 212
        {
212
            MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
213

  
214 213
            if (Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Count < 1) //선택된 것이 없으면
215 214
            {
216 215
                DialogMessage_Alert("Please Select Controls", "Alert");
......
229 228
                        {
230 229
                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
231 230
                            {
232
                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
231
                                var markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
233 232
                                MarkupData += markupReturn.ConvertData;
234 233
                            }
235 234
                        }
KCOM/Events/Event_KeyEvent.cs
1 1
using KCOM.Common;
2 2
using MarkupToPDF.Common;
3
using MarkupToPDF.Controls.Parsing;
3 4
using Svg2Xaml;
4 5
using System;
5 6
using System.Collections.Generic;
......
29 30
        //강인구 추가
30 31
        MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl();
31 32
        //강인구 추가
32
        MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
33
        MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn();
33 34
                
34 35
        //임시파일관련
35 36
        TempFile temp = new TempFile();
......
184 185
                                        {        
185 186
                                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
186 187
                                            {
187
                                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
188
                                                markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
188 189

  
189 190
                                                var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
190 191
                                                
......
234 235
                                        {
235 236
                                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
236 237
                                            {
237
                                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
238
                                                markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
238 239
                                                MarkupData += "|OR|" + markupReturn.ConvertData;                                                
239 240
                                            }
240 241
                                        }
KCOM/Events/Implementation/TopMenuEvent.cs
20 20
using System.IO;
21 21
using System.Reflection;
22 22
using System.Windows.Controls.Primitives;
23
using MarkupToPDF.Controls.Parsing;
23 24

  
24 25
namespace KCOM.Views
25 26
{
......
32 33
        public RadWindow CheckPop;
33 34
        public RadWindow OptionPop;
34 35
        public MarkupToPDF.Common.Undo_data UndoData;
35
        MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
36 36
        MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl();
37 37

  
38 38
        //임시파일
......
2753 2753
                        {
2754 2754
                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
2755 2755
                            {
2756
                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
2756
                                var markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
2757 2757
                                MarkupData += "|OR|" + markupReturn.ConvertData;
2758 2758
                            }
2759 2759
                        }
......
2777 2777
                        {
2778 2778
                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
2779 2779
                            {
2780
                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
2780
                                var markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
2781 2781
                                MarkupData += "|OR|" + markupReturn.ConvertData;
2782 2782
                            }
2783 2783
                        }
KCOM/Services/BaseServices.cs
15 15
using System.Windows;
16 16
using System.Windows.Controls;
17 17
using Telerik.Windows.Controls;
18
using MarkupToPDF.Controls.Parsing;
18 19

  
19 20
namespace KCOM.Views
20 21
{
......
458 459
                            MarkupInfoItem instanceItem = e.AddedItems.FirstOrDefault() as MarkupInfoItem;
459 460
                            var result = instanceItem.Consolidate;
460 461

  
461
                            //dataSet.Where(data => data.UserID == "H2011357").ToList().ForEach(data => lstbox.SelectedItems.Remove(data));
462 462
                            if (ea.DialogResult.Value)
463 463
                            {
464 464
                                ConsolidationMethod();
......
488 488
                    {
489 489
                        if ((item.UserID == App.ViewInfo.UserID) && (this.pageNavigator.CurrentPage != null))
490 490
                        {
491

  
492 491
                            var instance = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.PageNumber == pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList();
493 492
                            var my_item = Common.ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault();
494 493
                            Common.ViewerDataModel.Instance.current_page_commentcnt = Common.ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().Count;
......
539 538
                            markupitem.Visibility = Visibility.Hidden;
540 539
                            if (markupitem.IsNew)
541 540
                            {
542
                                var root = layerControl.MarkupToString(markupitem, App.ViewInfo.UserID);
541
                                var root = MarkupParser.MarkupToString(markupitem, App.ViewInfo.UserID);
543 542
                                ViewerDataModel.Instance.MarkupList_USER.Add(new MarkupItemEx
544 543
                                {
545 544
                                    ID = markupitem.CommentID,
KCOM/Views/MainMenu.xaml.cs
38 38
using System.Runtime.InteropServices;
39 39
using System.Windows.Media.Effects;
40 40
using MarkupToPDF.Controls.Cad;
41
using MarkupToPDF.Controls.Parsing;
41 42

  
42 43
namespace KCOM.Views
43 44
{
......
437 438
                        {
438 439
                            foreach (var control in ViewerDataModel.Instance.MarkupControls_USER)
439 440
                            {
440
                                var root = layerControl.MarkupToString(control, App.ViewInfo.UserID);
441
                                var root = MarkupParser.MarkupToString(control, App.ViewInfo.UserID);
441 442

  
442 443
                                var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault();
443 444
                                if (existItem != null)
......
643 644
            {
644 645
                foreach (var control in ViewerDataModel.Instance.MarkupControls_USER)
645 646
                {
646
                    var root = layerControl.MarkupToString(control, App.ViewInfo.UserID);
647
                    var root = MarkupParser.MarkupToString(control, App.ViewInfo.UserID);
647 648

  
648 649
                    var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault();
649 650
                    if (existItem != null) //신규 추가 된 코멘트
......
6137 6138

  
6138 6139
        private void Create_Symbol(object sender, RoutedEventArgs e)
6139 6140
        {
6140
            MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn();
6141 6141
            MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl();
6142 6142

  
6143 6143
            if (SelectLayer.Children.Count < 1) //선택된 것이 없으면
......
6158 6158
                        {
6159 6159
                            if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData))
6160 6160
                            {
6161
                                markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
6161
                                var markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
6162 6162
                                MarkupData += markupReturn.ConvertData;
6163 6163
                            }
6164 6164
                        }
MarkupToPDF/Common/CommentUserInfo.cs
1
using System;
1
using MarkupToPDF.Controls.Common;
2
using System;
2 3
using System.Collections.Generic;
3 4
using System.Linq;
4 5
using System.Text;
......
59 60
            //    StateChanged(this, new MyEventArgs { isMouseOver = true });
60 61
            //}
61 62
        }
63

  
64
        /// <summary>
65
        /// subclass has to override this property
66
        /// </summary>
67
        virtual public ControlType ControlType { get; set; }
68

  
69
        /// <summary>
70
        /// subclass has to override this method
71
        /// </summary>
72
        /// <returns>serialized string</returns>
73
        public virtual string Serialize() { return string.Empty; }
62 74
    }
63 75
}
64 76
 
MarkupToPDF/Controls/Cad/ClipWhiteControlcs.cs
10 10
using System.Windows.Media;
11 11
using MarkupToPDF.Controls.Common;
12 12
using MarkupToPDF.Common;
13
using MarkupToPDF.Serialize.Core;
14
using MarkupToPDF.Serialize.S_Control;
13 15

  
14 16
namespace MarkupToPDF.Controls.Cad
15 17
{
......
202 204
            }
203 205
        }
204 206

  
205
        public ControlType ControlType
207
        override public ControlType ControlType
206 208
        {
207 209
            set
208 210
            {
......
549 551
            this.SetRectPath();
550 552
        }
551 553

  
554
        /// <summary>
555
        /// Serialize this
556
        /// </summary>
557
        /// <param name="sUserId"></param>
558
        /// <returns></returns>
559
        public override string Serialize()
560
        {
561
            using (S_ClipWhiteControl STemp = new S_ClipWhiteControl())
562
            {
563
                STemp.TransformPoint = "0|0";
564
                STemp.SizeSet = String.Format("{0}", this.LineSize);
565
                STemp.PaintState = this.Paint;
566
                STemp.PointSet = this.PointSet;
567
                //STemp.StrokeColor = "#FF00FF00";
568
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
569
                if (this.FillColor != null)
570
                {
571
                    STemp.FillColor = this.FillColor.Color.ToString();
572
                }
573
                STemp.StartPoint = this.StartPoint;
574
                STemp.UserID = this.UserID;
575
                STemp.EndPoint = this.EndPoint;
576
                STemp.LB = this.LeftBottomPoint;
577
                STemp.TR = this.TopRightPoint;
578
                STemp.DashSize = this.DashSize;
579
                STemp.Opac = this.Opacity;
580
                STemp.Name = this.GetType().Name.ToString();
581
                STemp.Memo = this.Memo;
582

  
583
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
584
            };
585
        }
586

  
552 587
        public event PropertyChangedEventHandler PropertyChanged;
553 588

  
554 589
        public void Dispose()
MarkupToPDF/Controls/Cad/CoordinateControl.cs
10 10
using System.Windows.Media;
11 11
using MarkupToPDF.Controls.Common;
12 12
using MarkupToPDF.Common;
13
using MarkupToPDF.Serialize.Core;
14
using MarkupToPDF.Serialize.S_Control;
13 15

  
14 16
namespace MarkupToPDF.Controls.Cad
15 17
{
......
202 204
            }
203 205
        }
204 206

  
205
        public ControlType ControlType
207
        override public ControlType ControlType
206 208
        {
207 209
            set
208 210
            {
......
548 550
            this.SetRectPath();
549 551
        }
550 552

  
553
        /// <summary>
554
        /// Serialize this
555
        /// </summary>
556
        /// <param name="sUserId"></param>
557
        /// <returns></returns>
558
        public override string Serialize()
559
        {
560
            using (S_CoordinateControl STemp = new S_CoordinateControl())
561
            {
562
                STemp.TransformPoint = "0|0";
563
                STemp.SizeSet = String.Format("{0}", this.LineSize);
564
                STemp.PaintState = this.Paint;
565
                STemp.PointSet = this.PointSet;
566
                //STemp.StrokeColor = "#FF00FF00";
567
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
568
                if (this.FillColor != null)
569
                {
570
                    STemp.FillColor = this.FillColor.Color.ToString();
571
                }
572
                STemp.StartPoint = this.StartPoint;
573
                STemp.UserID = this.UserID;
574
                STemp.EndPoint = this.EndPoint;
575
                STemp.LB = this.LeftBottomPoint;
576
                STemp.TR = this.TopRightPoint;
577
                STemp.DashSize = this.DashSize;
578
                STemp.Opac = this.Opacity;
579
                STemp.Name = this.GetType().Name.ToString();
580
                STemp.Memo = this.Memo;
581

  
582
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
583
            };
584
        }
585

  
551 586
        public event PropertyChangedEventHandler PropertyChanged;
552 587

  
553 588
        public void Dispose()
MarkupToPDF/Controls/Cad/InsideWhiteControlcs.cs
10 10
using System.Windows.Media;
11 11
using MarkupToPDF.Controls.Common;
12 12
using MarkupToPDF.Common;
13
using MarkupToPDF.Serialize.Core;
14
using MarkupToPDF.Serialize.S_Control;
13 15

  
14 16
namespace MarkupToPDF.Controls.Cad
15 17
{
......
202 204
            }
203 205
        }
204 206

  
205
        public ControlType ControlType
207
        override public ControlType ControlType
206 208
        {
207 209
            set
208 210
            {
......
549 551
            this.SetRectPath();
550 552
        }
551 553

  
554
        /// <summary>
555
        /// Serialize this
556
        /// </summary>
557
        /// <param name="sUserId"></param>
558
        /// <returns></returns>
559
        public override string Serialize()
560
        {
561
            using (S_InsideWhiteControl STemp = new S_InsideWhiteControl())
562
            {
563
                STemp.TransformPoint = "0|0";
564
                STemp.SizeSet = String.Format("{0}", this.LineSize);
565
                STemp.PaintState = this.Paint;
566
                STemp.PointSet = this.PointSet;
567
                //STemp.StrokeColor = "#FF00FF00";
568
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
569
                if (this.FillColor != null)
570
                {
571
                    STemp.FillColor = this.FillColor.Color.ToString();
572
                }
573
                STemp.StartPoint = this.StartPoint;
574
                STemp.UserID = this.UserID;
575
                STemp.EndPoint = this.EndPoint;
576
                STemp.LB = this.LeftBottomPoint;
577
                STemp.TR = this.TopRightPoint;
578
                STemp.DashSize = this.DashSize;
579
                STemp.Opac = this.Opacity;
580
                STemp.Name = this.GetType().Name.ToString();
581
                STemp.Memo = this.Memo;
582

  
583
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
584
            };
585
        }
586

  
552 587
        public event PropertyChangedEventHandler PropertyChanged;
553 588

  
554 589
        public void Dispose()
MarkupToPDF/Controls/Cad/OverlapWhiteControlcs.cs
10 10
using System.Windows.Media;
11 11
using MarkupToPDF.Controls.Common;
12 12
using MarkupToPDF.Common;
13
using MarkupToPDF.Serialize.Core;
14
using MarkupToPDF.Serialize.S_Control;
13 15

  
14 16
namespace MarkupToPDF.Controls.Cad
15 17
{
......
202 204
            }
203 205
        }
204 206

  
205
        public ControlType ControlType
207
        override public ControlType ControlType
206 208
        {
207 209
            set
208 210
            {
......
549 551
            this.SetRectPath();
550 552
        }
551 553

  
554
        /// <summary>
555
        /// Serialize this
556
        /// </summary>
557
        /// <param name="sUserId"></param>
558
        /// <returns></returns>
559
        public override string Serialize()
560
        {
561
            using (S_OverlapWhiteControl STemp = new S_OverlapWhiteControl())
562
            {
563
                STemp.TransformPoint = "0|0";
564
                STemp.SizeSet = String.Format("{0}", this.LineSize);
565
                STemp.PaintState = this.Paint;
566
                STemp.PointSet = this.PointSet;
567
                //STemp.StrokeColor = "#FF00FF00";
568
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
569
                if (this.FillColor != null)
570
                {
571
                    STemp.FillColor = this.FillColor.Color.ToString();
572
                }
573
                STemp.StartPoint = this.StartPoint;
574
                STemp.UserID = this.UserID;
575
                STemp.EndPoint = this.EndPoint;
576
                STemp.LB = this.LeftBottomPoint;
577
                STemp.TR = this.TopRightPoint;
578
                STemp.DashSize = this.DashSize;
579
                STemp.Opac = this.Opacity;
580
                STemp.Name = this.GetType().Name.ToString();
581
                STemp.Memo = this.Memo;
582

  
583
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
584
            };
585
        }
586

  
552 587
        public event PropertyChangedEventHandler PropertyChanged;
553 588

  
554 589
        public void Dispose()
MarkupToPDF/Controls/Etc/DateControl.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.Core;
16
using MarkupToPDF.Serialize.S_Control;
15 17

  
16 18
namespace MarkupToPDF.Controls.Etc
17 19
{
......
212 214
            }
213 215
        }
214 216

  
215
        public ControlType ControlType
217
        override public ControlType ControlType
216 218
        {
217 219
            set
218 220
            {
......
453 455
            this.EndPoint = new Point(this.PointSet[2].X, this.PointSet[2].Y);
454 456
            this.SetDate();
455 457
        }
458

  
459
        /// <summary>
460
        /// Serialize this
461
        /// </summary>
462
        /// <param name="sUserId"></param>
463
        /// <returns></returns>
464
        public override string Serialize()
465
        {
466
            using (S_DateControl STemp = new S_DateControl())
467
            {
468
                STemp.Angle = this.Angle;
469
                STemp.EndPoint = this.EndPoint;
470
                STemp.UserID = this.UserID;
471
                STemp.LB = this.LeftBottomPoint;
472
                STemp.Name = this.GetType().Name;
473
                STemp.PointSet = this.PointSet;
474
                STemp.StartPoint = this.StartPoint;
475
                STemp.Opac = this.Opacity;
476
                STemp.TR = this.TopRightPoint;
477
                STemp.TransformPoint = "0|0";
478
                STemp.FontColor = this.FontColor.Color.ToString();
479
                //STemp.FontColor = "#FFFFFF00";
480
                STemp.SizeSet = String.Format("{0}", this.LineSize);
481
                STemp.Text = this.Text;
482
                ///강인구 추가(2017.11.02)
483
                ///Memo 추가
484
                STemp.Memo = this.Memo;
485

  
486
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
487
            }
488
        }
456 489
    }
457 490
}
MarkupToPDF/Controls/Etc/ImgControl.cs
13 13
using System.Linq;
14 14
using MarkupToPDF.Controls.Common;
15 15
using MarkupToPDF.Common;
16
using MarkupToPDF.Serialize.Core;
17
using MarkupToPDF.Serialize.S_Control;
16 18

  
17 19
namespace MarkupToPDF.Controls.Etc
18 20
{
......
248 250
            }
249 251
        }
250 252

  
251
        public ControlType ControlType
253
        override public ControlType ControlType
252 254
        {
253 255
            set
254 256
            {
......
340 342

  
341 343
        public Geometry PathData { get; set; }
342 344

  
343
        
345
        /// <summary>
346
        /// Serialize this
347
        /// </summary>
348
        /// <param name="sUserId"></param>
349
        /// <returns></returns>
350
        public override string Serialize()
351
        {
352
            using (S_ImgControl STemp = new S_ImgControl())
353
            {
354
                STemp.Angle = this.Angle;
355
                STemp.EndPoint = this.EndPoint;
356
                STemp.LB = this.LeftBottomPoint;
357
                STemp.Name = this.GetType().Name;
358
                STemp.PointSet = this.PointSet;
359
                STemp.StartPoint = this.StartPoint;
360
                STemp.UserID = this.UserID;
361
                STemp.Opac = this.Opacity;
362
                STemp.TR = this.TopRightPoint;
363
                STemp.ImagePath = this.FilePath;
364
                ///강인구 추가(2017.11.02)
365
                ///Memo 추가
366
                STemp.Memo = this.Memo;
367

  
368
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
369
            }
370
        }
344 371
    }
345 372
}
MarkupToPDF/Controls/Etc/SignControl.cs
13 13
using System.Linq;
14 14
using MarkupToPDF.Controls.Common;
15 15
using MarkupToPDF.Common;
16
using MarkupToPDF.Serialize.Core;
17
using MarkupToPDF.Serialize.S_Control;
16 18

  
17 19
//강인구 추가
18 20
namespace MarkupToPDF.Controls.Etc
......
213 215
            }
214 216
        }
215 217

  
216
        public ControlType ControlType
218
        override public ControlType ControlType
217 219
        {
218 220
            set
219 221
            {
......
289 291
            this.LeftBottomPoint = new Point(this.PointSet[1].X, this.PointSet[1].Y);
290 292
            this.EndPoint = new Point(this.PointSet[2].X, this.PointSet[2].Y);
291 293
        }
292
        public double LineSize
294

  
295
        /// <summary>
296
        /// Serialize this
297
        /// </summary>
298
        /// <param name="sUserId"></param>
299
        /// <returns></returns>
300
        public override string Serialize()
301
        {
302
            using (S_SignControl STemp = new S_SignControl())
303
            {
304
                STemp.Angle = this.Angle;
305
                STemp.EndPoint = this.EndPoint;
306
                STemp.UserID = this.UserID;
307
                STemp.LB = this.LeftBottomPoint;
308
                STemp.Name = this.GetType().Name;
309
                STemp.PointSet = this.PointSet;
310
                STemp.StartPoint = this.StartPoint;
311
                STemp.Opac = this.Opacity;
312
                STemp.TR = this.TopRightPoint;
313
                STemp.UserNumber = this.UserNumber == null ? this.UserID: this.UserNumber;
314

  
315
                ///강인구 추가(2017.11.02)
316
                ///Memo 추가
317
                STemp.Memo = this.Memo;
318

  
319
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
320
            }
321
        }
322

  
323
public double LineSize
293 324
        {
294 325
            get;
295 326
            set;
MarkupToPDF/Controls/Etc/SymControl.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15

  
15
using MarkupToPDF.Serialize.Core;
16
using MarkupToPDF.Serialize.S_Control;
16 17

  
17 18
namespace MarkupToPDF.Controls.Etc
18 19
{
......
276 277
            }
277 278
        }
278 279

  
279
        public ControlType ControlType
280
        override public ControlType ControlType
280 281
        {
281 282
            set
282 283
            {
......
367 368
            this.Paint = state;
368 369
            this.SetSymPath();
369 370
        }
371

  
372
        /// <summary>
373
        /// Serialize this
374
        /// </summary>
375
        /// <param name="sUserId"></param>
376
        /// <returns></returns>
377
        public override string Serialize()
378
        {
379
            using (S_SymControl STemp = new S_SymControl())
380
            {
381
                STemp.TransformPoint = "0|0";
382
                STemp.PointSet = this.PointSet;
383
                STemp.UserID = this.UserID;
384
                STemp.SizeSet = String.Format("{0}", this.LineSize.ToString());
385
                STemp.PaintState = this.Paint;
386
                STemp.PathInfo = this.PathData.ToString();
387
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
388
                STemp.StartPoint = this.StartPoint;
389
                STemp.Angle = this.Angle;
390
                STemp.EndPoint = this.EndPoint;
391
                STemp.LB = this.LeftBottomPoint;
392
                STemp.TR = this.TopRightPoint;
393
                STemp.Opac = this.Opacity;
394
                STemp.Name = this.GetType().Name.ToString();
395

  
396
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
397
            }
398
        }
370 399
    }
371 400
}
MarkupToPDF/Controls/Etc/SymControlN.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.Core;
16
using MarkupToPDF.Serialize.S_Control;
15 17

  
16 18
namespace MarkupToPDF.Controls.Etc
17 19
{
......
279 281
            }
280 282
        }
281 283

  
282
        public ControlType ControlType
284
        override public ControlType ControlType
283 285
        {
284 286
            set
285 287
            {
......
333 335
            this.TopRightPoint = new Point(this.PointSet[3].X, this.PointSet[3].Y);
334 336
            this.SetViewBox();
335 337
        }
338

  
339
        /// <summary>
340
        /// Serialize this
341
        /// </summary>
342
        /// <param name="sUserId"></param>
343
        /// <returns></returns>
344
        public override string Serialize()
345
        {
346
            using (S_SymControlN STemp = new S_SymControlN())
347
            {
348
                STemp.TransformPoint = "0|0";
349
                STemp.PointSet = this.PointSet;
350
                //STemp.XamlData = this.PathXathData;
351
                STemp.UserID = this.UserID;
352
                STemp.DBData = this.PathXathData;
353
                //STemp.StrokeColor = this.StrokeColor.Color.ToString();
354
                STemp.StartPoint = this.StartPoint;
355
                STemp.Angle = this.Angle;
356
                STemp.EndPoint = this.EndPoint;
357
                STemp.LB = this.LeftBottomPoint;
358
                STemp.TR = this.TopRightPoint;
359
                STemp.Opac = this.Opacity;
360
                STemp.Name = this.GetType().Name.ToString();
361

  
362
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
363
            }
364
        }
336 365
    }
337 366
}
338 367

  
MarkupToPDF/Controls/Line/ArcControl.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.S_Control;
16
using MarkupToPDF.Serialize.Core;
15 17

  
16 18
namespace MarkupToPDF.Controls.Line
17 19
{
......
284 286
            }
285 287
        }
286 288

  
287
        public ControlType ControlType
289
        override public ControlType ControlType
288 290
        {
289 291
            get
290 292
            {
......
518 520
        {
519 521
            this.OverViewPathData = this.PathData;
520 522
        }
523

  
524
        /// <summary>
525
        /// Serialize this
526
        /// </summary>
527
        /// <param name="sUserId"></param>
528
        /// <returns></returns>
529
        public override string Serialize()
530
        {
531
            using (S_ArcControl STemp = new S_ArcControl())
532
            {
533
                STemp.TransformPoint = "0|0";
534
                STemp.PointSet = this.PointSet;
535
                STemp.SizeSet = String.Format("{0}", this.LineSize);
536
                //STemp.StrokeColor = "#FF000FFF";
537
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
538
                STemp.StartPoint = this.StartPoint;
539
                STemp.UserID = this.UserID;
540
                STemp.Opac = this.Opacity;
541
                STemp.MidPoint = this.MidPoint;
542
                STemp.EndPoint = this.EndPoint;
543
                STemp.IsTransOn = this.isTransOn;
544
                STemp.DashSize = this.DashSize;
545
                STemp.Clock = this.Clock;
546
                //STemp.ArcStyleSet = instance.ControlType;
547
                STemp.Name = this.GetType().Name.ToString();
548

  
549
                ///강인구 추가(2017.11.02)
550
                ///Memo 추가
551
                STemp.Memo = this.Memo;
552

  
553
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
554
            }
555
        }
521 556
    }
522 557
}
MarkupToPDF/Controls/Line/ArrowArcControl.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.Core;
16
using MarkupToPDF.Serialize.S_Control;
15 17

  
16 18
namespace MarkupToPDF.Controls.Line
17 19
{
......
283 285
            }
284 286
        }
285 287

  
286
        public ControlType ControlType
288
        override public ControlType ControlType
287 289
        {
288 290
            get
289 291
            {
......
463 465
        {
464 466
            this.OverViewPathData = this.PathData;
465 467
        }
468

  
469
        /// <summary>
470
        /// Serialize this
471
        /// </summary>
472
        /// <param name="sUserId"></param>
473
        /// <returns></returns>
474
        public override string Serialize()
475
        {
476
            using (S_ArrowArcControl STemp = new S_ArrowArcControl())
477
            {
478
                STemp.TransformPoint = "0|0";
479
                STemp.PointSet = this.PointSet;
480
                STemp.SizeSet = String.Format("{0}", this.LineSize);
481
                //STemp.StrokeColor = "#FF000FFF";
482
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
483
                STemp.StartPoint = this.StartPoint;
484
                STemp.UserID = this.UserID;
485
                STemp.Opac = this.Opacity;
486
                STemp.MidPoint = this.MidPoint;
487
                STemp.EndPoint = this.EndPoint;
488
                STemp.IsTransOn = this.isTransOn;
489
                STemp.DashSize = this.DashSize;
490
                STemp.Clock = this.Clock;
491
                //STemp.ArcStyleSet = this.ControlType;
492
                STemp.Name = this.GetType().Name.ToString();
493

  
494
                ///강인구 추가(2017.11.02)
495
                ///Memo 추가
496
                STemp.Memo = this.Memo;
497

  
498
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
499
            }
500
        }
466 501
    }
467 502
}
MarkupToPDF/Controls/Line/ArrowControl_Multi.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.S_Control;
16
using MarkupToPDF.Serialize.Core;
15 17

  
16 18
namespace MarkupToPDF.Controls.Line
17 19
{
18

  
19 20
    public class ArrowControl_Multi : CommentUserInfo, IDisposable, INotifyPropertyChanged, IMarkupCommonData, IDashControl
20 21
    {
21 22

  
......
41 42
        #region Dependency Properties
42 43

  
43 44
        public static readonly DependencyProperty IsSelectedProperty =
44
DependencyProperty.Register("IsSelected", typeof(bool), typeof(ArrowControl_Multi), new FrameworkPropertyMetadata(false, IsSelectedChanged));
45
            DependencyProperty.Register("IsSelected", typeof(bool), typeof(ArrowControl_Multi), new FrameworkPropertyMetadata(false, IsSelectedChanged));
45 46

  
46 47
        public static readonly DependencyProperty ControlTypeProperty =
47
    DependencyProperty.Register("ControlType", typeof(ControlType), typeof(ArrowControl_Multi), new FrameworkPropertyMetadata(ControlType.ArrowMultiLine));
48
            DependencyProperty.Register("ControlType", typeof(ControlType), typeof(ArrowControl_Multi), new FrameworkPropertyMetadata(ControlType.ArrowMultiLine));
48 49

  
49 50
        public static readonly DependencyProperty OverViewPathDataProperty = DependencyProperty.Register(
50 51
                "OverViewPathData", typeof(Geometry), typeof(ArrowControl_Multi), new PropertyMetadata(null));
......
158 159
            }
159 160
        }
160 161

  
161
        public ControlType ControlType
162
        override public ControlType ControlType
162 163
        {
163 164
            get
164 165
            {
......
294 295
            this.PathData = instanceGroup;
295 296
            OverViewPathData = PathData;
296 297
        }
297
        //public static PathGeometry SingleAllow(Point p2, Point p1, double lineSize)
298
        //{
299
        //    double theta = Math.Atan2((p2.Y - p1.Y), (p2.X - p1.X)) * 180 / Math.PI;
300
        //    PathGeometry pathGeometry = new PathGeometry();
301
        //    PathFigure pathFigure = new PathFigure();
302
        //    pathFigure.StartPoint = p1;
303

  
304
        //    Point lpoint = new Point(p1.X + lineSize * 3, p1.Y + lineSize * 6);
305
        //    Point rpoint = new Point(p1.X - lineSize * 3, p1.Y + lineSize * 6);
306

  
307
        //    //Point lpoint = new Point(p1.X + lineSize, p1.Y + lineSize * 4);
308
        //    //Point rpoint = new Point(p1.X - lineSize, p1.Y + lineSize * 4);
309

  
310
        //    //Point lpoint = new Point(p1.X + lineSize * 3, p1.Y + lineSize * 6);
311
        //    //Point rpoint = new Point(p1.X - lineSize * 3, p1.Y + lineSize * 6);
312

  
313
        //    LineSegment seg1 = new LineSegment();
314
        //    seg1.Point = lpoint;
315
        //    pathFigure.Segments.Add(seg1);
316

  
317
        //    LineSegment seg2 = new LineSegment();
318
        //    seg2.Point = rpoint;
319
        //    pathFigure.Segments.Add(seg2);
320

  
321
        //    LineSegment seg3 = new LineSegment();
322
        //    seg3.Point = p1;
323
        //    pathFigure.Segments.Add(seg3);
324

  
325
        //    pathFigure.IsClosed = true;
326
        //    pathFigure.IsFilled = true;
327

  
328
        //    pathGeometry.Figures.Add(pathFigure);
329
        //    pathGeometry.FillRule = FillRule.Nonzero;
330
        //    RotateTransform transform = new RotateTransform();
331
        //    transform.Angle = theta - 90;
332
        //    transform.CenterX = p1.X;
333
        //    transform.CenterY = p1.Y;
334
        //    pathGeometry.Transform = transform;
335
        //    return pathGeometry;
336
        //}
337 298

  
338 299
        protected void OnPropertyChanged(string propName)
339 300
        {
......
346 307
            this.MiddlePoint = new Point(this.PointSet[1].X, this.PointSet[1].Y);
347 308
            this.EndPoint = new Point(this.PointSet[2].X, this.PointSet[2].Y);
348 309
        }
310

  
311
        /// <summary>
312
        /// Serialize this
313
        /// </summary>
314
        /// <param name="sUserId"></param>
315
        /// <returns></returns>
316
        public override string Serialize()
317
        {
318
            using (S_ArrowControl_Multi STemp = new S_ArrowControl_Multi())
319
            {
320
                STemp.TransformPoint = "0|0";
321
                STemp.PointSet = this.PointSet;
322
                STemp.SizeSet = String.Format("{0}", this.LineSize);
323
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
324
                STemp.StartPoint = this.StartPoint;
325
                STemp.EndPoint = this.EndPoint;
326
                STemp.UserID = this.UserID;
327
                STemp.Opac = this.Opacity;
328
                STemp.DashSize = this.DashSize;
329
                STemp.MidPoint = this.MiddlePoint;
330
                STemp.Name = this.GetType().Name.ToString();
331

  
332
                ///강인구 추가(2017.11.02)
333
                ///Memo 추가
334
                STemp.Memo = this.Memo;
335

  
336
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
337
            };
338
        }
339

  
349 340
        public void Dispose()
350 341
        {
351 342
            GC.Collect();
MarkupToPDF/Controls/Line/LineControl.cs
12 12
using System.Collections.Generic;
13 13
using MarkupToPDF.Controls.Common;
14 14
using MarkupToPDF.Common;
15
using MarkupToPDF.Serialize.S_Control;
16
using MarkupToPDF.Serialize.Core;
15 17

  
16 18
namespace MarkupToPDF.Controls.Line
17 19
{
......
297 299
            }
298 300
        }
299 301

  
300
        public ControlType ControlType
302
        override public ControlType ControlType
301 303
        {
302 304
            get
303 305
            {
......
481 483
                this.OverViewPathData = PathData;
482 484
            }
483 485
        }
486

  
487
        /// <summary>
488
        /// Serialize this
489
        /// </summary>
490
        /// <param name="sUserId"></param>
491
        /// <returns></returns>
492
        public override string Serialize()
493
        {
494
            using (S_LineControl STemp = new S_LineControl())
495
            {
496
                STemp.TransformPoint = "0|0";
497
                STemp.PointSet = this.PointSet;
498
                STemp.SizeSet = String.Format("{0}", this.LineSize);
499
                STemp.LineStyleSet = this.LineStyleSet;
500
                //STemp.StrokeColor = "#FF00FF00";
501
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
502
                STemp.StartPoint = this.StartPoint;
503
                STemp.EndPoint = this.EndPoint;
504
                STemp.UserID = this.UserID;
505
                STemp.Opac = this.Opacity;
506
                STemp.DashSize = this.DashSize;
507
                STemp.Interval = this.Interval;
508
                STemp.DimSize = this.DimSize;
509
                STemp.Name = this.GetType().Name.ToString();
510

  
511
                ///강인구 추가(2017.11.02)
512
                ///Memo 추가
513
                STemp.Memo = this.Memo;
514

  
515
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
516
            }
517
        }
484 518
    }
485 519
}
MarkupToPDF/Controls/Parsing/MarkupCopy.cs
26 26

  
27 27
namespace MarkupToPDF.Controls.Parsing
28 28
{
29
    //public partial class LayerControl : Control
30
    //{
31
    //public class MarkupReturn
32
    //{
33
    //    public string ConvertData { get; set; }
34
    //    public int DATA_TYPE { get; set; }
35
    //}
36

  
37
    //public string MarkupToString(ObservableCollection<CommentUserInfo> baseLayer, string UserId)
38
    //{
39

  
40
    //    String ConvertData = "";
41

  
42
    //    #region ######### 마크업 파싱##########
43
    //    foreach (UIElement item in baseLayer)
44
    //    {
45
    //        switch (item.GetType().Name.ToString())
46
    //        {
47
    //            #region Arrow_Multi
48
    //            case "ArrowControl_Multi":
49
    //                using (S_ArrowControl_Multi STemp = new S_ArrowControl_Multi())
50
    //                {
51
    //                    var instance = item as ArrowControl_Multi;
52
    //                    STemp.TransformPoint = "0|0";
53
    //                    STemp.PointSet = instance.PointSet;
54
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
55
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
56
    //                    STemp.StartPoint = instance.StartPoint;
57
    //                    STemp.EndPoint = instance.EndPoint;
58
    //                    STemp.UserID = UserId;
59
    //                    STemp.Opac = instance.Opacity;
60
    //                    STemp.DashSize = instance.DashSize;
61
    //                    STemp.MidPoint = instance.MiddlePoint;
62
    //                    STemp.Name = instance.GetType().Name.ToString();
63
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
64
    //                };
65
    //                break;
66
    //            #endregion
67
    //            #region ArrowText
68
    //            case "ArrowTextControl":
69
    //                using (S_ArrowTextControl STemp = new S_ArrowTextControl())
70
    //                {
71
    //                    var instance = item as ArrowTextControl;
72
    //                    STemp.TransformPoint = "0|0";
73
    //                    STemp.PointSet = instance.PointSet;
74
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
75
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
76
    //                    STemp.StartPoint = instance.StartPoint;
77
    //                    STemp.ArrowStyle = instance.ArrowTextStyle;
78
    //                    STemp.UserID = UserId;
79
    //                    STemp.ArrowText = instance.Base_TextBox.Text;
80
    //                    STemp.BorderSize = instance.BorderSize;
81
    //                    STemp.isHighLight = instance.isHighLight;
82
    //                    STemp.BoxHeight = instance.BoxHeight;
83
    //                    STemp.BoxWidth = instance.BoxWidth;
84
    //                    STemp.Opac = instance.Opacity;
85
    //                    STemp.EndPoint = instance.EndPoint;
86
    //                    STemp.isFixed = instance.isFixed;
87
    //                    //STemp.DashSize = instance.DashSize;
88
    //                    STemp.Name = instance.GetType().Name.ToString();
89
    //                    STemp.isTrans = instance.isTrans;
90
    //                    STemp.MidPoint = instance.MidPoint;
91
    //                    STemp.Angle = instance.Angle;
92
    //                    STemp.fontConfig = new List<string>()
93
    //                    {
94
    //                        instance.TextFamily.ToString(),
95
    //                        instance.TextStyle.ToString(),
96
    //                        instance.TextWeight.ToString(),
97
    //                        instance.TextSize.ToString(),
98
    //                    };
99
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
100
    //                };
101
    //                break;
102
    //            #endregion
103
    //            #region Line
104
    //            case "LineControl":
105
    //                using (S_LineControl STemp = new S_LineControl())
106
    //                {
107
    //                    var instance = item as LineControl;
108
    //                    STemp.TransformPoint = "0|0";
109
    //                    STemp.PointSet = instance.PointSet;
110
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
111
    //                    STemp.LineStyleSet = instance.LineStyleSet;
112
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
113
    //                    STemp.StartPoint = instance.StartPoint;
114
    //                    STemp.EndPoint = instance.EndPoint;
115
    //                    STemp.UserID = UserId;
116
    //                    STemp.Opac = instance.Opacity;
117
    //                    STemp.DashSize = instance.DashSize;
118
    //                    STemp.Interval = instance.Interval;
119
    //                    STemp.DimSize = instance.DimSize;
120
    //                    STemp.Name = instance.GetType().Name.ToString();
121
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
122
    //                };
123
    //                break;
124
    //            #endregion
125
    //            #region Arc
126
    //            case "ArcControl":
127
    //                using (S_ArcControl STemp = new S_ArcControl())
128
    //                {
129
    //                    var instance = item as ArcControl;
130
    //                    STemp.TransformPoint = "0|0";
131
    //                    STemp.PointSet = instance.PointSet;
132
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
133
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
134
    //                    STemp.StartPoint = instance.StartPoint;
135
    //                    STemp.UserID = UserId;
136
    //                    STemp.Opac = instance.Opacity;
137
    //                    STemp.MidPoint = instance.MidPoint;
138
    //                    STemp.EndPoint = instance.EndPoint;
139
    //                    STemp.IsTransOn = instance.isTransOn;
140
    //                    STemp.DashSize = instance.DashSize;
141
    //                    STemp.Clock = instance.Clock;
142
    //                    //STemp.ArcStyleSet = instance.ControlType;
143
    //                    STemp.Name = instance.GetType().Name.ToString();
144
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
145
    //                };
146
    //                break;
147
    //            #endregion
148
    //            #region RectCloud
149
    //            case "RectCloudControl":
150
    //                {
151
    //                    using (S_RectCloudControl STemp = new S_RectCloudControl())
152
    //                    {
153
    //                        var instance = item as RectCloudControl;
154
    //                        STemp.TransformPoint = "0|0";
155
    //                        STemp.PointSet = instance.PointSet;
156
    //                        STemp.SizeSet = String.Format("{0}", instance.LineSize);
157
    //                        STemp.StrokeColor = instance.StrokeColor.Color.ToString();
158
    //                        STemp.StartPoint = instance.StartPoint;
159
    //                        STemp.UserID = UserId;
160
    //                        STemp.Opac = instance.Opacity;
161
    //                        STemp.TR = instance.TopRightPoint;
162
    //                        STemp.LB = instance.LeftBottomPoint;
163
    //                        STemp.EndPoint = instance.EndPoint;
164
    //                        STemp.PaintState = instance.Paint;
165
    //                        STemp.DashSize = instance.DashSize;
166
    //                        STemp.Name = instance.GetType().Name.ToString();
167
    //                        ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
168
    //                    }
169
    //                }
170
    //                break;
171
    //            #endregion
172
    //            #region Circle
173
    //            case "CircleControl":
174
    //                using (S_CircleControl STemp = new S_CircleControl())
175
    //                {
176
    //                    var instance = item as CircleControl;
177
    //                    STemp.TransformPoint = "0|0";
178
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
179
    //                    STemp.PaintState = instance.Paint;
180
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
181
    //                    if (instance.FillColor != null)
182
    //                    {
183
    //                        STemp.FillColor = instance.FillColor.Color.ToString();
184
    //                    }
185
    //                    STemp.StartPoint = instance.StartPoint;
186
    //                    STemp.UserID = UserId;
187
    //                    STemp.EndPoint = instance.EndPoint;
188
    //                    STemp.TRP = instance.TopRightPoint;
189
    //                    STemp.LBP = instance.LeftBottomPoint;
190
    //                    STemp.Opac = instance.Opacity;
191
    //                    STemp.Angle = instance.Angle;
192
    //                    STemp.PointSet = instance.PointSet;
193
    //                    STemp.DashSize = instance.DashSize;
194
    //                    STemp.Name = instance.GetType().Name.ToString();
195
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
196
    //                };
197
    //                break;
198
    //            #endregion
199
    //            #region Rectangle
200
    //            case "RectangleControl":
201
    //                using (S_RectControl STemp = new S_RectControl())
202
    //                {
203
    //                    var instance = item as RectangleControl;
204
    //                    STemp.TransformPoint = "0|0";
205
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
206
    //                    STemp.PaintState = instance.Paint;
207
    //                    STemp.PointSet = instance.PointSet;
208
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
209
    //                    if (instance.FillColor != null)
210
    //                    {
211
    //                        STemp.FillColor = instance.FillColor.Color.ToString();
212
    //                    }
213
    //                    STemp.StartPoint = instance.StartPoint;
214
    //                    STemp.UserID = instance.Uid;
215
    //                    //STemp.Angle = instance.a;
216
    //                    STemp.EndPoint = instance.EndPoint;
217
    //                    STemp.LB = instance.LeftBottomPoint;
218
    //                    STemp.TR = instance.TopRightPoint;
219
    //                    //STemp.DashSize = instance.DashSize;
220
    //                    STemp.Opac = instance.Opacity;
221
    //                    STemp.Name = instance.GetType().Name.ToString();
222
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
223
    //                };
224
    //                break;
225
    //            #endregion
226
    //            #region Triangle
227
    //            case "TriControl":
228
    //                using (S_TriControl STemp = new S_TriControl())
229
    //                {
230
    //                    var instance = item as TriControl;
231
    //                    STemp.TransformPoint = "0|0";
232
    //                    STemp.Paint = instance.Paint;
233
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
234
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
235
    //                    if (instance.FillColor != null)
236
    //                    {
237
    //                        STemp.FillColor = instance.FillColor.Color.ToString();
238
    //                    }
239
    //                    STemp.StartPoint = instance.StartPoint;
240
    //                    STemp.EndPoint = instance.EndPoint;
241
    //                    STemp.MidPoint = instance.MidPoint;
242
    //                    STemp.Opac = instance.Opacity;
243
    //                    STemp.UserID = UserId;
244
    //                    STemp.PointSet = instance.PointSet;
245
    //                    STemp.Angle = instance.Angle;
246
    //                    STemp.DashSize = instance.DashSize;
247
    //                    STemp.Name = instance.GetType().Name.ToString();
248
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
249
    //                }
250
    //                break;
251
    //            #endregion
252
    //            #region Poly
253
    //            case "PolygonControl":
254
    //                using (S_PolyControl STemp = new S_PolyControl())
255
    //                {
256
    //                    var instance = item as PolygonControl;
257

  
258
    //                    STemp.TransformPoint = "0|0";
259
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
260
    //                    //STemp.StrokeColor = instance.StrokeColor.Color.ToString();
261
    //                    STemp.Name = instance.GetType().Name.ToString();
262
    //                    //STemp.Toler = instance.Toler;
263
    //                    //STemp.PaintState = instance.Paint;
264
    //                    STemp.Opac = instance.Opacity;
265
    //                    STemp.UserID = UserId;
266
    //                    //STemp.IsTrans = instance.isTransOn;
267
    //                    //STemp.IsChain = instance.isChain;
268
    //                    STemp.PointSet = new List<Point>();
269
    //                    //STemp.DashSize = instance.DashSize;
270
    //                    STemp.IsCompleted = instance.IsCompleted;
271
    //                    foreach (var point in instance.PointSet)
272
    //                    {
273
    //                        STemp.PointSet.Add(point);
274
    //                    }
275
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
276
    //                };
277
    //                break;
278
    //            #endregion
279
    //            #region Cloud
280
    //            case "CloudControl":
281
    //                using (S_CloudControl STemp = new S_CloudControl())
282
    //                {
283
    //                    var instance = item as CloudControl;
284

  
285
    //                    STemp.TransformPoint = "0|0";
286
    //                    STemp.SizeSet = String.Format("{0}", instance.LineSize);
287
    //                    STemp.StrokeColor = instance.StrokeColor.Color.ToString();
288
    //                    STemp.Name = instance.GetType().Name.ToString();
289
    //                    STemp.Toler = instance.Toler;
290
    //                    STemp.PaintState = instance.Paint;
291
    //                    STemp.Opac = instance.Opacity;
292
    //                    STemp.UserID = UserId;
293
    //                    STemp.IsTrans = instance.isTransOn;
294
    //                    STemp.IsChain = instance.isChain;
295
    //                    STemp.PointSet = new List<Point>();
296
    //                    STemp.DashSize = instance.DashSize;
297
    //                    foreach (var point in instance.PointSet)
298
    //                    {
299
    //                        STemp.PointSet.Add(point);
300
    //                    }
301

  
302
    //                    //STemp.CloudFill = instance.Fill;
303
    //                    STemp.ArcLength = instance.ArcLength;
304
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
305
    //                }
306
    //                break;
307
    //            #endregion
308
    //            #region Sign
309
    //            case "SignControl":
310
    //                {
311
    //                    using (S_SignControl STemp = new S_SignControl())
312
    //                    {
313
    //                        //SignControl instance = item as SignControl;
314
    //                        //STemp.Angle = instance.Angle;
315
    //                        //STemp.EndPoint = instance.EndPoint;
316
    //                        //STemp.UserID = UserId;
317
    //                        //STemp.LB = instance.LeftBottomPoint;
318
    //                        //STemp.Name = instance.GetType().Name;
319
    //                        //STemp.PointSet = instance.PointSet;
320
    //                        //STemp.StartPoint = instance.StartPoint;
321
    //                        //STemp.Opac = instance.Opacity;
322
    //                        //STemp.TR = instance.TopRightPoint;
323
    //                        //STemp.UserNumber = instance.UserNumber;
324
    //                        //ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
325
    //                    }
326
    //                }
327
    //                break;
328
    //            #endregion
329
    //            #region Ink
330
    //            case "InkPresenter":
331
    //                {
332
    //                    var instance = item as InkPresenter;
333
    //                    if (instance.Strokes.Count >= 1)
334
    //                    {
335
    //                        using (S_PensilControl STemp = new S_PensilControl())
336
    //                        {
337
    //                            bool isRealData = true;
338
    //                            foreach (var strokeData in instance.Strokes)
339
    //                            {
340
    //                                if (strokeData.StylusPoints.Count == 0)
341
    //                                {
342
    //                                    isRealData = false;
343
    //                                }
344
    //                            }
345
    //                            if (isRealData)
346
    //                            {
347
    //                                if (instance.Tag != null)
348
    //                                {
349
    //                                    STemp.UserID = instance.Tag.ToString();
350
    //                                }
351
    //                                STemp.SCC = instance.Strokes;
352
    //                                STemp.Name = instance.GetType().Name;
353
    //                                STemp.Opac = instance.Opacity;
354
    //                                STemp.TransformPoint = "0|0";
355
    //                                ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
356
    //                            }
357
    //                        }
358
    //                    }
359
    //                }
360
    //                break;
361
    //            #endregion
362
    //            #region Text
363
    //            case "TextControl":
364
    //                using (S_TextControl STemp = new S_TextControl())
365
    //                {
366

  
367
    //                    var instance = item as TextControl;
368
    //                    STemp.TransformPoint = "0|0";
369
    //                    STemp.SizeSet = String.Format("{0}|{1}", instance.LineSize.Left.ToString(), instance.TextSize.ToString());
370
    //                    STemp.Text = instance.Text;
371
    //                    STemp.UserID = UserId;
372
    //                    STemp.FontColor = instance.FontColor.Color.ToString();
373
    //                    //STemp.EndPoint = instance.EndPoint;
374
    //                    STemp.StartPoint = new Point(instance.CanvasX, instance.CanvasY);
375
    //                    STemp.Opac = instance.Opacity;
376
    //                    //STemp.StartPoint = instance.StartPoint;
377
    //                    STemp.PointSet = instance.PointSet;
378
    //                    STemp.Angle = instance.Angle;
379
    //                    STemp.paintMethod = instance.ControlType_No;
380
    //                    STemp.BoxW = instance.BoxWidth;
381
    //                    STemp.BoxH = instance.BoxHeight;
382
    //                    STemp.isHighLight = instance.IsHighLight;
383
    //                    STemp.Name = instance.GetType().Name.ToString();
384
    //                    STemp.fontConfig = new List<string>()
385
    //                    {
386
    //                        instance.TextFamily.ToString(),
387
    //                        instance.TextStyle.ToString(),
388
    //                        instance.TextWeight.ToString(),
389
    //                    };
390

  
391

  
392

  
393
    //                    if (instance.UnderLine != null)
394
    //                    {
395
    //                        STemp.fontConfig.Add("true");
396
    //                    }
397

  
398
    //                    ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
399
    //                }
400
    //                break;
401
    //            #endregion
402
    //            #region Date
403
    //            case "DateControl":
404
    //                {
405
    //                    using (S_DateControl STemp = new S_DateControl())
406
    //                    {
407
    //                        DateControl instance = item as DateControl;
408
    //                        STemp.Angle = instance.Angle;
409
    //                        STemp.EndPoint = instance.EndPoint;
410
    //                        STemp.UserID = UserId;
411
    //                        STemp.LB = instance.LeftBottomPoint;
412
    //                        STemp.Name = instance.GetType().Name;
413
    //                        STemp.PointSet = instance.PointSet;
414
    //                        STemp.StartPoint = instance.StartPoint;
415
    //                        STemp.Opac = instance.Opacity;
416
    //                        STemp.TR = instance.TopRightPoint;
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)