프로젝트

일반

사용자정보

개정판 684ef11c

ID684ef11c766d313d568ea0db90bdb1b2ce708613
상위 a74e3cbc
하위 022d64c4

이지연이(가) 5년 이상 전에 추가함

issue #719 AutoCAD 저장 작업 중

Change-Id: I46dfcaa8fb3b15907afe75a1e17ae643bef64f3f

차이점 보기:

MarkupToPDF/Controls/Parsing/MarkupParse.cs
27 27
using System.Collections.ObjectModel;
28 28
using MarkupToPDF.Common;
29 29
using Svg2Xaml;
30
using MarkupToPDF.Controls.Cad;
30 31

  
31 32
namespace MarkupToPDF.Controls.Parsing
32 33
{
......
3437 3438
                            break;
3438 3439
                        #endregion
3439 3440

  
3441
                        #region Cad
3442
                        case "InsideWhiteControl":
3443
                            using (S_InsideWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_InsideWhiteControl>(item))
3444
                            {
3445
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
3446
                                InsideWhiteControl instance = new InsideWhiteControl
3447
                                {
3448
                                    LineSize = Convert.ToDouble(data2.First()),
3449
                                    Paint = s.PaintState,
3450
                                    StartPoint = s.StartPoint,
3451
                                    EndPoint = s.EndPoint,
3452
                                    Angle = s.Angle,
3453
                                    StrokeColor = Brushes.White,
3454
                                    DashSize = s.DashSize,
3455
                                    Opacity = s.Opac,
3456
                                    LeftBottomPoint = s.LB,
3457
                                    TopRightPoint = s.TR,
3458
                                    PointSet = s.PointSet,
3459
                                    UserID = s.UserID,
3460
                                    FillColor = Brushes.White,
3461
                                };
3462

  
3463
                                Layer.Children.Add(instance);
3464
                                instance.ApplyTemplate();
3465
                                instance.SetRectPath();
3466
                            }
3467
                            break;
3468
                        case "OverlapWhiteControl":
3469
                            using (S_OverlapWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_OverlapWhiteControl>(item))
3470
                            {
3471
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
3472
                                OverlapWhiteControl instance = new OverlapWhiteControl
3473
                                {
3474
                                    LineSize = Convert.ToDouble(data2.First()),
3475
                                    Paint = s.PaintState,
3476
                                    StartPoint = s.StartPoint,
3477
                                    EndPoint = s.EndPoint,
3478
                                    Angle = s.Angle,
3479
                                    StrokeColor = Brushes.White,
3480
                                    DashSize = s.DashSize,
3481
                                    Opacity = s.Opac,
3482
                                    LeftBottomPoint = s.LB,
3483
                                    TopRightPoint = s.TR,
3484
                                    PointSet = s.PointSet,
3485
                                    UserID = s.UserID,
3486
                                    FillColor = Brushes.White,
3487
                                };
3488

  
3489
                                Layer.Children.Add(instance);
3490
                                instance.ApplyTemplate();
3491
                                instance.SetRectPath();
3492
                            }
3493
                            break;
3494
                        case "ClipWhiteControl":
3495
                            using (S_ClipWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_ClipWhiteControl>(item))
3496
                            {
3497
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
3498
                                ClipWhiteControl instance = new ClipWhiteControl
3499
                                {
3500
                                    LineSize = Convert.ToDouble(data2.First()),
3501
                                    Paint = s.PaintState,
3502
                                    StartPoint = s.StartPoint,
3503
                                    EndPoint = s.EndPoint,
3504
                                    Angle = s.Angle,
3505
                                    StrokeColor = Brushes.White,
3506
                                    DashSize = s.DashSize,
3507
                                    Opacity = s.Opac,
3508
                                    LeftBottomPoint = s.LB,
3509
                                    TopRightPoint = s.TR,
3510
                                    PointSet = s.PointSet,
3511
                                    UserID = s.UserID,
3512
                                    FillColor = Brushes.White,
3513
                                };
3514

  
3515
                                Layer.Children.Add(instance);
3516
                                instance.ApplyTemplate();
3517
                                instance.SetRectPath();
3518
                            }
3519
                            break;
3520
                        case "CoordinateControl":
3521
                            using (S_CoordinateControl s = JsonSerializerHelper.JsonDeserialize<S_CoordinateControl>(item))
3522
                            {
3523
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
3524
                                CoordinateControl instance = new CoordinateControl
3525
                                {
3526
                                    LineSize = Convert.ToDouble(data2.First()),
3527
                                    Paint = s.PaintState,
3528
                                    StartPoint = s.StartPoint,
3529
                                    EndPoint = s.EndPoint,
3530
                                    Angle = s.Angle,
3531
                                    StrokeColor = Brushes.Yellow,
3532
                                    DashSize = s.DashSize,
3533
                                    Opacity = s.Opac,
3534
                                    LeftBottomPoint = s.LB,
3535
                                    TopRightPoint = s.TR,
3536
                                    PointSet = s.PointSet,
3537
                                    UserID = s.UserID,
3538
                                    // FillColor = Brushes.Yellow,
3539
                                };
3440 3540

  
3541
                                Layer.Children.Add(instance);
3542
                                instance.ApplyTemplate();
3543
                                instance.SetRectPath();
3544
                            }
3545
                            break;
3546
                        #endregion
3441 3547

  
3442 3548
                        default:
3443 3549
                            break;
......
4118 4224
                            }
4119 4225
                            break;
4120 4226
                        #endregion
4227
                        #region Cad
4228
                        case "InsideWhiteControl":
4229
                            using (S_InsideWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_InsideWhiteControl>(item))
4230
                            {
4231
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
4232
                                InsideWhiteControl instance = new InsideWhiteControl
4233
                                {
4234
                                    LineSize = Convert.ToDouble(data2.First()),
4235
                                    Paint = s.PaintState,
4236
                                    StartPoint = s.StartPoint,
4237
                                    EndPoint = s.EndPoint,
4238
                                    Angle = s.Angle,
4239
                                    StrokeColor = Brushes.White,
4240
                                    DashSize = s.DashSize,
4241
                                    Opacity = s.Opac,
4242
                                    LeftBottomPoint = s.LB,
4243
                                    TopRightPoint = s.TR,
4244
                                    PointSet = s.PointSet,
4245
                                    UserID = s.UserID,
4246
                                    FillColor = Brushes.White,
4247
                                };
4248

  
4249
                                instance.Memo = s.Memo;
4250
                                //Layer.Children.Add(instance);
4251
                                instance.MarkupInfoID = markupInfoID;
4252
                                baseLayer.Add(instance);
4253
                                instance.ApplyTemplate();
4254
                                instance.SetRectPath();
4255
                            }
4256
                            break;
4257
                        case "OverlapWhiteControl":
4258
                            using (S_OverlapWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_OverlapWhiteControl>(item))
4259
                            {
4260
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
4261
                                OverlapWhiteControl instance = new OverlapWhiteControl
4262
                                {
4263
                                    LineSize = Convert.ToDouble(data2.First()),
4264
                                    Paint = s.PaintState,
4265
                                    StartPoint = s.StartPoint,
4266
                                    EndPoint = s.EndPoint,
4267
                                    Angle = s.Angle,
4268
                                    StrokeColor = Brushes.White,
4269
                                    DashSize = s.DashSize,
4270
                                    Opacity = s.Opac,
4271
                                    LeftBottomPoint = s.LB,
4272
                                    TopRightPoint = s.TR,
4273
                                    PointSet = s.PointSet,
4274
                                    UserID = s.UserID,
4275
                                    FillColor = Brushes.White,
4276
                                };
4277

  
4278
                                instance.Memo = s.Memo;
4279
                                //Layer.Children.Add(instance);
4280
                                instance.MarkupInfoID = markupInfoID;
4281
                                baseLayer.Add(instance);
4282
                                instance.ApplyTemplate();
4283
                                instance.SetRectPath();
4284
                            }
4285
                            break;
4286
                        case "ClipWhiteControl":
4287
                            using (S_ClipWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_ClipWhiteControl>(item))
4288
                            {
4289
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
4290
                                ClipWhiteControl instance = new ClipWhiteControl
4291
                                {
4292
                                    LineSize = Convert.ToDouble(data2.First()),
4293
                                    Paint = s.PaintState,
4294
                                    StartPoint = s.StartPoint,
4295
                                    EndPoint = s.EndPoint,
4296
                                    Angle = s.Angle,
4297
                                    StrokeColor = Brushes.White,
4298
                                    DashSize = s.DashSize,
4299
                                    Opacity = s.Opac,
4300
                                    LeftBottomPoint = s.LB,
4301
                                    TopRightPoint = s.TR,
4302
                                    PointSet = s.PointSet,
4303
                                    UserID = s.UserID,
4304
                                    FillColor = Brushes.White,
4305
                                };
4306

  
4307
                                instance.Memo = s.Memo;
4308
                                //Layer.Children.Add(instance);
4309
                                instance.MarkupInfoID = markupInfoID;
4310
                                baseLayer.Add(instance);
4311
                                instance.ApplyTemplate();
4312
                                instance.SetRectPath();
4313
                            }
4314
                            break;
4315
                        case "CoordinateControl":
4316
                            using (S_CoordinateControl s = JsonSerializerHelper.JsonDeserialize<S_CoordinateControl>(item))
4317
                            {
4318
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
4319
                                CoordinateControl instance = new CoordinateControl
4320
                                {
4321
                                    LineSize = Convert.ToDouble(data2.First()),
4322
                                    Paint = s.PaintState,
4323
                                    StartPoint = s.StartPoint,
4324
                                    EndPoint = s.EndPoint,
4325
                                    Angle = s.Angle,
4326
                                    StrokeColor = Brushes.Yellow,
4327
                                    DashSize = s.DashSize,
4328
                                    Opacity = s.Opac,
4329
                                    LeftBottomPoint = s.LB,
4330
                                    TopRightPoint = s.TR,
4331
                                    PointSet = s.PointSet,
4332
                                    UserID = s.UserID,
4333
                                    //  FillColor = Brushes.Yellow,
4334
                                };
4335

  
4336
                                instance.Memo = s.Memo;
4337
                                //Layer.Children.Add(instance);
4338
                                instance.MarkupInfoID = markupInfoID;
4339
                                baseLayer.Add(instance);
4340
                                instance.ApplyTemplate();
4341
                                instance.SetRectPath();
4342
                            }
4343
                            break;
4344
                        #endregion
4121 4345
                        default:
4122 4346
                            break;
4123 4347
                    };
......
4872 5096
                            }
4873 5097
                            break;
4874 5098
                        #endregion
5099

  
5100
                        #region Cad
5101
                        case "InsideWhiteControl":
5102
                            using (S_InsideWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_InsideWhiteControl>(item))
5103
                            {
5104
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5105
                                InsideWhiteControl instance = new InsideWhiteControl
5106
                                {
5107
                                    LineSize = Convert.ToDouble(data2.First()),
5108
                                    Paint = s.PaintState,
5109
                                    StartPoint = s.StartPoint,
5110
                                    EndPoint = s.EndPoint,
5111
                                    Angle = s.Angle,
5112
                                    StrokeColor = Brushes.White,
5113
                                    DashSize = s.DashSize,
5114
                                    Opacity = s.Opac,
5115
                                    LeftBottomPoint = s.LB,
5116
                                    TopRightPoint = s.TR,
5117
                                    PointSet = s.PointSet,
5118
                                    UserID = s.UserID,
5119
                                    FillColor = Brushes.White,
5120
                                };
5121

  
5122
                                instance.Memo = s.Memo;
5123
                                //Layer.Children.Add(instance);
5124
                                instance.CommentID = commentId;
5125
                                instance.MarkupInfoID = markupInfoID;
5126
                                baseLayer.Add(instance);
5127
                                instance.ApplyTemplate();
5128
                                instance.SetRectPath();
5129
                            }
5130
                            break;
5131
                        case "OverlapWhiteControl":
5132
                            using (S_OverlapWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_OverlapWhiteControl>(item))
5133
                            {
5134
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5135
                                OverlapWhiteControl instance = new OverlapWhiteControl
5136
                                {
5137
                                    LineSize = Convert.ToDouble(data2.First()),
5138
                                    Paint = s.PaintState,
5139
                                    StartPoint = s.StartPoint,
5140
                                    EndPoint = s.EndPoint,
5141
                                    Angle = s.Angle,
5142
                                    StrokeColor = Brushes.White,
5143
                                    DashSize = s.DashSize,
5144
                                    Opacity = s.Opac,
5145
                                    LeftBottomPoint = s.LB,
5146
                                    TopRightPoint = s.TR,
5147
                                    PointSet = s.PointSet,
5148
                                    UserID = s.UserID,
5149
                                    FillColor = Brushes.White,
5150
                                };
5151

  
5152
                                instance.Memo = s.Memo;
5153
                                //Layer.Children.Add(instance);
5154
                                instance.CommentID = commentId;
5155
                                instance.MarkupInfoID = markupInfoID;
5156
                                baseLayer.Add(instance);
5157
                                instance.ApplyTemplate();
5158
                                instance.SetRectPath();
5159
                            }
5160
                            break;
5161
                        case "ClipWhiteControl":
5162
                            using (S_ClipWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_ClipWhiteControl>(item))
5163
                            {
5164
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5165
                                ClipWhiteControl instance = new ClipWhiteControl
5166
                                {
5167
                                    LineSize = Convert.ToDouble(data2.First()),
5168
                                    Paint = s.PaintState,
5169
                                    StartPoint = s.StartPoint,
5170
                                    EndPoint = s.EndPoint,
5171
                                    Angle = s.Angle,
5172
                                    StrokeColor = Brushes.White,
5173
                                    DashSize = s.DashSize,
5174
                                    Opacity = s.Opac,
5175
                                    LeftBottomPoint = s.LB,
5176
                                    TopRightPoint = s.TR,
5177
                                    PointSet = s.PointSet,
5178
                                    UserID = s.UserID,
5179
                                    FillColor = Brushes.White,
5180
                                };
5181

  
5182
                                instance.Memo = s.Memo;
5183
                                //Layer.Children.Add(instance);
5184
                                instance.CommentID = commentId;
5185
                                instance.MarkupInfoID = markupInfoID;
5186
                                baseLayer.Add(instance);
5187
                                instance.ApplyTemplate();
5188
                                instance.SetRectPath();
5189
                            }
5190
                            break;
5191
                        case "CoordinateControl":
5192
                            using (S_CoordinateControl s = JsonSerializerHelper.JsonDeserialize<S_CoordinateControl>(item))
5193
                            {
5194
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5195
                                CoordinateControl instance = new CoordinateControl
5196
                                {
5197
                                    LineSize = Convert.ToDouble(data2.First()),
5198
                                    Paint = s.PaintState,
5199
                                    StartPoint = s.StartPoint,
5200
                                    EndPoint = s.EndPoint,
5201
                                    Angle = s.Angle,
5202
                                    StrokeColor = Brushes.Yellow,
5203
                                    DashSize = s.DashSize,
5204
                                    Opacity = s.Opac,
5205
                                    LeftBottomPoint = s.LB,
5206
                                    TopRightPoint = s.TR,
5207
                                    PointSet = s.PointSet,
5208
                                    UserID = s.UserID,
5209
                                    //  FillColor = Brushes.Yellow,
5210
                                };
5211

  
5212
                                instance.Memo = s.Memo;
5213
                                //Layer.Children.Add(instance);
5214
                                instance.CommentID = commentId;
5215
                                instance.MarkupInfoID = markupInfoID;
5216
                                baseLayer.Add(instance);
5217
                                instance.ApplyTemplate();
5218
                                instance.SetRectPath();
5219
                            }
5220
                            break;
5221
                        #endregion
4875 5222
                        default:
4876 5223

  
4877 5224
                            break;
......
5533 5880
                            }
5534 5881
                            break;
5535 5882
                        #endregion
5536
                        #endregion 
5883
                        #endregion
5884

  
5885
                        #region Cad
5886
                        case "InsideWhiteControl":
5887
                            using (S_InsideWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_InsideWhiteControl>(item))
5888
                            {
5889
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5890
                                InsideWhiteControl instance = new InsideWhiteControl
5891
                                {
5892
                                    LineSize = Convert.ToDouble(data2.First()),
5893
                                    Paint = s.PaintState,
5894
                                    StartPoint = s.StartPoint,
5895
                                    EndPoint = s.EndPoint,
5896
                                    Angle = s.Angle,
5897
                                    StrokeColor = Brushes.White,
5898
                                    DashSize = s.DashSize,
5899
                                    Opacity = s.Opac,
5900
                                    LeftBottomPoint = s.LB,
5901
                                    TopRightPoint = s.TR,
5902
                                    PointSet = s.PointSet,
5903
                                    UserID = s.UserID,
5904
                                    FillColor = Brushes.White,
5905
                                };
5906
                                baseLayer.Add(instance);
5907
                                instance.ApplyTemplate();
5908

  
5909
                                return_control = instance;
5910
                            }
5911
                            break;
5912
                        case "OverlapWhiteControl":
5913
                            using (S_OverlapWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_OverlapWhiteControl>(item))
5914
                            {
5915
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5916
                                OverlapWhiteControl instance = new OverlapWhiteControl
5917
                                {
5918
                                    LineSize = Convert.ToDouble(data2.First()),
5919
                                    Paint = s.PaintState,
5920
                                    StartPoint = s.StartPoint,
5921
                                    EndPoint = s.EndPoint,
5922
                                    Angle = s.Angle,
5923
                                    StrokeColor = Brushes.White,
5924
                                    DashSize = s.DashSize,
5925
                                    Opacity = s.Opac,
5926
                                    LeftBottomPoint = s.LB,
5927
                                    TopRightPoint = s.TR,
5928
                                    PointSet = s.PointSet,
5929
                                    UserID = s.UserID,
5930
                                    FillColor = Brushes.White,
5931
                                };
5932
                                baseLayer.Add(instance);
5933
                                instance.ApplyTemplate();
5934

  
5935
                                return_control = instance;
5936
                            }
5937
                            break;
5938
                        case "ClipWhiteControl":
5939
                            using (S_ClipWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_ClipWhiteControl>(item))
5940
                            {
5941
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5942
                                ClipWhiteControl instance = new ClipWhiteControl
5943
                                {
5944
                                    LineSize = Convert.ToDouble(data2.First()),
5945
                                    Paint = s.PaintState,
5946
                                    StartPoint = s.StartPoint,
5947
                                    EndPoint = s.EndPoint,
5948
                                    Angle = s.Angle,
5949
                                    StrokeColor = Brushes.White,
5950
                                    DashSize = s.DashSize,
5951
                                    Opacity = s.Opac,
5952
                                    LeftBottomPoint = s.LB,
5953
                                    TopRightPoint = s.TR,
5954
                                    PointSet = s.PointSet,
5955
                                    UserID = s.UserID,
5956
                                    FillColor = Brushes.White,
5957
                                };
5958
                                baseLayer.Add(instance);
5959
                                instance.ApplyTemplate();
5960

  
5961
                                return_control = instance;
5962
                            }
5963
                            break;
5964
                        case "CoordinateControl":
5965
                            using (S_CoordinateControl s = JsonSerializerHelper.JsonDeserialize<S_CoordinateControl>(item))
5966
                            {
5967
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
5968
                                CoordinateControl instance = new CoordinateControl
5969
                                {
5970
                                    LineSize = Convert.ToDouble(data2.First()),
5971
                                    Paint = s.PaintState,
5972
                                    StartPoint = s.StartPoint,
5973
                                    EndPoint = s.EndPoint,
5974
                                    Angle = s.Angle,
5975
                                    StrokeColor = Brushes.Yellow,
5976
                                    DashSize = s.DashSize,
5977
                                    Opacity = s.Opac,
5978
                                    LeftBottomPoint = s.LB,
5979
                                    TopRightPoint = s.TR,
5980
                                    PointSet = s.PointSet,
5981
                                    UserID = s.UserID,
5982
                                    //  FillColor = Brushes.Yellow,
5983
                                };
5984
                                baseLayer.Add(instance);
5985
                                instance.ApplyTemplate();
5986

  
5987
                                return_control = instance;
5988
                            }
5989
                            break;
5990
                        #endregion
5537 5991
                        default:
5538 5992
                            break;
5539 5993
                    };
......
6263 6717
                            }
6264 6718
                            break;
6265 6719
                        #endregion
6720

  
6721
                        #region Cad
6722
                        case "InsideWhiteControl":
6723
                            using (S_InsideWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_InsideWhiteControl>(item))
6724
                            {
6725
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
6726
                                InsideWhiteControl instance = new InsideWhiteControl
6727
                                {
6728
                                    LineSize = Convert.ToDouble(data2.First()),
6729
                                    Paint = s.PaintState,
6730
                                    StartPoint = s.StartPoint,
6731
                                    EndPoint = s.EndPoint,
6732
                                    Angle = s.Angle,
6733
                                    StrokeColor = Brushes.White,
6734
                                    DashSize = s.DashSize,
6735
                                    Opacity = s.Opac,
6736
                                    LeftBottomPoint = s.LB,
6737
                                    TopRightPoint = s.TR,
6738
                                    PointSet = s.PointSet,
6739
                                    UserID = s.UserID,
6740
                                    FillColor = Brushes.White,
6741
                                };
6742

  
6743
                                instance.Memo = s.Memo;
6744
                                //Layer.Children.Add(instance);
6745
                                instance.CommentID = commentId;
6746
                                instance.MarkupInfoID = markupInfoID;
6747
                                baseLayer.Add(instance);
6748
                                instance.ApplyTemplate();
6749
                                instance.SetRectPath();
6750

  
6751
                                return_control = instance;
6752
                            }
6753
                            break;
6754
                        case "OverlapWhiteControl":
6755
                            using (S_OverlapWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_OverlapWhiteControl>(item))
6756
                            {
6757
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
6758
                                OverlapWhiteControl instance = new OverlapWhiteControl
6759
                                {
6760
                                    LineSize = Convert.ToDouble(data2.First()),
6761
                                    Paint = s.PaintState,
6762
                                    StartPoint = s.StartPoint,
6763
                                    EndPoint = s.EndPoint,
6764
                                    Angle = s.Angle,
6765
                                    StrokeColor = Brushes.White,
6766
                                    DashSize = s.DashSize,
6767
                                    Opacity = s.Opac,
6768
                                    LeftBottomPoint = s.LB,
6769
                                    TopRightPoint = s.TR,
6770
                                    PointSet = s.PointSet,
6771
                                    UserID = s.UserID,
6772
                                    FillColor = Brushes.White,
6773
                                };
6774

  
6775
                                instance.Memo = s.Memo;
6776
                                //Layer.Children.Add(instance);
6777
                                instance.CommentID = commentId;
6778
                                instance.MarkupInfoID = markupInfoID;
6779
                                baseLayer.Add(instance);
6780
                                instance.ApplyTemplate();
6781
                                instance.SetRectPath();
6782

  
6783
                                return_control = instance;
6784
                            }
6785
                            break;
6786
                        case "ClipWhiteControl":
6787
                            using (S_ClipWhiteControl s = JsonSerializerHelper.JsonDeserialize<S_ClipWhiteControl>(item))
6788
                            {
6789
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
6790
                                ClipWhiteControl instance = new ClipWhiteControl
6791
                                {
6792
                                    LineSize = Convert.ToDouble(data2.First()),
6793
                                    Paint = s.PaintState,
6794
                                    StartPoint = s.StartPoint,
6795
                                    EndPoint = s.EndPoint,
6796
                                    Angle = s.Angle,
6797
                                    StrokeColor = Brushes.White,
6798
                                    DashSize = s.DashSize,
6799
                                    Opacity = s.Opac,
6800
                                    LeftBottomPoint = s.LB,
6801
                                    TopRightPoint = s.TR,
6802
                                    PointSet = s.PointSet,
6803
                                    UserID = s.UserID,
6804
                                    FillColor = Brushes.White,
6805
                                };
6806

  
6807
                                instance.Memo = s.Memo;
6808
                                //Layer.Children.Add(instance);
6809
                                instance.CommentID = commentId;
6810
                                instance.MarkupInfoID = markupInfoID;
6811
                                baseLayer.Add(instance);
6812
                                instance.ApplyTemplate();
6813
                                instance.SetRectPath();
6814

  
6815
                                return_control = instance;
6816
                            }
6817
                            break;
6818
                        case "CoordinateControl":
6819
                            using (S_CoordinateControl s = JsonSerializerHelper.JsonDeserialize<S_CoordinateControl>(item))
6820
                            {
6821
                                string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
6822
                                CoordinateControl instance = new CoordinateControl
6823
                                {
6824
                                    LineSize = Convert.ToDouble(data2.First()),
6825
                                    Paint = s.PaintState,
6826
                                    StartPoint = s.StartPoint,
6827
                                    EndPoint = s.EndPoint,
6828
                                    Angle = s.Angle,
6829
                                    StrokeColor = Brushes.Yellow,
6830
                                    DashSize = s.DashSize,
6831
                                    Opacity = s.Opac,
6832
                                    LeftBottomPoint = s.LB,
6833
                                    TopRightPoint = s.TR,
6834
                                    PointSet = s.PointSet,
6835
                                    UserID = s.UserID,
6836
                                    //  FillColor = Brushes.Yellow,
6837
                                };
6838

  
6839
                                instance.Memo = s.Memo;
6840
                                //Layer.Children.Add(instance);
6841
                                instance.CommentID = commentId;
6842
                                instance.MarkupInfoID = markupInfoID;
6843
                                baseLayer.Add(instance);
6844
                                instance.ApplyTemplate();
6845
                                instance.SetRectPath();
6846

  
6847
                                return_control = instance;
6848
                            }
6849
                            break;
6850
                        #endregion
6266 6851
                        default:
6267 6852

  
6268 6853
                            break;

내보내기 Unified diff

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