프로젝트

일반

사용자정보

개정판 e1b36bc0

IDe1b36bc0efb056d5a5031e446a140716ceb97cd8
상위 d5c34b1d
하위 8118ba81

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

Feature: Grouping 기능 추가(Ctrl+G : Group, Ctrl+Shift+G : Ungroup)

Change-Id: I99a3309acd55799ff7101522feaa035225b80e48

차이점 보기:

MarkupToPDF/Controls/Etc/SymControl.cs
44 44
        }
45 45
        public override void Copy(CommentUserInfo lhs)
46 46
        {
47
            if(lhs is SymControl symControl)
47
            if(lhs is SymControl item)
48 48
            {
49
                this.LineSize = symControl.LineSize;
50
                this.PointSet = symControl.PointSet.ConvertAll(x => new System.Windows.Point(x.X, x.Y));
51
                this.Paint = symControl.Paint;
52
                this.StartPoint = new System.Windows.Point(symControl.StartPoint.X, symControl.StartPoint.Y);
53
                this.EndPoint = new System.Windows.Point(symControl.EndPoint.X, symControl.EndPoint.Y);
54
                this.LeftBottomPoint = new System.Windows.Point(symControl.LeftBottomPoint.X, symControl.LeftBottomPoint.Y);
55
                this.TopRightPoint = new System.Windows.Point(symControl.TopRightPoint.X, symControl.TopRightPoint.Y);
56
                this.StrokeColor = symControl.StrokeColor;
57
                this.CommentAngle = symControl.CommentAngle;
58
                this.UserID = symControl.UserID;
59

  
60
                this.PathData = symControl.PathData.Clone();
61
                this.Opacity = symControl.Opacity;
62
                this.Memo = symControl.Memo;
63
                this.ZIndex = symControl.ZIndex;
49
                this.LineSize = item.LineSize;
50
                this.PointSet = item.PointSet.ConvertAll(x => new System.Windows.Point(x.X, x.Y));
51
                this.Paint = item.Paint;
52
                this.StartPoint = new System.Windows.Point(item.StartPoint.X, item.StartPoint.Y);
53
                this.EndPoint = new System.Windows.Point(item.EndPoint.X, item.EndPoint.Y);
54
                this.LeftBottomPoint = new System.Windows.Point(item.LeftBottomPoint.X, item.LeftBottomPoint.Y);
55
                this.TopRightPoint = new System.Windows.Point(item.TopRightPoint.X, item.TopRightPoint.Y);
56
                this.StrokeColor = item.StrokeColor;
57
                this.CommentAngle = item.CommentAngle;
58
                this.UserID = item.UserID;
59

  
60
                this.PathData = item.PathData.Clone();
61
                this.Opacity = item.Opacity;
62
                this.Memo = item.Memo;
63
                this.ZIndex = item.ZIndex;
64
                GroupID = item.GroupID;
64 65
            }
65 66
        }
66 67

  
......
540 541
                ctrl.Opac = this.Opacity;
541 542
                ctrl.Name = this.GetType().Name.ToString();
542 543
                ctrl.ZIndex = this.ZIndex;
544
                ctrl.GroupID = this.GroupID;
543 545

  
544 546
                return "|DZ|" + JsonSerializerHelper.CompressString((ctrl.JsonSerialize()));
545 547
            }
......
572 574
                    PathData = sm.Convert(s.PathInfo.ToString()),
573 575
                    Opacity = s.Opac,
574 576
                    Memo = s.Memo,
575
                    ZIndex = s.ZIndex
577
                    ZIndex = s.ZIndex,
578
                    GroupID = s.GroupID
576 579
                };
577 580
            }
578 581

  

내보내기 Unified diff

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