개정판 fa48eb85
issue #1000 컨트롤 angle 수정/ Textcontrol 텍스트 선택 수정
Change-Id: I56b5c6295adb7409774045545f30f16a920be96c
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1553 | 1553 |
#endregion |
| 1554 | 1554 |
if (ViewerDataModel.Instance.AngleVisibility == Visibility.Visible) |
| 1555 | 1555 |
{
|
| 1556 |
ViewerDataModel.Instance.Angle = currentControl.Angle; |
|
| 1556 |
ViewerDataModel.Instance.Angle = currentControl.CommentAngle;
|
|
| 1557 | 1557 |
} |
| 1558 | 1558 |
} |
| 1559 | 1559 |
} |
| ... | ... | |
| 3212 | 3212 |
currentControl.IsNew = true; |
| 3213 | 3213 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3214 | 3214 |
|
| 3215 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정
|
|
| 3216 |
(currentControl as ImgControl).Angle -= rotate.Angle;
|
|
| 3217 |
}
|
|
| 3215 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3216 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle;
|
|
| 3217 |
} |
|
| 3218 | 3218 |
} |
| 3219 | 3219 |
//} |
| 3220 | 3220 |
} |
| ... | ... | |
| 3262 | 3262 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3263 | 3263 |
|
| 3264 | 3264 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3265 |
(currentControl as DateControl).Angle -= rotate.Angle;
|
|
| 3265 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle;
|
|
| 3266 | 3266 |
} |
| 3267 | 3267 |
//} |
| 3268 | 3268 |
} |
| ... | ... | |
| 3289 | 3289 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
| 3290 | 3290 |
|
| 3291 | 3291 |
(currentControl as TextControl).ControlType_No = 0; |
| 3292 |
(currentControl as TextControl).Angle -= rotate.Angle; |
|
| 3292 |
(currentControl as TextControl).CommentAngle -= rotate.Angle;
|
|
| 3293 | 3293 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3294 | 3294 |
(currentControl as TextControl).ApplyTemplate(); |
| 3295 | 3295 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3320 | 3320 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
| 3321 | 3321 |
|
| 3322 | 3322 |
(currentControl as TextControl).ControlType_No = 1; |
| 3323 |
(currentControl as TextControl).Angle = Ang; |
|
| 3323 |
(currentControl as TextControl).CommentAngle = Ang;
|
|
| 3324 | 3324 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3325 | 3325 |
(currentControl as TextControl).ApplyTemplate(); |
| 3326 | 3326 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3349 | 3349 |
|
| 3350 | 3350 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
| 3351 | 3351 |
currentControl.SetValue(TextControl.CanvasXProperty, canvasDrawingMouseDownPoint.X); |
| 3352 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y);
|
|
| 3352 |
currentControl.SetValue(TextControl.CanvasYProperty, canvasDrawingMouseDownPoint.Y); |
|
| 3353 | 3353 |
|
| 3354 |
(currentControl as TextControl).Angle = Ang; |
|
| 3354 |
(currentControl as TextControl).CommentAngle = Ang;
|
|
| 3355 | 3355 |
(currentControl as TextControl).ControlType_No = 2; |
| 3356 | 3356 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3357 | 3357 |
(currentControl as TextControl).ApplyTemplate(); |
| ... | ... | |
| 3398 | 3398 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3399 | 3399 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3400 | 3400 |
|
| 3401 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정
|
|
| 3402 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle;
|
|
| 3401 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3402 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3403 | 3403 |
|
| 3404 |
(currentControl as ArrowTextControl).ApplyTemplate();
|
|
| 3404 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
|
| 3405 | 3405 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3406 | 3406 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
| 3407 | 3407 |
ViewerDataModel.Instance.AngleVisibility = Visibility.Visible; |
| ... | ... | |
| 3452 | 3452 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3453 | 3453 |
|
| 3454 | 3454 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3455 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3455 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3456 | 3456 |
|
| 3457 | 3457 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3458 | 3458 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3502 | 3502 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3503 | 3503 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
| 3504 | 3504 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3505 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3505 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3506 | 3506 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3507 | 3507 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 3508 | 3508 |
ViewerDataModel.Instance.AngleVisibility = Visibility.Visible; |
| ... | ... | |
| 3555 | 3555 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3556 | 3556 |
|
| 3557 | 3557 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3558 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3558 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3559 | 3559 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3560 | 3560 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
| 3561 | 3561 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3607 | 3607 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3608 | 3608 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
| 3609 | 3609 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3610 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3610 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3611 | 3611 |
|
| 3612 | 3612 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3613 | 3613 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3657 | 3657 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 3658 | 3658 |
|
| 3659 | 3659 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3660 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3660 |
(currentControl as ArrowTextControl).CommentAngle -= rotate.Angle;
|
|
| 3661 | 3661 |
(currentControl as ArrowTextControl).SetFontFamily(new FontFamily(this.ParentOfType<MainWindow>().dzTopMenu.comboFontFamily.Text)); |
| 3662 | 3662 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
| 3663 | 3663 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| ... | ... | |
| 3724 | 3724 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3725 | 3725 |
|
| 3726 | 3726 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3727 |
(currentControl as SignControl).Angle -= rotate.Angle; |
|
| 3727 |
(currentControl as SignControl).CommentAngle -= rotate.Angle;
|
|
| 3728 | 3728 |
} |
| 3729 | 3729 |
//} |
| 3730 | 3730 |
} |
| ... | ... | |
| 3808 | 3808 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3809 | 3809 |
|
| 3810 | 3810 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3811 |
(currentControl as SymControl).Angle -= rotate.Angle; |
|
| 3811 |
(currentControl as SymControl).CommentAngle -= rotate.Angle;
|
|
| 3812 | 3812 |
} |
| 3813 | 3813 |
//} |
| 3814 | 3814 |
} |
| ... | ... | |
| 3849 | 3849 |
currentControl.CommentID = Commons.shortGuid(); |
| 3850 | 3850 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3851 | 3851 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 3852 |
(currentControl as SymControlN).Angle -= rotate.Angle; |
|
| 3852 |
(currentControl as SymControlN).CommentAngle -= rotate.Angle;
|
|
| 3853 | 3853 |
} |
| 3854 | 3854 |
//} |
| 3855 | 3855 |
} |
| ... | ... | |
| 3881 | 3881 |
} |
| 3882 | 3882 |
break; |
| 3883 | 3883 |
} |
| 3884 |
|
|
| 3885 |
if (currentControl != null) |
|
| 3886 |
{
|
|
| 3887 |
currentControl.PageAngle = pageNavigator.CurrentPage.Angle; |
|
| 3888 |
} |
|
| 3884 | 3889 |
} |
| 3885 | 3890 |
if (mouseHandlingMode != MouseHandlingMode.None && e.LeftButton == MouseButtonState.Pressed) |
| 3886 | 3891 |
{
|
| ... | ... | |
| 5234 | 5239 |
|
| 5235 | 5240 |
PolygonControl pc = new PolygonControl() |
| 5236 | 5241 |
{
|
| 5237 |
Angle = 0, |
|
| 5242 |
CommentAngle = 0,
|
|
| 5238 | 5243 |
PointSet = inkPointSet, |
| 5239 | 5244 |
ControlType = ControlType.Ink |
| 5240 | 5245 |
}; |
내보내기 Unified diff
