프로젝트

일반

사용자정보

개정판 30d84e1a

ID30d84e1a21b25be938e463187b465a84bde83684
상위 86143026
하위 147d78f3

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

Fix: ArrowTextControl, TextControl의 Undo/Redo 오류 수정

Change-Id: I519815037eb31ec59bcc9897bb93e09a2d4f0940

차이점 보기:

MarkupToPDF/Controls/Text/ArrowTextControl.cs
63 63

  
64 64
        public override void Copy(CommentUserInfo lhs)
65 65
        {
66
            if (lhs is ArrowTextControl ArrowTextCtrl)
67
            {
68
                this.PageAngle = ArrowTextCtrl.PageAngle;
69
                this.LineSize = ArrowTextCtrl.LineSize;
70
                this.PointSet = ArrowTextCtrl.PointSet;
71
                this.StartPoint = ArrowTextCtrl.StartPoint;
72
                this.EndPoint = ArrowTextCtrl.EndPoint;
73
                this.StrokeColor = ArrowTextCtrl.StrokeColor;
66
            if (lhs is ArrowTextControl item)
67
            {
68
                this.PageAngle = item.PageAngle;
69
                this.LineSize = item.LineSize;
70
                this.PointSet = item.PointSet.ConvertAll(x => new Point(x.X, x.Y));
71
                this.StartPoint = new Point(item.StartPoint.X, item.StartPoint.Y);
72
                this.EndPoint = new Point(item.EndPoint.X, item.EndPoint.Y);
73
                this.StrokeColor = item.StrokeColor;
74 74
                //this.DashSize = s.DashSize; 
75
                this.ArrowTextStyle = ArrowTextCtrl.ArrowTextStyle;
76
                this.isHighLight = ArrowTextCtrl.isHighLight;
77
                this.ArrowText = ArrowTextCtrl.ArrowText;
78
                this.Opacity = ArrowTextCtrl.Opacity;
79
                this.BorderSize = ArrowTextCtrl.BorderSize;
80
                this.BoxWidth = ArrowTextCtrl.BoxWidth;
81
                this.BoxHeight = ArrowTextCtrl.BoxHeight;
82
                this.isFixed = ArrowTextCtrl.isFixed;
75
                this.ArrowTextStyle = item.ArrowTextStyle;
76
                this.isHighLight = item.isHighLight;
77
                this.ArrowText = item.ArrowText;
78
                this.Opacity = item.Opacity;
79
                this.BorderSize = item.BorderSize;
80
                this.BoxWidth = item.BoxWidth;
81
                this.BoxHeight = item.BoxHeight;
82
                this.isFixed = item.isFixed;
83 83
                //this.VisualPageAngle = s.Angle;
84
                this.UserID = ArrowTextCtrl.UserID;
85
                this.isTrans = ArrowTextCtrl.isTrans;
86
                this.MidPoint = ArrowTextCtrl.MidPoint;
87
                this.Memo = ArrowTextCtrl.Memo;
88
                this.TextFamily = ArrowTextCtrl.TextFamily;
89
                this.TextStyle = ArrowTextCtrl.TextStyle;
90
                this.TextWeight = ArrowTextCtrl.TextWeight;
91
                this.TextSize = ArrowTextCtrl.TextSize;
92
                this.UnderLine = ArrowTextCtrl.UnderLine;
84
                this.UserID = item.UserID;
85
                this.isTrans = item.isTrans;
86
                this.MidPoint = item.MidPoint;
87
                this.Memo = item.Memo;
88
                this.TextFamily = item.TextFamily;
89
                this.TextStyle = item.TextStyle;
90
                this.TextWeight = item.TextWeight;
91
                this.TextSize = item.TextSize;
92
                this.UnderLine = item.UnderLine;
93 93
            }
94 94
        }
95 95

  
MarkupToPDF/Controls/Text/TextControl.cs
78 78

  
79 79
        public override void Copy(CommentUserInfo lhs)
80 80
        {
81
            if(lhs is TextControl TextCtrl)
82
            {
83
                Text = TextCtrl.Text;
84
                StartPoint = new Point(TextCtrl.StartPoint.X, TextCtrl.StartPoint.Y);
85
                EndPoint = new Point(TextCtrl.EndPoint.X, TextCtrl.EndPoint.Y);
86
                CanvasX = TextCtrl.CanvasX;
87
                CanvasY = TextCtrl.CanvasY;
88
                BoxWidth = TextCtrl.BoxWidth;
89
                BoxHeight = TextCtrl.BoxHeight;
90
                ControlType_No = TextCtrl.ControlType_No;
91
                LineSize = TextCtrl.LineSize;
92
                TextSize = TextCtrl.TextSize;
93
                StrokeColor = TextCtrl.StrokeColor;
94
                FontSize = TextCtrl.FontSize;
95
                UserID = TextCtrl.UserID;
96
                IsHighLight = TextCtrl.IsHighLight;
97
                CommentAngle = TextCtrl.CommentAngle;
98
                PointSet = TextCtrl.PointSet.ConvertAll(x => new Point(x.X, x.Y));
99
                Opacity = TextCtrl.Opacity;
100
                TextFamily = TextCtrl.FontFamily;
101
                TextStyle = TextCtrl.TextStyle;
102
                TextWeight = TextCtrl.TextWeight;
103
                UnderLine = TextCtrl.UnderLine;
81
            if(lhs is TextControl item)
82
            {
83
                Text = item.Text;
84
                StartPoint = new Point(item.StartPoint.X, item.StartPoint.Y);
85
                EndPoint = new Point(item.EndPoint.X, item.EndPoint.Y);
86
                CanvasX = item.CanvasX;
87
                CanvasY = item.CanvasY;
88
                BoxWidth = item.BoxWidth;
89
                BoxHeight = item.BoxHeight;
90
                ControlType_No = item.ControlType_No;
91
                LineSize = item.LineSize;
92
                TextSize = item.TextSize;
93
                StrokeColor = item.StrokeColor;
94
                FontSize = item.FontSize;
95
                UserID = item.UserID;
96
                IsHighLight = item.IsHighLight;
97
                CommentAngle = item.CommentAngle;
98
                PointSet = item.PointSet.ConvertAll(x => new Point(x.X, x.Y));
99
                Opacity = item.Opacity;
100
                TextFamily = item.FontFamily;
101
                TextStyle = item.TextStyle;
102
                TextWeight = item.TextWeight;
103
                UnderLine = item.UnderLine;
104 104
            }
105 105
        }
106 106

  

내보내기 Unified diff

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