개정판 ef7ba61f
Fix: 선택한 객체가 화면 최상단에 올라오는 오류 수정
Change-Id: I3eb1adeb497bf6d2e7a09dbed185e57478bda0a2
| KCOM/Common/SelectionSet.cs | ||
|---|---|---|
| 125 | 125 |
{
|
| 126 | 126 |
try |
| 127 | 127 |
{
|
| 128 |
if (mainMenu.SelectLayer.Children.Count > 0) |
|
| 128 |
if (mainMenu.SelectLayer.Children.Count <= 0) return; |
|
| 129 |
|
|
| 130 |
foreach (var item in mainMenu.SelectLayer.Children) |
|
| 129 | 131 |
{
|
| 130 |
foreach (var item in mainMenu.SelectLayer.Children)
|
|
| 132 |
if (item.GetType().Name == "AdornerFinal")
|
|
| 131 | 133 |
{
|
| 132 |
if (item.GetType().Name == "AdornerFinal") |
|
| 133 |
{
|
|
| 134 |
(item as AdornerFinal).UnRegister(); |
|
| 134 |
(item as AdornerFinal).UnRegister(); |
|
| 135 | 135 |
|
| 136 |
foreach (var InnerItem in (item as AdornerFinal).Members) |
|
| 136 |
foreach (var InnerItem in (item as AdornerFinal).Members) |
|
| 137 |
{
|
|
| 138 |
if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData)) |
|
| 137 | 139 |
{
|
| 138 |
if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData))
|
|
| 140 |
if (InnerItem.DrawingData.GetType().Name == "PolygonControl")
|
|
| 139 | 141 |
{
|
| 140 |
if (InnerItem.DrawingData.GetType().Name == "PolygonControl")
|
|
| 142 |
if ((InnerItem.DrawingData as PolygonControl).CommentID == null)
|
|
| 141 | 143 |
{
|
| 142 |
if ((InnerItem.DrawingData as PolygonControl).CommentID == null) |
|
| 143 |
{
|
|
| 144 |
(InnerItem.DrawingData as PolygonControl).CommentID = Commons.shortGuid(); |
|
| 145 |
} |
|
| 144 |
(InnerItem.DrawingData as PolygonControl).CommentID = Commons.shortGuid(); |
|
| 146 | 145 |
} |
| 147 |
|
|
| 148 |
var control = InnerItem.DrawingData as CommentUserInfo; |
|
| 149 |
#region ZIndex 설정 |
|
| 150 |
System.Windows.Controls.Canvas.SetZIndex(control, control.ZIndex); |
|
| 151 |
#endregion |
|
| 152 |
ViewerDataModel.Instance.MarkupControls_USER.Add(control); |
|
| 153 | 146 |
} |
| 147 |
|
|
| 148 |
var control = InnerItem.DrawingData as CommentUserInfo; |
|
| 149 |
#region ZIndex 설정 |
|
| 150 |
System.Windows.Controls.Canvas.SetZIndex(control, control.ZIndex); |
|
| 151 |
#endregion |
|
| 152 |
ViewerDataModel.Instance.MarkupControls_USER.Insert(control.Index, control); |
|
| 154 | 153 |
} |
| 155 | 154 |
} |
| 156 | 155 |
} |
| 157 |
mainMenu.SelectLayer.Children.Clear(); |
|
| 158 | 156 |
} |
| 157 |
mainMenu.SelectLayer.Children.Clear(); |
|
| 159 | 158 |
} |
| 160 | 159 |
catch (Exception ex) |
| 161 | 160 |
{
|
내보내기 Unified diff
