개정판 5c3caba6
Fix: 이미지 위에 객체를 생성할 때 객체가 이미지 뒤에 숨는 오류
Change-Id: If491e582f33be01f3e4e2b21594ed51122f48054
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2757 | 2757 |
|
| 2758 | 2758 |
foreach (var item in ViewerDataModel.Instance.MarkupControls_USER) |
| 2759 | 2759 |
{
|
| 2760 |
if (item as ArrowTextControl != null)
|
|
| 2760 |
if (item is ArrowTextControl ArrTextCtrl)
|
|
| 2761 | 2761 |
{
|
| 2762 |
(item as ArrowTextControl).Base_TextBox.IsHitTestVisible = false;
|
|
| 2762 |
ArrTextCtrl.Base_TextBox.IsHitTestVisible = false;
|
|
| 2763 | 2763 |
} |
| 2764 |
else if (item as TextControl != null)
|
|
| 2764 |
else if (item is TextControl TextCtrl)
|
|
| 2765 | 2765 |
{
|
| 2766 |
(item as TextControl).Base_TextBox.IsHitTestVisible = false;
|
|
| 2766 |
TextCtrl.Base_TextBox.IsHitTestVisible = false;
|
|
| 2767 | 2767 |
} |
| 2768 | 2768 |
} |
| 2769 | 2769 |
|
| 2770 | 2770 |
//if (currentControl != null) |
| 2771 | 2771 |
{
|
| 2772 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).IsEditingMode == true).FirstOrDefault();
|
|
| 2772 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data as TextControl) != null && (data as TextControl).IsEditingMode);
|
|
| 2773 | 2773 |
if (text_item_ != null) |
| 2774 | 2774 |
{
|
| 2775 | 2775 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
| ... | ... | |
| 2778 | 2778 |
currentControl = null; |
| 2779 | 2779 |
} |
| 2780 | 2780 |
|
| 2781 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode == true).FirstOrDefault();
|
|
| 2781 |
var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode);
|
|
| 2782 | 2782 |
if (Arrowtext_item_ != null && ((Arrowtext_item_ as ArrowTextControl).IsNew == false)) |
| 2783 | 2783 |
{
|
| 2784 | 2784 |
(Arrowtext_item_ as ArrowTextControl).IsEditingMode = false; |
| ... | ... | |
| 2793 | 2793 |
Ang = 360 - rotate.Angle; |
| 2794 | 2794 |
} |
| 2795 | 2795 |
|
| 2796 |
if (e.OriginalSource is System.Windows.Controls.Image) |
|
| 2796 |
if (e.OriginalSource is System.Windows.Controls.Image imgctrl)
|
|
| 2797 | 2797 |
{
|
| 2798 |
(e.OriginalSource as System.Windows.Controls.Image).Focus();
|
|
| 2798 |
imgctrl.Focus();
|
|
| 2799 | 2799 |
} |
| 2800 | 2800 |
/* |
| 2801 | 2801 |
if (mouseHandlingMode == MouseHandlingMode.DragSymbol && e.LeftButton == MouseButtonState.Pressed) |
| ... | ... | |
| 2897 | 2897 |
isLeftMouseButtonDownOnWindow = true; |
| 2898 | 2898 |
} |
| 2899 | 2899 |
|
| 2900 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault(); |
|
| 2901 |
|
|
| 2900 |
var control = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => data.IsMouseEnter); |
|
| 2902 | 2901 |
if (control == null) |
| 2903 | 2902 |
{
|
| 2904 | 2903 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed); |
| ... | ... | |
| 3063 | 3062 |
init_user = true; |
| 3064 | 3063 |
} |
| 3065 | 3064 |
} |
| 3066 |
if (init_user && gridViewMarkup.SelectedItems.Where(d => (d as MarkupInfoItem).UserID == App.ViewInfo.UserID).FirstOrDefault() == null && e.LeftButton == MouseButtonState.Pressed)
|
|
| 3065 |
if (init_user && gridViewMarkup.SelectedItems.FirstOrDefault(d => (d as MarkupInfoItem).UserID == App.ViewInfo.UserID) == null && e.LeftButton == MouseButtonState.Pressed)
|
|
| 3067 | 3066 |
{
|
| 3068 | 3067 |
// 기존의 코멘트가 존재합니다. 사용자 리스트에서 먼저 선택해주세요 |
| 3069 | 3068 |
RadWindow.Alert(new DialogParameters |
| ... | ... | |
| 3090 | 3089 |
{
|
| 3091 | 3090 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3092 | 3091 |
{
|
| 3093 |
if (currentControl is CoordinateControl) |
|
| 3092 |
if (currentControl is CoordinateControl coord)
|
|
| 3094 | 3093 |
{
|
| 3095 |
if (IsGetoutpoint((currentControl as CoordinateControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3094 |
if (IsGetoutpoint(coord.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3096 | 3095 |
{
|
| 3097 | 3096 |
return; |
| 3098 | 3097 |
} |
| ... | ... | |
| 3106 | 3105 |
{
|
| 3107 | 3106 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
| 3108 | 3107 |
if (ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber |
| 3109 |
&& d.Data_Type == Convert.ToInt32(MarkupToPDF.Controls.Common.ControlType.Coordinate)).Count() > 0)
|
|
| 3108 |
&& d.Data_Type == Convert.ToInt32(MarkupToPDF.Controls.Common.ControlType.Coordinate)).Any())
|
|
| 3110 | 3109 |
{
|
| 3111 | 3110 |
currentControl = null; |
| 3112 | 3111 |
this.cursor = Cursors.Arrow; |
| ... | ... | |
| 3127 | 3126 |
currentControl.IsNew = true; |
| 3128 | 3127 |
|
| 3129 | 3128 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3130 |
|
|
| 3131 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
|
| 3129 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3132 | 3130 |
} |
| 3133 | 3131 |
} |
| 3134 | 3132 |
} |
| ... | ... | |
| 3139 | 3137 |
{
|
| 3140 | 3138 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3141 | 3139 |
{
|
| 3142 |
if (currentControl is InsideWhiteControl) |
|
| 3140 |
if (currentControl is InsideWhiteControl whitectrl)
|
|
| 3143 | 3141 |
{
|
| 3144 |
if (IsGetoutpoint((currentControl as InsideWhiteControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3142 |
if (IsGetoutpoint(whitectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3145 | 3143 |
{
|
| 3146 | 3144 |
return; |
| 3147 | 3145 |
} |
| ... | ... | |
| 3165 | 3163 |
currentControl.IsNew = true; |
| 3166 | 3164 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3167 | 3165 |
|
| 3168 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3166 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3169 | 3167 |
} |
| 3170 | 3168 |
} |
| 3171 | 3169 |
} |
| ... | ... | |
| 3201 | 3199 |
currentControl.IsNew = true; |
| 3202 | 3200 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3203 | 3201 |
|
| 3204 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3202 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3205 | 3203 |
} |
| 3206 | 3204 |
} |
| 3207 | 3205 |
} |
| ... | ... | |
| 3237 | 3235 |
currentControl.IsNew = true; |
| 3238 | 3236 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3239 | 3237 |
|
| 3240 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3238 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3241 | 3239 |
} |
| 3242 | 3240 |
} |
| 3243 | 3241 |
} |
| ... | ... | |
| 3247 | 3245 |
{
|
| 3248 | 3246 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3249 | 3247 |
{
|
| 3250 |
if (currentControl is RectangleControl) |
|
| 3248 |
if (currentControl is RectangleControl rectctrl)
|
|
| 3251 | 3249 |
{
|
| 3252 | 3250 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3253 |
if (IsGetoutpoint((currentControl as RectangleControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3251 |
if (IsGetoutpoint(rectctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3254 | 3252 |
{
|
| 3255 | 3253 |
return; |
| 3256 | 3254 |
} |
| ... | ... | |
| 3273 | 3271 |
currentControl.IsNew = true; |
| 3274 | 3272 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3275 | 3273 |
|
| 3276 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3274 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3277 | 3275 |
} |
| 3278 | 3276 |
} |
| 3279 | 3277 |
} |
| ... | ... | |
| 3283 | 3281 |
{
|
| 3284 | 3282 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3285 | 3283 |
{
|
| 3286 |
if (currentControl is RectCloudControl) |
|
| 3284 |
if (currentControl is RectCloudControl rectcloudctrl)
|
|
| 3287 | 3285 |
{
|
| 3288 | 3286 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3289 |
if (IsGetoutpoint((currentControl as RectCloudControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3287 |
if (IsGetoutpoint(rectcloudctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3290 | 3288 |
{
|
| 3291 | 3289 |
return; |
| 3292 | 3290 |
} |
| ... | ... | |
| 3310 | 3308 |
currentControl.CommentID = Commons.shortGuid(); |
| 3311 | 3309 |
currentControl.IsNew = true; |
| 3312 | 3310 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3311 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3313 | 3312 |
} |
| 3314 | 3313 |
} |
| 3315 | 3314 |
} |
| ... | ... | |
| 3319 | 3318 |
{
|
| 3320 | 3319 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3321 | 3320 |
{
|
| 3322 |
if (currentControl is CircleControl) |
|
| 3321 |
if (currentControl is CircleControl circlectrl)
|
|
| 3323 | 3322 |
{
|
| 3324 | 3323 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3325 |
if (IsGetoutpoint((currentControl as CircleControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3324 |
if (IsGetoutpoint(circlectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3326 | 3325 |
{
|
| 3327 | 3326 |
return; |
| 3328 | 3327 |
} |
| ... | ... | |
| 3344 | 3343 |
currentControl.CommentID = Commons.shortGuid(); |
| 3345 | 3344 |
currentControl.IsNew = true; |
| 3346 | 3345 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3346 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3347 | 3347 |
} |
| 3348 | 3348 |
} |
| 3349 | 3349 |
} |
| ... | ... | |
| 3353 | 3353 |
{
|
| 3354 | 3354 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3355 | 3355 |
{
|
| 3356 |
if (currentControl is TriControl) |
|
| 3356 |
if (currentControl is TriControl trictrl)
|
|
| 3357 | 3357 |
{
|
| 3358 |
var content = currentControl as TriControl; |
|
| 3359 |
if (content.MidPoint == new Point(0, 0)) |
|
| 3358 |
if (trictrl.MidPoint == new Point(0, 0)) |
|
| 3360 | 3359 |
{
|
| 3361 |
content.MidPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y);
|
|
| 3360 |
trictrl.MidPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y);
|
|
| 3362 | 3361 |
} |
| 3363 | 3362 |
else |
| 3364 | 3363 |
{
|
| 3365 | 3364 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3366 |
if (IsGetoutpoint((currentControl as TriControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3365 |
if (IsGetoutpoint(trictrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3367 | 3366 |
{
|
| 3368 | 3367 |
return; |
| 3369 | 3368 |
} |
| ... | ... | |
| 3385 | 3384 |
currentControl.CommentID = Commons.shortGuid(); |
| 3386 | 3385 |
currentControl.IsNew = true; |
| 3387 | 3386 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3387 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3388 | 3388 |
} |
| 3389 | 3389 |
} |
| 3390 | 3390 |
} |
| ... | ... | |
| 3397 | 3397 |
{
|
| 3398 | 3398 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3399 | 3399 |
{
|
| 3400 |
if (currentControl is LineControl) |
|
| 3400 |
if (currentControl is LineControl linectrl)
|
|
| 3401 | 3401 |
{
|
| 3402 | 3402 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3403 |
if (IsGetoutpoint((currentControl as LineControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3403 |
if (IsGetoutpoint(linectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3404 | 3404 |
{
|
| 3405 | 3405 |
return; |
| 3406 | 3406 |
} |
| ... | ... | |
| 3423 | 3423 |
currentControl.IsNew = true; |
| 3424 | 3424 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3425 | 3425 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 3426 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3426 | 3427 |
} |
| 3427 | 3428 |
} |
| 3428 | 3429 |
} |
| 3429 | 3430 |
break; |
| 3430 | 3431 |
case ControlType.PolygonControl: |
| 3431 | 3432 |
{
|
| 3432 |
if (currentControl is PolygonControl) |
|
| 3433 |
if (currentControl is PolygonControl polygonctrl)
|
|
| 3433 | 3434 |
{
|
| 3434 |
var control = currentControl as PolygonControl; |
|
| 3435 |
|
|
| 3436 | 3435 |
if (e.RightButton == MouseButtonState.Pressed) |
| 3437 | 3436 |
{
|
| 3438 |
control.IsCompleted = true;
|
|
| 3437 |
polygonctrl.IsCompleted = true;
|
|
| 3439 | 3438 |
} |
| 3440 | 3439 |
|
| 3441 |
if (!control.IsCompleted)
|
|
| 3440 |
if (!polygonctrl.IsCompleted)
|
|
| 3442 | 3441 |
{
|
| 3443 |
control.PointSet.Add(control.EndPoint);
|
|
| 3442 |
polygonctrl.PointSet.Add(polygonctrl.EndPoint);
|
|
| 3444 | 3443 |
} |
| 3445 | 3444 |
else |
| 3446 | 3445 |
{
|
| 3447 | 3446 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3448 |
if (IsGetoutpoint((currentControl as PolygonControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3447 |
if (IsGetoutpoint(polygonctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3449 | 3448 |
{
|
| 3450 | 3449 |
return; |
| 3451 | 3450 |
} |
| 3452 | 3451 |
|
| 3453 |
var firstPoint = control.PointSet.First();
|
|
| 3454 |
control.DashSize = ViewerDataModel.Instance.DashSize;
|
|
| 3455 |
control.LineSize = ViewerDataModel.Instance.LineSize;
|
|
| 3456 |
control.PointSet.Add(firstPoint);
|
|
| 3452 |
var firstPoint = polygonctrl.PointSet.First();
|
|
| 3453 |
polygonctrl.DashSize = ViewerDataModel.Instance.DashSize;
|
|
| 3454 |
polygonctrl.LineSize = ViewerDataModel.Instance.LineSize;
|
|
| 3455 |
polygonctrl.PointSet.Add(firstPoint);
|
|
| 3457 | 3456 |
|
| 3458 |
control.ApplyOverViewData();
|
|
| 3457 |
polygonctrl.ApplyOverViewData();
|
|
| 3459 | 3458 |
|
| 3460 | 3459 |
CreateCommand.Instance.Execute(currentControl); |
| 3461 |
control.UpdateControl();
|
|
| 3460 |
polygonctrl.UpdateControl();
|
|
| 3462 | 3461 |
currentControl = null; |
| 3463 | 3462 |
} |
| 3464 | 3463 |
} |
| ... | ... | |
| 3482 | 3481 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3483 | 3482 |
polygonControl.ApplyTemplate(); |
| 3484 | 3483 |
polygonControl.Visibility = Visibility.Visible; |
| 3484 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3485 | 3485 |
} |
| 3486 | 3486 |
} |
| 3487 | 3487 |
} |
| ... | ... | |
| 3540 | 3540 |
//polygonControl.PointC.pointSet.Add(canvasDrawingMouseDownPoint); |
| 3541 | 3541 |
polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint); |
| 3542 | 3542 |
polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint); |
| 3543 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3543 | 3544 |
//} |
| 3544 | 3545 |
} |
| 3545 | 3546 |
} |
| ... | ... | |
| 3549 | 3550 |
{
|
| 3550 | 3551 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3551 | 3552 |
{
|
| 3552 |
if (currentControl is ArcControl) |
|
| 3553 |
if (currentControl is ArcControl arcctrl)
|
|
| 3553 | 3554 |
{
|
| 3554 | 3555 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3555 |
if (IsGetoutpoint((currentControl as ArcControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3556 |
if (IsGetoutpoint(arcctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3556 | 3557 |
{
|
| 3557 | 3558 |
return; |
| 3558 | 3559 |
} |
| ... | ... | |
| 3574 | 3575 |
currentControl.IsNew = true; |
| 3575 | 3576 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3576 | 3577 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 3578 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3577 | 3579 |
} |
| 3578 | 3580 |
} |
| 3579 | 3581 |
else if (e.RightButton == MouseButtonState.Pressed) |
| ... | ... | |
| 3592 | 3594 |
{
|
| 3593 | 3595 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3594 | 3596 |
//{
|
| 3595 |
if (currentControl is ArrowArcControl) |
|
| 3597 |
if (currentControl is ArrowArcControl arrowarcctrl)
|
|
| 3596 | 3598 |
{
|
| 3597 | 3599 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3598 |
if (IsGetoutpoint((currentControl as ArrowArcControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3600 |
if (IsGetoutpoint(arrowarcctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3599 | 3601 |
{
|
| 3600 | 3602 |
return; |
| 3601 | 3603 |
} |
| ... | ... | |
| 3617 | 3619 |
currentControl.IsNew = true; |
| 3618 | 3620 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3619 | 3621 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 3622 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3620 | 3623 |
} |
| 3621 | 3624 |
//} |
| 3622 | 3625 |
} |
| ... | ... | |
| 3677 | 3680 |
currentControl.IsNew = true; |
| 3678 | 3681 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3679 | 3682 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| 3683 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3680 | 3684 |
} |
| 3681 | 3685 |
//} |
| 3682 | 3686 |
} |
| ... | ... | |
| 3699 | 3703 |
else |
| 3700 | 3704 |
{
|
| 3701 | 3705 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3702 |
if (IsGetoutpoint((currentControl as CloudControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3706 |
if (IsGetoutpoint((currentControl as CloudControl).PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
|
|
| 3703 | 3707 |
{
|
| 3704 | 3708 |
return; |
| 3705 | 3709 |
} |
| ... | ... | |
| 3726 | 3730 |
PointC = new StylusPointSet() |
| 3727 | 3731 |
}; |
| 3728 | 3732 |
|
| 3729 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
|
| 3730 |
//{
|
|
| 3731 | 3733 |
var polygonControl = (currentControl as CloudControl); |
| 3732 | 3734 |
currentControl.CommentID = Commons.shortGuid(); |
| 3733 | 3735 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| ... | ... | |
| 3736 | 3738 |
|
| 3737 | 3739 |
polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint); |
| 3738 | 3740 |
polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint); |
| 3739 |
|
|
| 3740 |
//} |
|
| 3741 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3741 | 3742 |
} |
| 3742 | 3743 |
} |
| 3743 | 3744 |
} |
| ... | ... | |
| 3800 | 3801 |
|
| 3801 | 3802 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3802 | 3803 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle; |
| 3804 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3803 | 3805 |
} |
| 3804 | 3806 |
} |
| 3805 | 3807 |
} |
| ... | ... | |
| 3851 | 3853 |
{
|
| 3852 | 3854 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle; |
| 3853 | 3855 |
} |
| 3856 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 3854 | 3857 |
} |
| 3855 | 3858 |
//} |
| 3856 | 3859 |
} |
| ... | ... | |
| 3872 | 3875 |
currentControl.IsNew = true; |
| 3873 | 3876 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3874 | 3877 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3875 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3878 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3876 | 3879 |
currentControl.SetValue(TextControl.CanvasXProperty, CanvasDrawingMouseDownPoint.X); |
| 3877 | 3880 |
currentControl.SetValue(TextControl.CanvasYProperty, CanvasDrawingMouseDownPoint.Y); |
| 3878 | 3881 |
|
| ... | ... | |
| 3925 | 3928 |
currentControl.CommentID = Commons.shortGuid(); |
| 3926 | 3929 |
currentControl.IsNew = true; |
| 3927 | 3930 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3928 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3931 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3929 | 3932 |
currentControl.SetValue(TextControl.CanvasXProperty, CanvasDrawingMouseDownPoint.X); |
| 3930 | 3933 |
currentControl.SetValue(TextControl.CanvasYProperty, CanvasDrawingMouseDownPoint.Y); |
| 3931 | 3934 |
|
| ... | ... | |
| 3978 | 3981 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3979 | 3982 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3980 | 3983 |
|
| 3981 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 3984 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 3982 | 3985 |
currentControl.SetValue(TextControl.CanvasXProperty, CanvasDrawingMouseDownPoint.X); |
| 3983 | 3986 |
currentControl.SetValue(TextControl.CanvasYProperty, CanvasDrawingMouseDownPoint.Y); |
| 3984 | 3987 |
|
| ... | ... | |
| 4071 | 4074 |
System.Diagnostics.Debug.WriteLine(ex.ToString()); |
| 4072 | 4075 |
} |
| 4073 | 4076 |
|
| 4074 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4077 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4075 | 4078 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4076 | 4079 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| 4077 | 4080 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| ... | ... | |
| 4124 | 4127 |
currentControl.IsNew = true; |
| 4125 | 4128 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4126 | 4129 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4127 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4130 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4128 | 4131 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4129 | 4132 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| 4130 | 4133 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| ... | ... | |
| 4175 | 4178 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4176 | 4179 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4177 | 4180 |
|
| 4178 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4181 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4179 | 4182 |
|
| 4180 | 4183 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4181 | 4184 |
|
| ... | ... | |
| 4228 | 4231 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4229 | 4232 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4230 | 4233 |
|
| 4231 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4234 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4232 | 4235 |
|
| 4233 | 4236 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4234 | 4237 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| ... | ... | |
| 4284 | 4287 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4285 | 4288 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4286 | 4289 |
|
| 4287 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4290 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4288 | 4291 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4289 | 4292 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| 4290 | 4293 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| ... | ... | |
| 4333 | 4336 |
currentControl.IsNew = true; |
| 4334 | 4337 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4335 | 4338 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4336 |
currentControl.SetValue(Canvas.ZIndexProperty, 3);
|
|
| 4339 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
|
|
| 4337 | 4340 |
|
| 4338 | 4341 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| 4339 | 4342 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, CanvasDrawingMouseDownPoint); |
| ... | ... | |
| 4422 | 4425 |
|
| 4423 | 4426 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4424 | 4427 |
(currentControl as SignControl).CommentAngle -= rotate.Angle; |
| 4428 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 4425 | 4429 |
} |
| 4426 | 4430 |
//} |
| 4427 | 4431 |
} |
| ... | ... | |
| 4469 | 4473 |
currentControl.IsNew = true; |
| 4470 | 4474 |
(currentControl as RectangleControl).DashSize = ViewerDataModel.Instance.DashSize; |
| 4471 | 4475 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4476 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 4472 | 4477 |
} |
| 4473 | 4478 |
//} |
| 4474 | 4479 |
} |
| ... | ... | |
| 4508 | 4513 |
|
| 4509 | 4514 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4510 | 4515 |
(currentControl as SymControl).CommentAngle -= rotate.Angle; |
| 4516 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 4511 | 4517 |
} |
| 4512 | 4518 |
//} |
| 4513 | 4519 |
} |
| ... | ... | |
| 4550 | 4556 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4551 | 4557 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4552 | 4558 |
(currentControl as SymControlN).CommentAngle -= rotate.Angle; |
| 4559 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
|
| 4553 | 4560 |
} |
| 4554 | 4561 |
//} |
| 4555 | 4562 |
} |
내보내기 Unified diff
