프로젝트

일반

사용자정보

개정판 b643fcca

IDb643fcca31ab2f12169c198f014a9ebed9232dd0
상위 68302e9d
하위 233ef333

김태성이(가) 4년 이상 전에 추가함

- angle event 수정
- select에서 shift키 이벤트 안됨

Change-Id: I17decc4b6ab1f91e7b6ae18751acf74811e5d7a7

차이점 보기:

KCOM/Views/MainMenu.xaml.cs
1993 1993
                    {
1994 1994
                        ViewerDataModel.Instance.Angle = currentControl.CommentAngle;
1995 1995
                    }
1996

  
1996 1997
                }
1997 1998
            }
1998 1999
            else if(mouseHandlingMode == MouseHandlingMode.Drawing && e.LeftButton == MouseButtonState.Pressed)
......
2149 2150
                }
2150 2151
                else if (mouseHandlingMode == MouseHandlingMode.Selecting && e.ChangedButton == MouseButton.Left || mouseHandlingMode == MouseHandlingMode.Capture && e.ChangedButton == MouseButton.Left || mouseHandlingMode == MouseHandlingMode.DragZoom && e.ChangedButton == MouseButton.Left)
2151 2152
                {
2152
                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
2153

  
2153
                  
2154 2154
                    if (isLeftMouseButtonDownOnWindow)
2155 2155
                    {
2156 2156
                        bool wasDragSelectionApplied = false;
......
2771 2771
                }
2772 2772

  
2773 2773
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault();
2774
                if (control != null)
2774

  
2775
                if(control == null)
2775 2776
                {
2777

  
2778
                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
2779
                }
2780
                else
2781
                {
2782
                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
2783

  
2776 2784
                    AdornerFinal final = null;
2777 2785

  
2778 2786
                    if (!ViewerDataModel.Instance.IsPressCtrl)
......
2901 2909
                    {
2902 2910
                        this.SelectLayer.Children.Add(final);
2903 2911
                    }
2904
                }              
2912
                }
2905 2913
            }
2906 2914
            else if (mouseHandlingMode == MouseHandlingMode.Drawing)
2907 2915
            {               
......
3257 3265

  
3258 3266
                                    CreateCommand.Instance.Execute(currentControl);
3259 3267
                                    currentControl = null;
3260
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3268
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3261 3269
                                }
3262 3270
                                else
3263 3271
                                {
......
3272 3280
                                    currentControl.CommentID = Commons.shortGuid();
3273 3281
                                    currentControl.IsNew = true;
3274 3282
                                    ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
3275
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3283
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3276 3284
                                }
3277 3285
                            }
3278 3286
                        }
......
3353 3361
                                    CreateCommand.Instance.Execute(currentControl);
3354 3362

  
3355 3363
                                    currentControl = null;
3356
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3364
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3357 3365
                                    return;
3358 3366
                                }
3359 3367

  
3360 3368
                                if (!control.IsCompleted)
3361 3369
                                {
3362 3370
                                    control.PointSet.Add(control.EndPoint);
3363
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3371
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3364 3372
                                }
3365 3373
                            }
3366 3374
                            else
......
3410 3418
                                    CreateCommand.Instance.Execute(currentControl);
3411 3419

  
3412 3420
                                    currentControl = null;
3413
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3421
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3414 3422
                                }
3415 3423
                                else
3416 3424
                                {
......
3423 3431
                                    currentControl.MarkupInfoID = App.Custom_ViewInfoId;
3424 3432
                                    currentControl.IsNew = true;
3425 3433
                                    ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
3426
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3434
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3427 3435
                                }
3428 3436
                            }
3429 3437
                            else if (e.RightButton == MouseButtonState.Pressed)
......
3453 3461
                                    CreateCommand.Instance.Execute(currentControl);
3454 3462

  
3455 3463
                                    currentControl = null;
3456
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3464
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3457 3465
                                }
3458 3466
                                else
3459 3467
                                {
......
3466 3474
                                    currentControl.MarkupInfoID = App.Custom_ViewInfoId;
3467 3475
                                    currentControl.IsNew = true;
3468 3476
                                    ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
3469
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3477
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3470 3478
                                }
3471 3479
                                //}
3472 3480
                            }
......
3513 3521
                                            CreateCommand.Instance.Execute(currentControl);
3514 3522

  
3515 3523
                                            currentControl = null;
3516
                                            ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3524
                                            ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3517 3525
                                        }
3518 3526
                                    }
3519 3527
                                    else
......
3527 3535
                                        currentControl.MarkupInfoID = App.Custom_ViewInfoId;
3528 3536
                                        currentControl.IsNew = true;
3529 3537
                                        ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
3530
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3538
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3531 3539
                                    }
3532 3540
                                //}
3533 3541
                            }
......
3849 3857
                                    (currentControl as ArrowTextControl).ApplyTemplate();
3850 3858
                                        (currentControl as ArrowTextControl).Base_TextBox.Focus();
3851 3859
                                        (currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
3852
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
3860
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3853 3861

  
3854 3862
                                    
3855 3863
                                    //}
......
3875 3883
                                    
3876 3884
                                    currentControl.IsNew = false;
3877 3885
                                    currentControl = null;
3878
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3886
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3879 3887
                                }
3880 3888
                                else
3881 3889
                                {
......
3923 3931
                                    (currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false;
3924 3932
                                    currentControl.IsNew = false;
3925 3933
                                    currentControl = null;
3926
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3934
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3927 3935
                                }
3928 3936
                                else
3929 3937
                                {
......
3950 3958
                                        (currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
3951 3959
                                        (currentControl as ArrowTextControl).ApplyTemplate();
3952 3960
                                        (currentControl as ArrowTextControl).Base_TextBox.Focus();
3953
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;                                    
3961
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);                                    
3954 3962
                                    //}
3955 3963
                                }
3956 3964
                            }
......
3972 3980
                                    currentControl.IsNew = false;
3973 3981
                                    currentControl = null;
3974 3982

  
3975
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
3983
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
3976 3984
                                }
3977 3985
                                else
3978 3986
                                {
......
4004 4012
                                        (currentControl as ArrowTextControl).ApplyTemplate();
4005 4013
                                        (currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
4006 4014
                                        (currentControl as ArrowTextControl).Base_TextBox.Focus();                                 
4007
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;
4015
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
4008 4016
                                    
4009 4017
                                    //20180911 LJY
4010 4018
                                        (currentControl as ArrowTextControl).isTrans = true;
......
4030 4038
                                    (currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false;
4031 4039
                                    currentControl.IsNew = false;
4032 4040
                                    currentControl = null;
4033
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
4041
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
4034 4042
                                }
4035 4043
                                else
4036 4044
                                {
......
4056 4064
                                    
4057 4065
                                        (currentControl as ArrowTextControl).ApplyTemplate();
4058 4066
                                        (currentControl as ArrowTextControl).Base_TextBox.Focus();
4059
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;                                        
4067
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);                                        
4060 4068
                                    //}
4061 4069
                                }
4062 4070
                            }
......
4077 4085
                                    (currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false;
4078 4086
                                    currentControl.IsNew = false;
4079 4087
                                    currentControl = null;
4080
                                    ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed;
4088
                                    ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
4081 4089
                                }
4082 4090
                                else
4083 4091
                                {
......
4106 4114
                                        (currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text));
4107 4115
                                        (currentControl as ArrowTextControl).ApplyTemplate();
4108 4116
                                        (currentControl as ArrowTextControl).Base_TextBox.Focus();
4109
                                        ViewerDataModel.Instance.AngleVisibility = Visibility.Visible;  
4117
                                        ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);  
4110 4118
                                    
4111 4119
                                    //20180911 LJY
4112 4120
                                        (currentControl as ArrowTextControl).isTrans = true;

내보내기 Unified diff

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