프로젝트

일반

사용자정보

개정판 f258d884

IDf258d884cb198e2bb79bb89c0ff1db76f9771d01
상위 e7334a0c
하위 e59e6c8e

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

Fix: Consolidate 또는 AvoidConsolidate인 레이어만 삭제한다.

Change-Id: Iec8e0061785bbfaeee0fc4f861727f62ee04eacd

차이점 보기:

KCOM/Events/UndoCommand.cs
45 45
        /// push undo data
46 46
        /// </summary>
47 47
        /// <author>humkyung</author>
48
        /// <date>2019.06.14</date>
48
        /// <date>2019.06.14, 2024.04.26</date>
49 49
        /// <param name="comments"></param>
50
        //public void Push(ICollection<CommentUserInfo> comments, double dAngle, double dBeforeAngle = 0.0, List<Point> lstBeforePointSet = null)
51
        //{
52
        //    UndoData UndoData = new UndoData()
53
        //    {
54
        //        IsUndo = false,
55
        //        Event = EventType.Thumb,
56
        //        EventTime = DateTime.Now,
57
        //        MarkupDataColl = new List<Multi_UndoData>(),
58
        //    };
59

  
60
        //    Multi_UndoData multi_UndoData = new Multi_UndoData();
61

  
62
        //    foreach (var comment in comments)
63
        //    {
64
        //        multi_UndoData.PointSet = new List<Point>();
65
        //        var p_set = new List<Point>();
66

  
67
        //        if (comment is TextControl)
68
        //        {
69
        //            multi_UndoData.PointSet.Add((comment as TextControl).StartPoint);
70
        //            multi_UndoData.PointSet.Add((comment as TextControl).EndPoint);
71
        //        }
72

  
73
        //        foreach (var point in (comment as IPath).PointSet)
74
        //        {
75
        //            multi_UndoData.PointSet.Add(point);
76
        //        }
77

  
78
        //        if (lstBeforePointSet != null)
79
        //            multi_UndoData.BeforePointSet = lstBeforePointSet;
80

  
81
        //        if (comment is ArrowTextControl)
82
        //        {
83
        //            //multi_UndoData.Angle = dAngle = (comment as ArrowTextControl).CommentAngle;
84
        //            multi_UndoData.Angle = dAngle;
85
        //            multi_UndoData.BeforeAngle = dBeforeAngle;
86
        //        }
87
        //        else
88
        //        {
89
        //            multi_UndoData.Angle = dAngle;
90
        //            multi_UndoData.BeforeAngle = dBeforeAngle;
91
        //        }
92

  
93
        //        multi_UndoData.Markup = comment;
94
        //        UndoData.MarkupDataColl.Add(multi_UndoData);
95
        //        ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
96
        //                    MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Thumb, null, null);
97

  
98
        //        multi_UndoData = new Multi_UndoData();                
99
        //    }
100
        //    ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
101
        //    {
102
        //        ViewerDataModel.Instance.UndoDataList.Remove(i);
103
        //    });
104

  
105
        //    ViewerDataModel.Instance.UndoDataList.Add(UndoData);            
106
        //}
107

  
108 50
        public void Push(ICollection<CommentUserInfo> comments)
109 51
        {
110 52
            UndoDataGroup UndoData = new UndoDataGroup()
......
117 59

  
118 60
            foreach (var comment in comments)
119 61
            {
120
                UndoData multi_UndoData = new UndoData();
121
                multi_UndoData.Markup = comment;
122
                multi_UndoData.Clone = comment.Clone();
123
                /*
124
                multi_UndoData.PointSet = new List<Point>();
125
                var p_set = new List<Point>();
126

  
127
                if (comment is TextControl)
128
                {
129
                    multi_UndoData.PointSet.Add((comment as TextControl).StartPoint);
130
                    multi_UndoData.PointSet.Add((comment as TextControl).EndPoint);
131
                }
132

  
133
                foreach (var point in (comment as IPath).PointSet)
134
                {
135
                    multi_UndoData.PointSet.Add(point);
136
                }
137

  
138

  
139
                List<Point> points = new List<Point>();
140
                foreach(var point in (comment as IPath).PointSet)
141
                {
142
                    points.Add(point);
143
                }
144
                multi_UndoData.PointSet = points;
145

  
146
                if (comment is ArrowTextControl)
147
                {
148
                    //multi_UndoData.Angle = dAngle = (comment as ArrowTextControl).CommentAngle;
149
                    multi_UndoData.Angle = comment.CommentAngle;
150
                }
151
                else
152
                {
153
                    multi_UndoData.Angle = comment.CommentAngle;
154
                }
62
                UndoData _UndoData = new UndoData();
63
                _UndoData.Markup = comment;
64
                _UndoData.Clone = comment.Clone();
155 65

  
156
                multi_UndoData.Markup = comment;
157
                */
158
                UndoData.MarkupDataColl.Add(multi_UndoData);
66
                UndoData.MarkupDataColl.Add(_UndoData);
159 67
                ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
160
                            MarkupParser.MarkupToString(multi_UndoData.Markup, App.ViewInfo.UserID), EventType.Operation, null, null);
68
                            MarkupParser.MarkupToString(_UndoData.Markup, App.ViewInfo.UserID), EventType.Operation, null, null);
161 69
            }
162 70
            ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i =>
163 71
            {
......
168 76
        }
169 77

  
170 78
        /// <summary>
171
        /// undo
79
        /// undo 실행
172 80
        /// </summary>
173 81
        public void Execute()
174 82
        {

내보내기 Unified diff

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