개정판 b2d0f316
Feature: 선택한 객체를 앞으로(+)/뒤로(-) 보내기 기능 추가
Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89
KCOM/Common/SelectionSet.cs | ||
---|---|---|
131 | 131 |
{ |
132 | 132 |
if (item.GetType().Name == "AdornerFinal") |
133 | 133 |
{ |
134 |
(item as AdornerFinal).unRegister();
|
|
134 |
(item as AdornerFinal).UnRegister();
|
|
135 | 135 |
|
136 |
foreach (var InnerItem in (item as AdornerFinal).Members.Cast<AdornerMember>())
|
|
136 |
foreach (var InnerItem in (item as AdornerFinal).Members) |
|
137 | 137 |
{ |
138 | 138 |
if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData)) |
139 | 139 |
{ |
... | ... | |
146 | 146 |
} |
147 | 147 |
|
148 | 148 |
var control = InnerItem.DrawingData as CommentUserInfo; |
149 |
ViewerDataModel.Instance.MarkupControls_USER.Add(control); |
|
150 |
|
|
151 |
#region Unselect하는데 Create 커맨드를 추가해야 하는지 이해되지 않음 |
|
152 |
/* |
|
153 |
var vUndoBeforeTargetItem = |
|
154 |
ViewerDataModel.Instance.UndoDataList.ToList().OrderBy(x => x.EventTime).LastOrDefault(); |
|
155 |
|
|
156 |
if (vUndoBeforeTargetItem != null && vUndoBeforeTargetItem.Event == EventType.Operation) |
|
157 |
{ |
|
158 |
|
|
159 |
} |
|
160 |
else |
|
161 |
{ |
|
162 |
MarkupToPDF.Common.UndoDataGroup UndoDataGroup = new UndoDataGroup() |
|
163 |
{ |
|
164 |
IsUndo = false, |
|
165 |
Event = EventType.Create, |
|
166 |
EventTime = DateTime.Now, |
|
167 |
MarkupDataColl = new List<UndoData>() |
|
168 |
}; |
|
169 |
|
|
170 |
var _UndoData = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(control); |
|
171 |
UndoDataGroup.MarkupDataColl.Add(_UndoData); |
|
172 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup); |
|
173 |
} |
|
174 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
|
175 |
*/ |
|
149 |
#region ZIndex 설정 |
|
150 |
System.Windows.Controls.Canvas.SetZIndex(control, control.ZIndex); |
|
176 | 151 |
#endregion |
152 |
ViewerDataModel.Instance.MarkupControls_USER.Add(control); |
|
177 | 153 |
} |
178 | 154 |
} |
179 | 155 |
} |
... | ... | |
183 | 159 |
} |
184 | 160 |
catch (Exception ex) |
185 | 161 |
{ |
186 |
//Logger.sendResLog("ReleaseAdorner", ex.ToString(), 0);
|
|
162 |
throw new InvalidOperationException(ex.Message);
|
|
187 | 163 |
} |
188 | 164 |
} |
189 | 165 |
|
내보내기 Unified diff