개정판 f513c215
issue #923: add CreateCommand and change thumb's opacity when mouse is enter or leave
Change-Id: I1e4b2ac57ca876e4681b14f02c1567abb265391e
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1140 | 1140 |
|
| 1141 | 1141 |
floatingTip.HorizontalOffset = currentPos.X + 20; |
| 1142 | 1142 |
floatingTip.VerticalOffset = currentPos.Y; |
| 1143 |
|
|
| 1144 |
|
|
| 1145 |
//ToolTip tool = new System.Windows.Controls.ToolTip(); |
|
| 1146 |
//tool.Content = "ToolTip"; |
|
| 1147 |
//panel.ToolTip = tool; |
|
| 1148 |
} |
|
| 1149 |
|
|
| 1150 |
if (mouseHandlingMode != MouseHandlingMode.Drawing) |
|
| 1151 |
{
|
|
| 1152 |
#region 마우스 오버 시 색상 변경 |
|
| 1153 |
/* |
|
| 1154 |
var firstCondition = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault(); |
|
| 1155 |
Color TempColor = MarkupToPDF.Controls.Common.ValueConverter.StringToColorConverter.Parse("FF07B4FF");
|
|
| 1156 |
|
|
| 1157 |
if (firstCondition != null) |
|
| 1158 |
{
|
|
| 1159 |
firstCondition.MouseLeave += new System.Windows.Input.MouseEventHandler(firstCondition_MouseLeave); |
|
| 1160 |
|
|
| 1161 |
if (firstCondition.GetType().Name == "TextControl") |
|
| 1162 |
{
|
|
| 1163 |
(firstCondition as TextControl).BackInnerColor = new SolidColorBrush(TempColor); |
|
| 1164 |
return; |
|
| 1165 |
} |
|
| 1166 |
else if (firstCondition.GetType().Name == "ArrowTextControl") |
|
| 1167 |
{
|
|
| 1168 |
(firstCondition as ArrowTextControl).BackInnerColor = new SolidColorBrush(TempColor); |
|
| 1169 |
return; |
|
| 1170 |
} |
|
| 1171 |
|
|
| 1172 |
if (L_Size == 0) |
|
| 1173 |
{
|
|
| 1174 |
L_Size = (firstCondition as IPath).LineSize; |
|
| 1175 |
(firstCondition as IPath).LineSize *= 4; |
|
| 1176 |
} |
|
| 1177 |
switch (firstCondition.GetType().Name) |
|
| 1178 |
{
|
|
| 1179 |
case "RectangleControl": |
|
| 1180 |
{
|
|
| 1181 |
(firstCondition as RectangleControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1182 |
} |
|
| 1183 |
break; |
|
| 1184 |
case "CircleControl": |
|
| 1185 |
{
|
|
| 1186 |
(firstCondition as CircleControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1187 |
} |
|
| 1188 |
break; |
|
| 1189 |
case "TriControl": |
|
| 1190 |
{
|
|
| 1191 |
(firstCondition as TriControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1192 |
} |
|
| 1193 |
break; |
|
| 1194 |
case "RectCloudControl": |
|
| 1195 |
{
|
|
| 1196 |
(firstCondition as RectCloudControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1197 |
} |
|
| 1198 |
break; |
|
| 1199 |
case "CloudControl": |
|
| 1200 |
{
|
|
| 1201 |
(firstCondition as CloudControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1202 |
} |
|
| 1203 |
break; |
|
| 1204 |
case "PolygonControl": |
|
| 1205 |
{
|
|
| 1206 |
(firstCondition as PolygonControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1207 |
} |
|
| 1208 |
break; |
|
| 1209 |
case "ArcControl": |
|
| 1210 |
{
|
|
| 1211 |
(firstCondition as ArcControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1212 |
} |
|
| 1213 |
break; |
|
| 1214 |
case "LineControl": |
|
| 1215 |
{
|
|
| 1216 |
(firstCondition as LineControl).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1217 |
} |
|
| 1218 |
break; |
|
| 1219 |
case "ArrowControl_Multi": |
|
| 1220 |
{
|
|
| 1221 |
(firstCondition as ArrowControl_Multi).StrokeColor = new SolidColorBrush(TempColor); |
|
| 1222 |
} |
|
| 1223 |
break; |
|
| 1224 |
|
|
| 1225 |
default: |
|
| 1226 |
{
|
|
| 1227 |
|
|
| 1228 |
} |
|
| 1229 |
break; |
|
| 1230 |
} |
|
| 1231 |
} |
|
| 1232 |
*/ |
|
| 1233 |
#endregion |
|
| 1234 | 1143 |
} |
| 1235 | 1144 |
|
| 1236 | 1145 |
getCurrentPoint = e.GetPosition(drawingRotateCanvas); |
| ... | ... | |
| 2425 | 2334 |
if (isDraggingSelectionRect) |
| 2426 | 2335 |
{
|
| 2427 | 2336 |
UpdateDragSelectionRect(canvasDrawingMouseDownPoint, curMouseDownPoint); |
| 2428 |
|
|
| 2429 | 2337 |
e.Handled = true; |
| 2430 | 2338 |
} |
| 2431 | 2339 |
else if (isLeftMouseButtonDownOnWindow) |
| ... | ... | |
| 2436 | 2344 |
if (dragDistance > DragThreshold) |
| 2437 | 2345 |
{
|
| 2438 | 2346 |
isDraggingSelectionRect = true; |
| 2439 |
|
|
| 2440 | 2347 |
InitDragSelectionRect(canvasDrawingMouseDownPoint, curMouseDownPoint); |
| 2441 | 2348 |
} |
| 2442 | 2349 |
|
| 2443 | 2350 |
e.Handled = true; |
| 2444 | 2351 |
} |
| 2445 | 2352 |
|
| 2446 |
|
|
| 2447 | 2353 |
if (canvasDrawingMouseDownPoint == curMouseDownPoint) |
| 2448 | 2354 |
{
|
| 2449 |
//SelectionPath = new Path(); |
|
| 2450 |
//PathFigure pathFigure = new PathFigure(); |
|
| 2451 |
//SelectionPath.Fill = new SolidColorBrush(Colors.Yellow); |
|
| 2452 |
//SelectionPath.Opacity = 0.5; |
|
| 2453 |
//SelectionPath.StrokeDashArray = new DoubleCollection() { 1 };
|
|
| 2454 |
//SelectionPath.StrokeDashCap = PenLineCap.Round; |
|
| 2455 |
//SelectionPath.Stroke = new SolidColorBrush(Colors.Black); |
|
| 2456 | 2355 |
} |
| 2457 | 2356 |
else |
| 2458 | 2357 |
{
|
| 2459 |
//List<Stroke> removingStroke = new List<Stroke>(); |
|
| 2460 |
//Rect p1 = new Rect(canvasDrawingMouseDownPoint, curMouseDownPoint); |
|
| 2461 |
//StrokeCollection stC = new StrokeCollection(); |
|
| 2462 |
//for (int i = 0; i <= inkBoard.Strokes.Count - 1; i++) |
|
| 2463 |
//{
|
|
| 2464 |
// Rect p2 = inkBoard.Strokes[i].GetBounds(); |
|
| 2465 |
// p1.Intersect(p2); |
|
| 2466 |
// if (p1.IsEmpty) |
|
| 2467 |
// {
|
|
| 2468 |
|
|
| 2469 |
|
|
| 2470 |
// p1 = SelectionPath.Data.Bounds; |
|
| 2471 |
// bool intersectCheck = false; |
|
| 2472 |
// foreach (var T in inkBoard.Strokes[i].StylusPoints) |
|
| 2473 |
// {
|
|
| 2474 |
// Rect p3 = new Rect(new Point(T.X, T.Y), new Size(10, 10)); |
|
| 2475 |
// p1.Intersect(p3); |
|
| 2476 |
// if (!p1.IsEmpty) |
|
| 2477 |
// {
|
|
| 2478 |
// intersectCheck = true; |
|
| 2479 |
// } |
|
| 2480 |
// } |
|
| 2481 |
// if (intersectCheck) |
|
| 2482 |
// {
|
|
| 2483 |
// removingStroke.Add(inkBoard.Strokes[i]); |
|
| 2484 |
// } |
|
| 2485 |
|
|
| 2486 |
// } |
|
| 2487 |
// else |
|
| 2488 |
// {
|
|
| 2489 |
// removingStroke.Add(inkBoard.Strokes[i]); |
|
| 2490 |
// } |
|
| 2491 |
//} |
|
| 2492 |
|
|
| 2493 | 2358 |
e.Handled = true; |
| 2494 | 2359 |
} |
| 2495 | 2360 |
} |
| ... | ... | |
| 3081 | 2946 |
} |
| 3082 | 2947 |
} |
| 3083 | 2948 |
|
| 3084 |
///mouseButtonDown = e.ChangedButton; |
|
| 3085 |
/// complete drawing text control when user click mouse right button - 2018.05.14 added by humkyung |
|
| 3086 |
|
|
| 3087 | 2949 |
//if (currentControl != null) |
| 3088 | 2950 |
{
|
| 3089 | 2951 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).Base_TextBox.Visibility == Visibility.Visible).FirstOrDefault(); |
| ... | ... | |
| 3118 | 2980 |
|
| 3119 | 2981 |
if (mouseHandlingMode == MouseHandlingMode.DragSymbol && e.LeftButton == MouseButtonState.Pressed) |
| 3120 | 2982 |
{
|
| 3121 |
//this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 3122 |
//SetCursor(); |
|
| 3123 |
|
|
| 3124 |
//canvasDrawingMouseDownPoint = e.GetPosition(drawingRotateCanvas); |
|
| 3125 | 2983 |
canvasZoomPanningMouseDownPoint = e.GetPosition(zoomAndPanCanvas); |
| 3126 | 2984 |
if(symbol_id != null) |
| 3127 | 2985 |
{
|
| ... | ... | |
| 3147 | 3005 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
| 3148 | 3006 |
SetCursor(); |
| 3149 | 3007 |
|
| 3150 |
if (!ViewerDataModel.Instance.IsPressCtrl) |
|
| 3151 |
{
|
|
| 3152 |
SelectionSet.Instance.UnSelect(this); |
|
| 3153 |
} |
|
| 3008 |
if (!ViewerDataModel.Instance.IsPressCtrl) SelectionSet.Instance.UnSelect(this); |
|
| 3154 | 3009 |
} |
| 3010 |
|
|
| 3155 | 3011 |
if (e.MiddleButton == MouseButtonState.Pressed) |
| 3156 | 3012 |
{
|
| 3157 | 3013 |
canvasZoommovingMouseDownPoint = e.GetPosition(zoomAndPanCanvas); |
| ... | ... | |
| 3182 | 3038 |
} |
| 3183 | 3039 |
} |
| 3184 | 3040 |
|
| 3185 |
//if (mouseButtonDown == MouseButton.Left && ViewerDataModel.Instance.MarkupControls_USER.Count > 0 && mouseHandlingMode != MouseHandlingMode.Drawing && currentControl == null) |
|
| 3186 | 3041 |
if (e.LeftButton == MouseButtonState.Pressed && mouseHandlingMode != MouseHandlingMode.Drawing && currentControl == null) |
| 3187 | 3042 |
{
|
| 3188 | 3043 |
if (mouseHandlingMode == MouseHandlingMode.Selecting) |
| ... | ... | |
| 3199 | 3054 |
} |
| 3200 | 3055 |
} |
| 3201 | 3056 |
|
| 3202 |
//캡쳐 모드 설정 |
|
| 3057 |
/// 캡쳐 모드 설정
|
|
| 3203 | 3058 |
if (mouseHandlingMode == MouseHandlingMode.Capture) |
| 3204 | 3059 |
{
|
| 3205 | 3060 |
dragCaptureBorder.Visibility = Visibility.Visible; |
| 3206 | 3061 |
isLeftMouseButtonDownOnWindow = true; |
| 3207 | 3062 |
} |
| 3208 | 3063 |
|
| 3209 |
//줌 모드 설정 |
|
| 3064 |
/// 줌 모드 설정
|
|
| 3210 | 3065 |
if (mouseHandlingMode == MouseHandlingMode.DragZoom) |
| 3211 | 3066 |
{
|
| 3212 |
//dragSelectionBorder.Visibility = Visibility.Visible; |
|
| 3213 | 3067 |
isLeftMouseButtonDownOnWindow = true; |
| 3214 | 3068 |
} |
| 3215 | 3069 |
|
| ... | ... | |
| 3225 | 3079 |
|
| 3226 | 3080 |
final = new AdornerFinal(control); |
| 3227 | 3081 |
|
| 3228 |
Control_Style(control); |
|
| 3082 |
this.Control_Style(control);
|
|
| 3229 | 3083 |
|
| 3230 | 3084 |
if ((control as IPath) != null) |
| 3231 | 3085 |
{
|
| ... | ... | |
| 3351 | 3205 |
final = new AdornerFinal(comment); |
| 3352 | 3206 |
} |
| 3353 | 3207 |
|
| 3354 |
if(final != null) this.SelectLayer.Children.Add(final); |
|
| 3208 |
if (final != null) |
|
| 3209 |
{
|
|
| 3210 |
this.SelectLayer.Children.Add(final); |
|
| 3211 |
} |
|
| 3355 | 3212 |
} |
| 3356 | 3213 |
} |
| 3357 | 3214 |
else if (mouseHandlingMode == MouseHandlingMode.Drawing) |
| ... | ... | |
| 3391 | 3248 |
} |
| 3392 | 3249 |
} |
| 3393 | 3250 |
|
| 3394 |
multi_Undo_Data = new Multi_Undo_data(); |
|
| 3395 |
//강인구 Undo/Redo 보류 |
|
| 3396 |
UndoData = new Undo_data() |
|
| 3397 |
{
|
|
| 3398 |
IsUndo = false, |
|
| 3399 |
Event = Event_Type.Create, |
|
| 3400 |
EventTime = DateTime.Now, |
|
| 3401 |
Markup_List = new List<Multi_Undo_data>() |
|
| 3402 |
}; |
|
| 3403 |
|
|
| 3404 | 3251 |
switch (controlType) |
| 3405 | 3252 |
{
|
| 3406 | 3253 |
case ControlType.Coordinate: |
| ... | ... | |
| 3414 | 3261 |
return; |
| 3415 | 3262 |
} |
| 3416 | 3263 |
|
| 3417 |
CreateControl();
|
|
| 3264 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3418 | 3265 |
|
| 3419 |
(currentControl as CoordinateControl).ApplyOverViewData(); |
|
| 3420 | 3266 |
currentControl = null; |
| 3421 | 3267 |
this.cursor = Cursors.Arrow; |
| 3422 | 3268 |
} |
| ... | ... | |
| 3462 | 3308 |
return; |
| 3463 | 3309 |
} |
| 3464 | 3310 |
|
| 3465 |
CreateControl();
|
|
| 3311 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3466 | 3312 |
|
| 3467 |
(currentControl as InsideWhiteControl).ApplyOverViewData(); |
|
| 3468 | 3313 |
currentControl = null; |
| 3469 | 3314 |
this.cursor = Cursors.Arrow; |
| 3470 | 3315 |
} |
| ... | ... | |
| 3497 | 3342 |
return; |
| 3498 | 3343 |
} |
| 3499 | 3344 |
|
| 3500 |
CreateControl();
|
|
| 3345 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3501 | 3346 |
|
| 3502 |
(currentControl as OverlapWhiteControl).ApplyOverViewData(); |
|
| 3503 | 3347 |
currentControl = null; |
| 3504 | 3348 |
this.cursor = Cursors.Arrow; |
| 3505 | 3349 |
} |
| ... | ... | |
| 3532 | 3376 |
return; |
| 3533 | 3377 |
} |
| 3534 | 3378 |
|
| 3535 |
CreateControl();
|
|
| 3379 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3536 | 3380 |
|
| 3537 |
(currentControl as ClipWhiteControl).ApplyOverViewData(); |
|
| 3538 | 3381 |
currentControl = null; |
| 3539 | 3382 |
this.cursor = Cursors.Arrow; |
| 3540 | 3383 |
} |
| ... | ... | |
| 3570 | 3413 |
return; |
| 3571 | 3414 |
} |
| 3572 | 3415 |
|
| 3573 |
CreateControl();
|
|
| 3416 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3574 | 3417 |
|
| 3575 |
(currentControl as RectangleControl).ApplyOverViewData(); |
|
| 3576 | 3418 |
currentControl = null; |
| 3577 | 3419 |
|
| 3578 | 3420 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
| ... | ... | |
| 3610 | 3452 |
return; |
| 3611 | 3453 |
} |
| 3612 | 3454 |
|
| 3613 |
CreateControl();
|
|
| 3455 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3614 | 3456 |
|
| 3615 |
(currentControl as RectCloudControl).ApplyOverViewData(); |
|
| 3616 | 3457 |
currentControl = null; |
| 3617 | 3458 |
|
| 3618 | 3459 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
| ... | ... | |
| 3647 | 3488 |
return; |
| 3648 | 3489 |
} |
| 3649 | 3490 |
|
| 3650 |
CreateControl();
|
|
| 3491 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3651 | 3492 |
|
| 3652 |
(currentControl as CircleControl).ApplyOverViewData(); |
|
| 3653 | 3493 |
currentControl = null; |
| 3654 | 3494 |
} |
| 3655 | 3495 |
else |
| ... | ... | |
| 3689 | 3529 |
return; |
| 3690 | 3530 |
} |
| 3691 | 3531 |
|
| 3692 |
CreateControl();
|
|
| 3532 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3693 | 3533 |
|
| 3694 |
(currentControl as TriControl).ApplyOverViewData(); |
|
| 3695 | 3534 |
currentControl = null; |
| 3696 | 3535 |
} |
| 3697 | 3536 |
} |
| ... | ... | |
| 3726 | 3565 |
return; |
| 3727 | 3566 |
} |
| 3728 | 3567 |
|
| 3729 |
CreateControl();
|
|
| 3568 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3730 | 3569 |
|
| 3731 |
(currentControl as LineControl).ApplyOverViewData(); |
|
| 3732 | 3570 |
currentControl = null; |
| 3733 | 3571 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3734 | 3572 |
} |
| ... | ... | |
| 3763 | 3601 |
return; |
| 3764 | 3602 |
} |
| 3765 | 3603 |
|
| 3766 |
CreateControl();
|
|
| 3604 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3767 | 3605 |
|
| 3768 |
(currentControl as LineControl).ApplyOverViewData(); |
|
| 3769 | 3606 |
currentControl = null; |
| 3770 | 3607 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3771 | 3608 |
} |
| ... | ... | |
| 3800 | 3637 |
return; |
| 3801 | 3638 |
} |
| 3802 | 3639 |
|
| 3803 |
CreateControl();
|
|
| 3640 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3804 | 3641 |
|
| 3805 |
(currentControl as LineControl).ApplyOverViewData(); |
|
| 3806 | 3642 |
currentControl = null; |
| 3807 | 3643 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3808 | 3644 |
} |
| ... | ... | |
| 3837 | 3673 |
return; |
| 3838 | 3674 |
} |
| 3839 | 3675 |
|
| 3840 |
CreateControl();
|
|
| 3676 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3841 | 3677 |
|
| 3842 |
(currentControl as LineControl).ApplyOverViewData(); |
|
| 3843 | 3678 |
currentControl = null; |
| 3844 | 3679 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3845 | 3680 |
} |
| ... | ... | |
| 3872 | 3707 |
{
|
| 3873 | 3708 |
return; |
| 3874 | 3709 |
} |
| 3875 |
CreateControl();
|
|
| 3710 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3876 | 3711 |
|
| 3877 |
(currentControl as LineControl).ApplyOverViewData(); |
|
| 3878 | 3712 |
currentControl = null; |
| 3879 | 3713 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3880 | 3714 |
} |
| ... | ... | |
| 3908 | 3742 |
return; |
| 3909 | 3743 |
} |
| 3910 | 3744 |
|
| 3911 |
CreateControl();
|
|
| 3745 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3912 | 3746 |
|
| 3913 |
(currentControl as PolygonControl).ApplyOverViewData(); |
|
| 3914 | 3747 |
currentControl = null; |
| 3915 | 3748 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3916 | 3749 |
return; |
| ... | ... | |
| 3968 | 3801 |
return; |
| 3969 | 3802 |
} |
| 3970 | 3803 |
|
| 3971 |
CreateControl();
|
|
| 3804 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3972 | 3805 |
|
| 3973 |
(currentControl as ArcControl).ApplyOverViewData(); |
|
| 3974 | 3806 |
currentControl = null; |
| 3975 | 3807 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 3976 | 3808 |
} |
| ... | ... | |
| 4013 | 3845 |
return; |
| 4014 | 3846 |
} |
| 4015 | 3847 |
|
| 4016 |
CreateControl();
|
|
| 3848 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4017 | 3849 |
|
| 4018 |
(currentControl as ArrowArcControl).ApplyOverViewData(); |
|
| 4019 | 3850 |
currentControl = null; |
| 4020 | 3851 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 4021 | 3852 |
} |
| ... | ... | |
| 4073 | 3904 |
return; |
| 4074 | 3905 |
} |
| 4075 | 3906 |
|
| 4076 |
CreateControl();
|
|
| 3907 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4077 | 3908 |
|
| 4078 |
(currentControl as ArrowControl_Multi).ApplyOverViewData(); |
|
| 4079 | 3909 |
currentControl = null; |
| 4080 | 3910 |
this.MainAngle.Visibility = Visibility.Collapsed; |
| 4081 | 3911 |
} |
| ... | ... | |
| 4119 | 3949 |
return; |
| 4120 | 3950 |
} |
| 4121 | 3951 |
|
| 4122 |
CreateControl();
|
|
| 3952 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4123 | 3953 |
|
| 4124 | 3954 |
control.isTransOn = true; |
| 4125 | 3955 |
var firstPoint = control.PointSet.First(); |
| ... | ... | |
| 4171 | 4001 |
return; |
| 4172 | 4002 |
} |
| 4173 | 4003 |
|
| 4174 |
CreateControl(); |
|
| 4175 |
(currentControl as ImgControl).ApplyOverViewData(); |
|
| 4004 |
CreateCommand.Instance.Execute(currentControl); |
|
| 4176 | 4005 |
controlType = ControlType.ImgControl; |
| 4177 | 4006 |
currentControl = null; |
| 4178 | 4007 |
} |
| ... | ... | |
| 4242 | 4071 |
return; |
| 4243 | 4072 |
} |
| 4244 | 4073 |
|
| 4245 |
CreateControl(); |
|
| 4246 |
(currentControl as DateControl).ApplyOverViewData(); |
|
| 4074 |
CreateCommand.Instance.Execute(currentControl); |
|
| 4247 | 4075 |
currentControl = null; |
| 4248 | 4076 |
|
| 4249 | 4077 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
| ... | ... | |
| 4305 | 4133 |
//System.Diagnostics.Debug.WriteLine("CanvasX" + (currentControl as TextControl).CanvasX);
|
| 4306 | 4134 |
//System.Diagnostics.Debug.WriteLine("CanvasY" + (currentControl as TextControl).CanvasY);
|
| 4307 | 4135 |
|
| 4308 |
CreateControl();
|
|
| 4136 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4309 | 4137 |
|
| 4310 | 4138 |
} |
| 4311 | 4139 |
} |
| ... | ... | |
| 4336 | 4164 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4337 | 4165 |
(currentControl as TextControl).ApplyTemplate(); |
| 4338 | 4166 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 4339 |
CreateControl();
|
|
| 4167 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4340 | 4168 |
|
| 4341 | 4169 |
//currentControl = null; |
| 4342 | 4170 |
} |
| ... | ... | |
| 4369 | 4197 |
(currentControl as TextControl).IsHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4370 | 4198 |
(currentControl as TextControl).ApplyTemplate(); |
| 4371 | 4199 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 4372 |
CreateControl();
|
|
| 4200 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4373 | 4201 |
//currentControl = null; |
| 4374 | 4202 |
} |
| 4375 | 4203 |
} |
| ... | ... | |
| 4385 | 4213 |
if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
| 4386 | 4214 |
{
|
| 4387 | 4215 |
return; |
| 4388 |
}
|
|
| 4216 |
} |
|
| 4389 | 4217 |
|
| 4390 |
CreateControl();
|
|
| 4218 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4391 | 4219 |
|
| 4392 | 4220 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4393 | 4221 |
(currentControl as ArrowTextControl).IsEditing = false; |
| ... | ... | |
| 4434 | 4262 |
if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
| 4435 | 4263 |
{
|
| 4436 | 4264 |
return; |
| 4437 |
}
|
|
| 4265 |
} |
|
| 4438 | 4266 |
|
| 4439 |
CreateControl();
|
|
| 4267 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4440 | 4268 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4441 | 4269 |
currentControl.IsNew = false; |
| 4442 | 4270 |
currentControl = null; |
| ... | ... | |
| 4480 | 4308 |
return; |
| 4481 | 4309 |
} |
| 4482 | 4310 |
|
| 4483 |
CreateControl();
|
|
| 4311 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4484 | 4312 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4485 | 4313 |
currentControl.IsNew = false; |
| 4486 | 4314 |
currentControl = null; |
| ... | ... | |
| 4528 | 4356 |
{
|
| 4529 | 4357 |
return; |
| 4530 | 4358 |
} |
| 4531 |
CreateControl();
|
|
| 4359 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4532 | 4360 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4533 | 4361 |
currentControl.IsNew = false; |
| 4534 | 4362 |
currentControl = null; |
| ... | ... | |
| 4584 | 4412 |
{
|
| 4585 | 4413 |
return; |
| 4586 | 4414 |
} |
| 4587 |
CreateControl();
|
|
| 4415 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4588 | 4416 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4589 | 4417 |
currentControl.IsNew = false; |
| 4590 | 4418 |
currentControl = null; |
| ... | ... | |
| 4631 | 4459 |
{
|
| 4632 | 4460 |
return; |
| 4633 | 4461 |
} |
| 4634 |
CreateControl();
|
|
| 4462 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4635 | 4463 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 4636 | 4464 |
currentControl.IsNew = false; |
| 4637 | 4465 |
currentControl = null; |
| ... | ... | |
| 4701 | 4529 |
|
| 4702 | 4530 |
control.ApplyOverViewData(); |
| 4703 | 4531 |
|
| 4704 |
CreateControl();
|
|
| 4532 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4705 | 4533 |
control.updateControl(); |
| 4706 | 4534 |
currentControl = null; |
| 4707 | 4535 |
} |
| ... | ... | |
| 4758 | 4586 |
return; |
| 4759 | 4587 |
} |
| 4760 | 4588 |
|
| 4761 |
CreateControl();
|
|
| 4589 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4762 | 4590 |
currentControl = null; |
| 4763 | 4591 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
| 4764 | 4592 |
{
|
| ... | ... | |
| 4803 | 4631 |
return; |
| 4804 | 4632 |
} |
| 4805 | 4633 |
|
| 4806 |
CreateControl();
|
|
| 4634 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4807 | 4635 |
(currentControl as RectangleControl).ApplyOverViewData(); |
| 4808 | 4636 |
currentControl = null; |
| 4809 | 4637 |
|
| ... | ... | |
| 4846 | 4674 |
{
|
| 4847 | 4675 |
return; |
| 4848 | 4676 |
} |
| 4849 |
CreateControl();
|
|
| 4677 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4850 | 4678 |
currentControl = null; |
| 4851 | 4679 |
|
| 4852 | 4680 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
| ... | ... | |
| 4886 | 4714 |
return; |
| 4887 | 4715 |
} |
| 4888 | 4716 |
|
| 4889 |
CreateControl();
|
|
| 4717 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 4890 | 4718 |
currentControl = null; |
| 4891 | 4719 |
|
| 4892 | 4720 |
|
| ... | ... | |
| 6242 | 6070 |
} |
| 6243 | 6071 |
#endregion |
| 6244 | 6072 |
|
| 6245 |
//MarkupInfoItem |
|
| 6246 |
public void CreateControl() |
|
| 6247 |
{
|
|
| 6248 |
|
|
| 6249 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
|
| 6250 |
{
|
|
| 6251 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
|
| 6252 |
}); |
|
| 6253 |
multi_Undo_Data.Markup = currentControl; |
|
| 6254 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 6255 |
|
|
| 6256 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 6257 |
|
|
| 6258 |
//List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); |
|
| 6259 |
} |
|
| 6260 |
|
|
| 6261 | 6073 |
public Multi_Undo_data Control_Style(CommentUserInfo control) |
| 6262 | 6074 |
{
|
| 6263 | 6075 |
multi_Undo_Data = new Multi_Undo_data(); |
내보내기 Unified diff
