/ - Diff - MARKUS - 일정관리

개정판 f1d6841f

ID	f1d6841fb34cf6d3a8f647610af21b31504c356d
상위	4a54bb3a
하위	52b1f175

백흠경이(가) 4달 전에 추가함

Fix: Cloud Control의 사이즈 변경 오류
- 새로 생성한 객체가 맨 앞으로 오도록 수정

Change-Id: I9fa0ef9a9edf9571318880e9cedf2373cb412102

KCOM/Controls/AdornerFinal.xaml.cs
26	26	{
27	27	public class MyThumb : Thumb
28	28	{
	29	public const int ZIndex = int.MaxValue;
	30
29	31	public MyThumb()
30	32	{
31	33	this.Opacity = 0.6;
...	...
229	231	ArrTextCtrl.Base_TextBox.Focusable = true;
230	232	}
231	233
232		///Canvas.SetZIndex(objectData, 84);
233	234	try
234	235	{
235	236	objectData.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(objectData);
...	...
248	249	public AdornerFinal(List<CommentUserInfo> comments) : this()
249	250	{
250	251	InitializeComponent();
251		//comments.ForEach(x => x.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(x));
252	252	RemoveMultipleFromCanvas(comments);
253	253	foreach (var item in comments)
254	254	{
...	...
258	258	}
259	259	try
260	260	{
	261	item.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(item);
261	262	ViewerDataModel.Instance.MarkupControls_USER.Remove(item);
262	263	this.ContainerContent.Children.Add(item);
263	264	}
...	...
270	271	}
271	272	}
272	273
273		this.SetAdornerMember(comments);
	274	this.SetAdornerMembers(comments);
274	275	this.Focus();
275	276	}
276	277
...	...
380	381
381	382	if (sender is TextBox TextBox)
382	383	{
383		if (TextBox.Text == "") //보류
	384	if (string.IsNullOrEmpty(TextBox.Text)) //보류
384	385	{
385	386	this.ContainerContent.Children.Remove((sender as TextBox).Parent as MarkupToPDF.Common.CommentUserInfo);
386	387	this.Visibility = Visibility.Collapsed;
...	...
402	403	BorderUpdate();
403	404	}
404	405
405
406		private void ViewBoxRotate(UIElement member)
407		{
408		AdornerBorder.RenderTransformOrigin = new Point(0.5, 0.5);
409		DragThumb.RenderTransformOrigin = new Point(0.5, 0.5);
410		AdornerBorder.RenderTransform = new RotateTransform() { Angle = (member as IViewBox).CommentAngle };
411		DragThumb.RenderTransform = new RotateTransform() { Angle = (member as IViewBox).CommentAngle };
412		}
413
414	406	/// <summary>
415	407	/// UIElement를 종류에 맞게 등록시킴
416	408	/// </summary>
...	...
524	516	Common.ViewerDataModel.Instance.MarkupControls_USER.Remove(member);
525	517	}
526	518
527
528		public void SetAdornerMember(List<CommentUserInfo> members)
	519	public void SetAdornerMembers(List<CommentUserInfo> members)
529	520	{
530	521	foreach (var member in members)
531	522	{
...	...
877	868	pts.Add(new Point((member as IPath).PathData.Bounds.Right, (member as IPath).PathData.Bounds.Top));
878	869	}
879	870	ControlType markT = this.Members.First(p => p.DrawingData == member).Drawingtype;
880		double Minx = pts.Min(x => x.X);
881		double Miny = pts.Min(x => x.Y);
882	871
883	872	for (int i = 0; i < pts.Count; i++)
884	873	{
...	...
887	876	Style = (Style)this.LayoutRoot.Resources["ThumbResizeStyle"],
888	877	};
889	878
890		this.Members.Last().ThumbList.Add(tm);
	879	this.Members[this.Members.Count - 1].ThumbList.Add(tm);
891	880
892	881	if ((markT == ControlType.ArcLine && pts[i] == (member as ArcControl).MidPoint) \|\| (markT == ControlType.ArcArrow && pts[i] == (member as ArrowArcControl).MiddlePoint))
893	882	{
...	...
1047	1036	Canvas.SetTop(tm, pts[count].Y);
1048	1037	if (member.GetType().Name == "ArrowTextControl" && pts[i] == (member as ArrowTextControl).MidPoint)
1049	1038	{
1050		Canvas.SetZIndex(tm, 95);
1051		//tm.Opacity = 0;
	1039	Canvas.SetZIndex(tm, MyThumb.ZIndex);
1052	1040	tm.DragDelta += MidPoint_DragDelta;
1053	1041	}
1054	1042	else
1055	1043	{
1056	1044	tm.DragDelta += ResizeTm_DragDelta;
1057		Canvas.SetZIndex(tm, 99);
	1045	Canvas.SetZIndex(tm, MyThumb.ZIndex);
1058	1046	}
1059	1047
1060	1048	tm.DragStarted += new DragStartedEventHandler(tm_DragStarted);
...	...
1269	1257	}
1270	1258	}
1271	1259
	1260	/// <summary>
	1261	/// 선택한 항목들 이동 시작
	1262	/// </summary>
	1263	/// <param name="sender"></param>
	1264	/// <param name="e"></param>
1272	1265	private void drag_DragStarted(object sender, DragStartedEventArgs e)
1273	1266	{
1274	1267	/// save mouse down and current mouse point
...	...
1287	1280	UndoCommand.Instance.Push(EventType.Operation, comments);
1288	1281	}
1289	1282
	1283	/// <summary>
	1284	/// 선택한 항목들 이동 종료
	1285	/// </summary>
	1286	/// <param name="sender"></param>
	1287	/// <param name="e"></param>
1290	1288	private void drag_DragCompleted(object sender, DragCompletedEventArgs e)
1291	1289	{
1292	1290	DragThumb.Cursor = new Cursor(App.DefaultArrowCursorStream);
...	...
1295	1293	select drawing.DrawingData as CommentUserInfo).ToList();
1296	1294	}
1297	1295
	1296	/// <summary>
	1297	/// 선택한 항목들 이동
	1298	/// </summary>
	1299	/// <param name="sender"></param>
	1300	/// <param name="e"></param>
1298	1301	private void DragThumb_DragDelta(object sender, DragDeltaEventArgs e)
1299	1302	{
1300	1303	double scale = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ContentScale;

             private double[] rotateValue = { 0, 90, 180, 270 };
             public System.Windows.Threading.DispatcherTimer SaveTimer { get; set; }
             public bool isClosed = true;
             public RadWindow CheckPop;
             public RadWindow OptionPop;
             /// <summary>
             /// TaskBar에 메시지를 입력합니다
-...
             /// 선택된 AdornerMember들을 리턴한다.
             /// </summary>
             /// <returns></returns>
             private List<AdornerMember> GetAdornerItems()
             public List<AdornerMember> GetAdornerItems()
+            {
                 List<AdornerMember> AdonerList = new List<AdornerMember>();
-...
                     CheckList check = new CheckList(this.ParentOfType<MainWindow>());
                     CheckPop = new RadWindow
                     var CheckPop = new RadWindow
+                    {
                         MinWidth = 1200,
                         MinHeight = 500,
-...
                 signManagerPop.ShowDialog();
+            }
             private void OptionPop_Closed(object sender, WindowClosedEventArgs e)
+            {
                 isClosed = true;
                 //this.ParentOfType<MainWindow>().dzMainMenu.PN_Navi.IsEnabled = true;
                 this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None;
                 ViewerDataModel.Instance.Capture_Opacity = 0;
+            }
             private void CheckPop_Closed(object sender, WindowClosedEventArgs e)
+            {
                 isClosed = true;

KCOM/Views/MainMenu.xaml.cs
145	145	private ListBox listBox = new ListBox();
146	146	private Dictionary<Geometry, string> selected_item = new Dictionary<Geometry, string>();
147	147	private bool isDraggingSelectionRect = false;
148		private DrawingAttributes inkDA = new DrawingAttributes();
149	148	private VPRevision CurrentRev { get; set; }
150	149	public RadRibbonButton btnConsolidate { get; set; }
151	150	public RadRibbonButton btnFinalPDF { get; set; }
...	...
1244	1243	}
1245	1244	}
1246	1245
	1246	/// <summary>
	1247	/// 객체 정렬을 위한 컨택스트 메뉴 생성
	1248	/// </summary>
1247	1249	private void InitContextMenu()
1248	1250	{
1249	1251	MenuItem menuBringForward = new MenuItem();
...	...
1260	1262
1261	1263	MenuItem menuSendToBackward = new MenuItem();
1262	1264	menuSendToBackward.Header = "Send To Backward";
1263		menuSendToBackward.Click += MenuSendToBackward_Click; ;
1264
	1265	menuSendToBackward.Click += MenuSendToBackward_Click;
1265	1266
1266	1267	ContextMenu cm = new ContextMenu();
1267	1268	cm.Items.Add(menuBringForward);
...	...
1494	1495	}
1495	1496	}
1496	1497
1497		private HitTestResultBehavior MyCallback(HitTestResult result)
1498		{
1499		//this.cursor = Cursors.UpArrow;
1500		var element = result.VisualHit;
1501		while (element != null && !(element is CommentUserInfo))
1502		element = VisualTreeHelper.GetParent(element);
1503
1504		if (element == null)
1505		{
1506		return HitTestResultBehavior.Stop;
1507		}
1508		else
1509		{
1510		if (element is CommentUserInfo)
1511		{
1512		if (!hitList.Contains(element))
1513		{
1514		hitList.Add((CommentUserInfo)element);
1515		}
1516		else
1517		{
1518		return HitTestResultBehavior.Stop;
1519		}
1520		}
1521		}
1522		return HitTestResultBehavior.Continue;
1523		}
1524
1525	1498	public void ReleaseSelectPath()
1526	1499	{
1527	1500	if (SelectionPath == null)
...	...
1832	1805	}
1833	1806
1834	1807	#region // 모든 컨트롤의 공통기능 제어
1835
1836	1808	if (controlType != ControlType.PenControl)
1837	1809	{
1838	1810	currentControl.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.IsAxisLock \|\| ViewerDataModel.Instance.IsPressShift);
1839	1811
1840
1841	1812	if (currentControl is MarkupToPDF.Controls.Polygon.PolygonControl && ((MarkupToPDF.Controls.Polygon.PolygonControl)currentControl).IsCompleted)
1842	1813	{
1843	1814	var vControl = currentControl as MarkupToPDF.Controls.Polygon.PolygonControl;
...	...
2327	2298
2328	2299	private List<CommentUserInfo> hitList = new List<CommentUserInfo>();
2329	2300
2330		private EllipseGeometry hitArea = new EllipseGeometry();
2331
2332	2301	private void zoomAndPanControl_MouseUp(object sender, MouseButtonEventArgs e)
2333	2302	{
2334	2303	IsDrawing = false;
...	...
2763	2732	// 저장전 textbox 입력 완료 때문에 public로 하여 savecommand에서 호출하도록 임시로 함.
2764	2733	public async void zoomAndPanControl_MouseDown(object sender, MouseButtonEventArgs e)
2765	2734	{
2766		var set_option = this.ParentOfType<MainWindow>().dzTopMenu.Parent.ChildrenOfType<RadNumericUpDown>().Where(item => item.IsKeyboardFocusWithin).FirstOrDefault();
	2735	var set_option = this.ParentOfType<MainWindow>().dzTopMenu.Parent.ChildrenOfType<RadNumericUpDown>().FirstOrDefault(item => item.IsKeyboardFocusWithin);
2767	2736	if (set_option != null && !string.IsNullOrEmpty(set_option.ContentText))
2768	2737	{
2769	2738	set_option.Value = double.Parse(set_option.ContentText);
2770		//set_option.Focusable = false;
2771	2739	zoomAndPanControl.Focus();
2772	2740	}
2773	2741
2774	2742	ConvertInkControlToPolygon();
2775	2743
2776	2744	// 텍스트가 없으면 삭제됨
2777		var text_item = ViewerDataModel.Instance.MarkupControls_USER.Where(data =>
2778		(data as TextControl) != null && (data as TextControl).Text == "" \|\| (data as ArrowTextControl) != null && (data as ArrowTextControl).ArrowText == "").FirstOrDefault();
	2745	var text_item = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data =>
	2746	(data is TextControl) && (data as TextControl).Text == "" \|\| (data is ArrowTextControl) && (data as ArrowTextControl).ArrowText == "");
2779	2747
2780		if (text_item != null && (currentControl as ArrowTextControl) == null)
	2748	if (text_item != null && !(currentControl is ArrowTextControl))
2781	2749	{
2782	2750	UndoCommand.Instance.Push(EventType.Delete, new[] { text_item });
2783	2751	}
2784
2785	2752	/// up to here
2786	2753
2787	2754	foreach (var item in ViewerDataModel.Instance.MarkupControls_USER)
...	...
2798	2765
2799	2766	//if (currentControl != null)
2800	2767	{
2801		var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data as TextControl) != null && (data as TextControl).IsEditingMode);
	2768	var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data is TextControl) && (data as TextControl).IsEditingMode);
2802	2769	if (text_item_ != null)
2803	2770	{
2804	2771	(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible;
...	...
2807	2774	currentControl = null;
2808	2775	}
2809	2776
2810		var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data as ArrowTextControl) != null && (data as ArrowTextControl).IsEditingMode);
	2777	var Arrowtext_item_ = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => (data is ArrowTextControl) && (data as ArrowTextControl).IsEditingMode);
2811	2778	if (Arrowtext_item_ != null && ((Arrowtext_item_ as ArrowTextControl).IsNew == false))
2812	2779	{
2813	2780	(Arrowtext_item_ as ArrowTextControl).IsEditingMode = false;
...	...
2826	2793	{
2827	2794	imgctrl.Focus();
2828	2795	}
2829		/*
2830		if (mouseHandlingMode == MouseHandlingMode.DragSymbol && e.LeftButton == MouseButtonState.Pressed)
2831		{
2832		canvasZoomPanningMouseDownPoint = e.GetPosition(zoomAndPanCanvas);
2833		if(symbol_id != null)
2834		{
2835		PlaceImageSymbol(symbol_id, symbol_group_id, symbol_SelectedIndex, canvasZoomPanningMouseDownPoint);
2836		}
2837		}
2838
2839		if (mouseHandlingMode == MouseHandlingMode.DragSymbol && e.RightButton == MouseButtonState.Pressed)
2840		{
2841		if (this._dragdropWindow != null)
2842		{
2843		this._dragdropWindow.Close();
2844		this._dragdropWindow = null;
2845		symbol_id = null;
2846		}
2847		}
2848		*/
2849	2796
2850	2797	if (e.LeftButton == MouseButtonState.Pressed)
2851	2798	{
...	...
2855	2802	this.cursor = new Cursor(App.DefaultArrowCursorStream);
2856	2803	SetCursor();
2857	2804
2858		if (!ViewerDataModel.Instance.IsPressCtrl)
	2805	/*if (!ViewerDataModel.Instance.IsPressCtrl)
2859	2806	{
2860	2807	SelectionSet.Instance.UnSelect(this);
2861	2808	}
	2809	*/
2862	2810	}
2863	2811
2864	2812	if (e.MiddleButton == MouseButtonState.Pressed)
...	...
2907	2855	}
2908	2856
2909	2857	bool isArrowTextEdit = false;
2910
2911	2858	if (currentControl is ArrowTextControl textControl)
2912	2859	{
2913	2860	if (textControl.IsEditingMode)
...	...
2946	2893	var control = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => data.IsMouseEnter);
2947	2894	if (control == null)
2948	2895	{
	2896	SelectionSet.Instance.UnSelect(this);
2949	2897	ViewerDataModel.Instance.SetAngleVisible(Visibility.Collapsed);
2950	2898	}
2951		else
	2899	else if(!SelectionSet.Instance.SelectedItems.Contains(control))
2952	2900	{
2953	2901	if (ControlTypeExtansions.LineTypes.Contains(control.ControlType))
2954	2902	{
...	...
3078	3026
3079	3027	if (selection != null)
3080	3028	{
	3029	Canvas.SetZIndex(selection, 100);
3081	3030	this.SelectLayer.Children.Add(selection);
3082	3031	}
3083	3032	}
...	...
3107	3056	Owner = Application.Current.MainWindow,
3108	3057	Theme = new VisualStudio2013Theme(),
3109	3058	Header = "Info",
3110		Content = "Select a layer and write a comment.",//"Existing comments already existed. Select from the user list first",
	3059	Content = "Select a layer and write a comment.",
3111	3060	});
3112	3061	return;
3113	3062	}
...	...
3128	3077	{
3129	3078	if (currentControl is CoordinateControl coord)
3130	3079	{
3131		if (IsGetoutpoint(coord.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3080	if (IsGetoutpoint(coord.PointSet.Find(data => IsRotationDrawingEnable(data))))
3132	3081	{
3133	3082	return;
3134	3083	}
...	...
3141	3090	else
3142	3091	{
3143	3092	this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null);
3144		if (ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber
3145		&& d.Data_Type == Convert.ToInt32(MarkupToPDF.Controls.Common.ControlType.Coordinate)).Any())
	3093	if (ViewerDataModel.Instance.MyMarkupList.Any(d => d.PageNumber == Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber
	3094	&& d.Data_Type == Convert.ToInt32(MarkupToPDF.Controls.Common.ControlType.Coordinate)))
3146	3095	{
3147	3096	currentControl = null;
3148	3097	this.cursor = Cursors.Arrow;
...	...
3155	3104	{
3156	3105	Background = new SolidColorBrush(Colors.Black),
3157	3106	StartPoint = this.CanvasDrawingMouseDownPoint,
3158		ControlType = ControlType.Coordinate
	3107	ControlType = ControlType.Coordinate,
	3108	ZIndex = CommentUserInfo.MaxZIndex
3159	3109	};
3160	3110
3161	3111	currentControl.CommentID = Commons.ShortGuid();
...	...
3176	3126	{
3177	3127	if (currentControl is InsideWhiteControl whitectrl)
3178	3128	{
3179		if (IsGetoutpoint(whitectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3129	if (IsGetoutpoint(whitectrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3180	3130	{
3181	3131	return;
3182	3132	}
...	...
3192	3142	{
3193	3143	Background = new SolidColorBrush(Colors.Black),
3194	3144	StartPoint = this.CanvasDrawingMouseDownPoint,
3195		ControlType = ControlType.InsideWhite
	3145	ControlType = ControlType.InsideWhite,
	3146	ZIndex = CommentUserInfo.MaxZIndex
3196	3147	};
3197	3148
3198	3149	currentControl.CommentID = Commons.ShortGuid();
...	...
3212	3163	{
3213	3164	if (currentControl is OverlapWhiteControl)
3214	3165	{
3215		if (IsGetoutpoint((currentControl as OverlapWhiteControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	3166	if (IsGetoutpoint((currentControl as OverlapWhiteControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
3216	3167	{
3217	3168	return;
3218	3169	}
...	...
3228	3179	{
3229	3180	Background = new SolidColorBrush(Colors.Black),
3230	3181	StartPoint = this.CanvasDrawingMouseDownPoint,
3231		ControlType = ControlType.OverlapWhite
	3182	ControlType = ControlType.OverlapWhite,
	3183	ZIndex = CommentUserInfo.MaxZIndex
3232	3184	};
3233	3185
3234	3186	currentControl.CommentID = Commons.ShortGuid();
...	...
3248	3200	{
3249	3201	if (currentControl is ClipWhiteControl)
3250	3202	{
3251		if (IsGetoutpoint((currentControl as ClipWhiteControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	3203	if (IsGetoutpoint((currentControl as ClipWhiteControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
3252	3204	{
3253	3205	return;
3254	3206	}
...	...
3264	3216	{
3265	3217	Background = new SolidColorBrush(Colors.Black),
3266	3218	StartPoint = this.CanvasDrawingMouseDownPoint,
3267		ControlType = ControlType.ClipWhite
	3219	ControlType = ControlType.ClipWhite,
	3220	ZIndex = CommentUserInfo.MaxZIndex
3268	3221	};
3269	3222
3270	3223	currentControl.CommentID = Commons.ShortGuid();
...	...
3285	3238	if (currentControl is RectangleControl rectctrl)
3286	3239	{
3287	3240	//20180906 LJY TEST IsRotationDrawingEnable
3288		if (IsGetoutpoint(rectctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3241	if (IsGetoutpoint(rectctrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3289	3242	{
3290	3243	return;
3291	3244	}
...	...
3300	3253	{
3301	3254	Background = new SolidColorBrush(Colors.Black),
3302	3255	StartPoint = this.CanvasDrawingMouseDownPoint,
3303		ControlType = ControlType.Rectangle
	3256	ControlType = ControlType.Rectangle,
	3257	ZIndex = CommentUserInfo.MaxZIndex
3304	3258	};
3305	3259
3306	3260	currentControl.CommentID = Commons.ShortGuid();
...	...
3321	3275	if (currentControl is RectCloudControl rectcloudctrl)
3322	3276	{
3323	3277	//20180906 LJY TEST IsRotationDrawingEnable
3324		if (IsGetoutpoint(rectcloudctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3278	if (IsGetoutpoint(rectcloudctrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3325	3279	{
3326	3280	return;
3327	3281	}
...	...
3338	3292	{
3339	3293	StartPoint = this.CanvasDrawingMouseDownPoint,
3340	3294	ControlType = ControlType.RectCloud,
3341		Background = new SolidColorBrush(Colors.Black)
	3295	Background = new SolidColorBrush(Colors.Black),
	3296	ZIndex = CommentUserInfo.MaxZIndex
3342	3297	};
3343	3298
3344	3299	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3358	3313	if (currentControl is CircleControl circlectrl)
3359	3314	{
3360	3315	//20180906 LJY TEST IsRotationDrawingEnable
3361		if (IsGetoutpoint(circlectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3316	if (IsGetoutpoint(circlectrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3362	3317	{
3363	3318	return;
3364	3319	}
...	...
3373	3328	{
3374	3329	StartPoint = this.CanvasDrawingMouseDownPoint,
3375	3330	LeftBottomPoint = this.CanvasDrawingMouseDownPoint,
3376		Background = new SolidColorBrush(Colors.Black)
	3331	Background = new SolidColorBrush(Colors.Black),
	3332	ZIndex = CommentUserInfo.MaxZIndex
3377	3333	};
3378	3334
3379	3335	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3399	3355	else
3400	3356	{
3401	3357	//20180906 LJY TEST IsRotationDrawingEnable
3402		if (IsGetoutpoint(trictrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3358	if (IsGetoutpoint(trictrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3403	3359	{
3404	3360	return;
3405	3361	}
...	...
3415	3371	{
3416	3372	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
3417	3373	Background = new SolidColorBrush(Colors.Black),
	3374	ZIndex = CommentUserInfo.MaxZIndex
3418	3375	};
3419	3376
3420	3377	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3437	3394	if (currentControl is LineControl linectrl)
3438	3395	{
3439	3396	//20180906 LJY TEST IsRotationDrawingEnable
3440		if (IsGetoutpoint(linectrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3397	if (IsGetoutpoint(linectrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3441	3398	{
3442	3399	return;
3443	3400	}
...	...
3452	3409	{
3453	3410	ControlType = this.controlType,
3454	3411	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
3455		Background = new SolidColorBrush(Colors.Black)
	3412	Background = new SolidColorBrush(Colors.Black),
	3413	ZIndex = CommentUserInfo.MaxZIndex
3456	3414	};
3457	3415
3458	3416	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3481	3439	else
3482	3440	{
3483	3441	//20180906 LJY TEST IsRotationDrawingEnable
3484		if (IsGetoutpoint(polygonctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3442	if (IsGetoutpoint(polygonctrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3485	3443	{
3486	3444	return;
3487	3445	}
...	...
3505	3463	currentControl = new PolygonControl
3506	3464	{
3507	3465	PointSet = new List<Point>(),
	3466	ZIndex = CommentUserInfo.MaxZIndex
3508	3467	};
3509	3468
3510	3469	var polygonControl = (currentControl as PolygonControl);
...	...
3532	3491	if (e.RightButton == MouseButtonState.Pressed)
3533	3492	{
3534	3493	//20180906 LJY TEST IsRotationDrawingEnable
3535		if (IsGetoutpoint((currentControl as PolygonControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	3494	if (IsGetoutpoint((currentControl as PolygonControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
3536	3495	{
3537	3496	return;
3538	3497	}
...	...
3562	3521	ControlType = ControlType.ChainLine,
3563	3522	DashSize = ViewerDataModel.Instance.DashSize,
3564	3523	LineSize = ViewerDataModel.Instance.LineSize,
3565		//PointC = new StylusPointSet()
	3524	ZIndex = CommentUserInfo.MaxZIndex
3566	3525	};
3567	3526
3568		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
3569		//{
3570	3527	var polygonControl = (currentControl as PolygonControl);
3571	3528	currentControl.CommentID = Commons.ShortGuid();
3572	3529	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3578	3535	polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint);
3579	3536	polygonControl.PointSet.Add(CanvasDrawingMouseDownPoint);
3580	3537	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
3581		//}
3582	3538	}
3583	3539	}
3584	3540	}
...	...
3590	3546	if (currentControl is ArcControl arcctrl)
3591	3547	{
3592	3548	//20180906 LJY TEST IsRotationDrawingEnable
3593		if (IsGetoutpoint(arcctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3549	if (IsGetoutpoint(arcctrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3594	3550	{
3595	3551	return;
3596	3552	}
...	...
3605	3561	currentControl = new ArcControl
3606	3562	{
3607	3563	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
3608		Background = new SolidColorBrush(Colors.Black)
	3564	Background = new SolidColorBrush(Colors.Black),
	3565	ZIndex = CommentUserInfo.MaxZIndex
3609	3566	};
3610	3567	currentControl.CommentID = Commons.ShortGuid();
3611	3568	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3629	3586	{
3630	3587	if (e.LeftButton == MouseButtonState.Pressed)
3631	3588	{
3632		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
3633		//{
3634	3589	if (currentControl is ArrowArcControl arrowarcctrl)
3635	3590	{
3636	3591	//20180906 LJY TEST IsRotationDrawingEnable
3637		if (IsGetoutpoint(arrowarcctrl.PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3592	if (IsGetoutpoint(arrowarcctrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
3638	3593	{
3639	3594	return;
3640	3595	}
...	...
3649	3604	currentControl = new ArrowArcControl
3650	3605	{
3651	3606	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
3652		Background = new SolidColorBrush(Colors.Black)
	3607	Background = new SolidColorBrush(Colors.Black),
	3608	ZIndex = CommentUserInfo.MaxZIndex
3653	3609	};
3654	3610	currentControl.CommentID = Commons.ShortGuid();
3655	3611	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3658	3614	ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3659	3615	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
3660	3616	}
3661		//}
3662	3617	}
3663	3618	else if (e.RightButton == MouseButtonState.Pressed)
3664	3619	{
...	...
3666	3621	{
3667	3622	(currentControl as ArrowArcControl).setClock();
3668	3623	(currentControl as ArrowArcControl).MiddlePoint = new Point(0, 0);
3669		//(currentControl as ArcControl).ApplyTemplate();
3670	3624	}
3671	3625	}
3672	3626	}
...	...
3675	3629	{
3676	3630	if (e.LeftButton == MouseButtonState.Pressed)
3677	3631	{
3678		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
3679		//{
3680	3632	if (currentControl is ArrowControl_Multi)
3681	3633	{
3682	3634	var content = currentControl as ArrowControl_Multi;
...	...
3694	3646	else
3695	3647	{
3696	3648	//20180906 LJY TEST IsRotationDrawingEnable
3697		if (IsGetoutpoint((currentControl as ArrowControl_Multi).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	3649	if (IsGetoutpoint((currentControl as ArrowControl_Multi).PointSet.Find(data => IsRotationDrawingEnable(data))))
3698	3650	{
3699	3651	return;
3700	3652	}
...	...
3710	3662	currentControl = new ArrowControl_Multi
3711	3663	{
3712	3664	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
3713		Background = new SolidColorBrush(Colors.Black)
	3665	Background = new SolidColorBrush(Colors.Black),
	3666	ZIndex = CommentUserInfo.MaxZIndex
3714	3667	};
3715	3668	currentControl.CommentID = Commons.ShortGuid();
3716	3669	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3719	3672	ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
3720	3673	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
3721	3674	}
3722		//}
3723	3675	}
3724	3676	}
3725	3677	break;
...	...
3740	3692	else
3741	3693	{
3742	3694	//20180906 LJY TEST IsRotationDrawingEnable
3743		if (IsGetoutpoint((currentControl as CloudControl).PointSet.FirstOrDefault(data => IsRotationDrawingEnable(data) == true)))
	3695	if (IsGetoutpoint((currentControl as CloudControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
3744	3696	{
3745	3697	return;
3746	3698	}
...	...
3764	3716	currentControl = new CloudControl
3765	3717	{
3766	3718	PointSet = new List<Point>(),
3767		PointC = new StylusPointSet()
	3719	PointC = new StylusPointSet(),
	3720	ZIndex = CommentUserInfo.MaxZIndex
3768	3721	};
3769	3722
3770	3723	var polygonControl = (currentControl as CloudControl);
...	...
3828	3781	EndPoint = new Point(CanvasDrawingMouseDownPoint.X + 100, CanvasDrawingMouseDownPoint.Y + 100),
3829	3782	TopRightPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y + 100),
3830	3783	LeftBottomPoint = new Point(CanvasDrawingMouseDownPoint.X + 100, CanvasDrawingMouseDownPoint.Y),
3831		ControlType = ControlType.ImgControl
	3784	ControlType = ControlType.ImgControl,
	3785	ZIndex = CommentUserInfo.MaxZIndex
3832	3786	};
3833	3787
3834	3788	currentControl.CommentID = Commons.ShortGuid();
...	...
3849	3803	{
3850	3804	if (e.LeftButton == MouseButtonState.Pressed)
3851	3805	{
3852		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
3853		//{
3854	3806	if (currentControl is DateControl)
3855	3807	{
3856	3808	//20180906 LJY TEST IsRotationDrawingEnable
3857		if (IsGetoutpoint((currentControl as DateControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	3809	if (IsGetoutpoint((currentControl as DateControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
3858	3810	{
3859	3811	return;
3860	3812	}
...	...
3878	3830	currentControl = new DateControl
3879	3831	{
3880	3832	StartPoint = CanvasDrawingMouseDownPoint,
3881		Background = new SolidColorBrush(Colors.Black)
	3833	Background = new SolidColorBrush(Colors.Black),
	3834	ZIndex = CommentUserInfo.MaxZIndex
3882	3835	};
3883	3836	currentControl.CommentID = Commons.ShortGuid();
3884	3837	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
3892	3845	}
3893	3846	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
3894	3847	}
3895		//}
3896	3848	}
3897	3849	}
3898	3850	break;
...	...
3905	3857	{
3906	3858	currentControl = new TextControl
3907	3859	{
3908		ControlType = controlType
	3860	ControlType = controlType,
	3861	ZIndex = CommentUserInfo.MaxZIndex
3909	3862	};
3910	3863
3911	3864	currentControl.CommentID = Commons.ShortGuid();
...	...
3957	3910	{
3958	3911	currentControl = new TextControl
3959	3912	{
3960		ControlType = controlType
	3913	ControlType = controlType,
	3914	ZIndex = CommentUserInfo.MaxZIndex
3961	3915	};
3962	3916
3963	3917	(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize;
...	...
4009	3963	{
4010	3964	currentControl = new TextControl
4011	3965	{
4012		ControlType = controlType
	3966	ControlType = controlType,
	3967	ZIndex = CommentUserInfo.MaxZIndex
4013	3968	};
4014	3969
4015	3970	(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize;
...	...
4051	4006	CreateCommand.Instance.Execute(currentControl);
4052	4007	if (previousControl == null)
4053	4008	previousControl = currentControl;
4054
4055		//currentControl = null;
4056	4009	}
4057	4010	}
4058	4011	}
...	...
4065	4018	if (currentControl is ArrowTextControl)
4066	4019	{
4067	4020	//20180906 LJY TEST IsRotationDrawingEnable
4068		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4021	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4069	4022	{
4070	4023	return;
4071	4024	}
...	...
4091	4044	}
4092	4045	else
4093	4046	{
4094		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4095		//{
4096	4047	currentControl = new ArrowTextControl()
4097	4048	{
4098		PageAngle = ViewerDataModel.Instance.PageAngle
	4049	PageAngle = ViewerDataModel.Instance.PageAngle,
	4050	ZIndex = CommentUserInfo.MaxZIndex
4099	4051	};
4100	4052
4101	4053	currentControl.CommentID = Commons.ShortGuid();
...	...
4124	4076	(currentControl as ArrowTextControl).Base_TextBox.Focus();
4125	4077	(currentControl as ArrowTextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily);
4126	4078	ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
4127
4128		//}
4129	4079	}
4130	4080	}
4131	4081	}
...	...
4138	4088	if (currentControl is ArrowTextControl)
4139	4089	{
4140	4090	//20180906 LJY TEST IsRotationDrawingEnable
4141		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4091	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4142	4092	{
4143	4093	return;
4144	4094	}
...	...
4153	4103	}
4154	4104	else
4155	4105	{
4156		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4157		//{
4158	4106	currentControl = new ArrowTextControl()
4159	4107	{
4160	4108	ControlType = ControlType.ArrowTransTextControl,
4161		PageAngle = ViewerDataModel.Instance.PageAngle
	4109	PageAngle = ViewerDataModel.Instance.PageAngle,
	4110	ZIndex = CommentUserInfo.MaxZIndex
4162	4111	};
4163	4112	currentControl.CommentID = Commons.ShortGuid();
4164	4113	currentControl.IsNew = true;
...	...
4190	4139	if (currentControl is ArrowTextControl)
4191	4140	{
4192	4141	//20180906 LJY TEST IsRotationDrawingEnable
4193		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4142	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4194	4143	{
4195	4144	return;
4196	4145	}
...	...
4203	4152	}
4204	4153	else
4205	4154	{
4206		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4207		//{
4208	4155	currentControl = new ArrowTextControl()
4209	4156	{
4210	4157	ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect,
4211		PageAngle = ViewerDataModel.Instance.PageAngle
	4158	PageAngle = ViewerDataModel.Instance.PageAngle,
	4159	ZIndex = CommentUserInfo.MaxZIndex
4212	4160	};
4213	4161	currentControl.CommentID = Commons.ShortGuid();
4214	4162	currentControl.IsNew = true;
...	...
4241	4189	if (currentControl is ArrowTextControl)
4242	4190	{
4243	4191	//20180906 LJY TEST IsRotationDrawingEnable
4244		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4192	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4245	4193	{
4246	4194	return;
4247	4195	}
...	...
4254	4202	}
4255	4203	else
4256	4204	{
4257		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4258		//{
4259	4205	currentControl = new ArrowTextControl()
4260	4206	{
4261	4207	ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect,
4262	4208	ControlType = ControlType.ArrowTransTextBorderControl,
4263		PageAngle = ViewerDataModel.Instance.PageAngle
	4209	PageAngle = ViewerDataModel.Instance.PageAngle,
	4210	ZIndex = CommentUserInfo.MaxZIndex
4264	4211	};
4265	4212
4266	4213	currentControl.CommentID = Commons.ShortGuid();
...	...
4285	4232
4286	4233	//20180911 LJY
4287	4234	(currentControl as ArrowTextControl).isTrans = true;
4288
4289		//}
4290	4235	}
4291	4236	}
4292	4237	}
...	...
4299	4244	if (currentControl is ArrowTextControl)
4300	4245	{
4301	4246	//20180906 LJY TEST IsRotationDrawingEnable
4302		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4247	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4303	4248	{
4304	4249	return;
4305	4250	}
...	...
4311	4256	}
4312	4257	else
4313	4258	{
4314		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4315		//{
4316	4259	currentControl = new ArrowTextControl()
4317	4260	{
4318	4261	ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud,
4319	4262	PageAngle = ViewerDataModel.Instance.PageAngle,
4320		ControlType = ControlType.ArrowTextCloudControl
	4263	ControlType = ControlType.ArrowTextCloudControl,
	4264	ZIndex = CommentUserInfo.MaxZIndex
4321	4265	};
4322	4266	currentControl.CommentID = Commons.ShortGuid();
4323	4267	currentControl.IsNew = true;
...	...
4336	4280	(currentControl as ArrowTextControl).ApplyTemplate();
4337	4281	(currentControl as ArrowTextControl).Base_TextBox.Focus();
4338	4282	ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible);
4339		//}
4340	4283	}
4341	4284	}
4342	4285	}
...	...
4349	4292	if (currentControl is ArrowTextControl)
4350	4293	{
4351	4294	//20180906 LJY TEST IsRotationDrawingEnable
4352		if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4295	if (IsGetoutpoint((currentControl as ArrowTextControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4353	4296	{
4354	4297	return;
4355	4298	}
...	...
4361	4304	}
4362	4305	else
4363	4306	{
4364		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4365		//{
4366	4307	currentControl = new ArrowTextControl()
4367	4308	{
4368	4309	ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud,
4369	4310	ControlType = ControlType.ArrowTransTextCloudControl,
4370		PageAngle = ViewerDataModel.Instance.PageAngle
	4311	PageAngle = ViewerDataModel.Instance.PageAngle,
	4312	ZIndex = CommentUserInfo.MaxZIndex
4371	4313	};
4372	4314	currentControl.CommentID = Commons.ShortGuid();
4373	4315	currentControl.IsNew = true;
...	...
4391	4333
4392	4334	//20180911 LJY
4393	4335	(currentControl as ArrowTextControl).isTrans = true;
4394		//}
4395	4336	}
4396	4337	}
4397	4338	}
...	...
4401	4342	{
4402	4343	if (e.LeftButton == MouseButtonState.Pressed)
4403	4344	{
4404		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4405		//{
4406	4345	var _sign = await BaseTaskClient.GetSignDataAsync(App.ViewInfo.ProjectNO, App.ViewInfo.UserID);
4407
4408	4346	if (_sign == null)
4409	4347	{
4410	4348	txtBatch.Visibility = Visibility.Collapsed;
...	...
4412	4350	controlType = ControlType.None;
4413	4351
4414	4352	this.ParentOfType<MainWindow>().DialogMessage_Alert("등록된 Sign이 없습니다.", "Alert");
4415		this.ParentOfType<MainWindow>().ChildrenOfType<RadToggleButton>().Where(data => data.IsChecked == true).FirstOrDefault().IsChecked = false;
	4353	this.ParentOfType<MainWindow>().ChildrenOfType<RadToggleButton>().FirstOrDefault(data => data.IsChecked == true).IsChecked = false;
4416	4354	return;
4417	4355	}
4418	4356	else
4419	4357	{
4420		if (Application.Current.Resources.Keys.OfType<string>().Count(x => x == "UserSign") == 0)
	4358	if (!Application.Current.Resources.Keys.OfType<string>().Any(x => x == "UserSign"))
4421	4359	{
4422	4360	Application.Current.Resources.Add("UserSign", _sign);
4423	4361	}
...	...
4430	4368	if (currentControl is SignControl)
4431	4369	{
4432	4370	//20180906 LJY TEST IsRotationDrawingEnable
4433		if (IsGetoutpoint((currentControl as SignControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4371	if (IsGetoutpoint((currentControl as SignControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
4434	4372	{
4435	4373	return;
4436	4374	}
...	...
4452	4390	ProjectNO = App.ViewInfo.ProjectNO,
4453	4391	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
4454	4392	EndPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
4455		ControlType = ControlType.Sign
	4393	ControlType = ControlType.Sign,
	4394	ZIndex = CommentUserInfo.MaxZIndex
4456	4395	};
4457	4396
4458	4397	currentControl.CommentID = Commons.ShortGuid();
...	...
4464	4403	(currentControl as SignControl).CommentAngle -= rotate.Angle;
4465	4404	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
4466	4405	}
4467		//}
4468	4406	}
4469	4407	}
4470	4408	break;
...	...
4473	4411	{
4474	4412	if (e.LeftButton == MouseButtonState.Pressed)
4475	4413	{
4476		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4477		//{
4478		if (currentControl is RectangleControl)
	4414	if (currentControl is RectangleControl RectCtrl)
4479	4415	{
4480	4416	//20180906 LJY TEST IsRotationDrawingEnable
4481		if (IsGetoutpoint((currentControl as RectangleControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4417	if (IsGetoutpoint(RectCtrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
4482	4418	{
4483	4419	return;
4484	4420	}
...	...
4502	4438	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
4503	4439	Background = new SolidColorBrush(Colors.Black),
4504	4440	ControlType = ControlType.Mark,
4505		Paint = PaintSet.Fill
	4441	Paint = PaintSet.Fill,
	4442	ZIndex = CommentUserInfo.MaxZIndex
4506	4443	};
4507	4444
4508	4445	currentControl.MarkupInfoID = App.Custom_ViewInfoId;
...	...
4512	4449	ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
4513	4450	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
4514	4451	}
4515		//}
4516	4452	}
4517	4453	}
4518	4454	break;
...	...
4521	4457	{
4522	4458	if (e.LeftButton == MouseButtonState.Pressed)
4523	4459	{
4524		if (currentControl is SymControl)
	4460	if (currentControl is SymControl SymCtrl)
4525	4461	{
4526	4462	//20180906 LJY TEST IsRotationDrawingEnable
4527		if (IsGetoutpoint((currentControl as SymControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4463	if (IsGetoutpoint(SymCtrl.PointSet.Find(data => IsRotationDrawingEnable(data))))
4528	4464	{
4529	4465	return;
4530	4466	}
...	...
4540	4476	StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y),
4541	4477	Background = new SolidColorBrush(Colors.Black),
4542	4478	LineSize = ViewerDataModel.Instance.LineSize + 3,
4543		ControlType = ControlType.Symbol
	4479	ControlType = ControlType.Symbol,
	4480	ZIndex = CommentUserInfo.MaxZIndex
4544	4481	};
4545	4482
4546	4483	currentControl.IsNew = true;
...	...
4552	4489	(currentControl as SymControl).CommentAngle -= rotate.Angle;
4553	4490	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
4554	4491	}
4555		//}
4556	4492	}
4557	4493	}
4558	4494	break;
...	...
4561	4497	{
4562	4498	if (e.LeftButton == MouseButtonState.Pressed)
4563	4499	{
4564		//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
4565		//{
4566	4500	if (currentControl is SymControlN)
4567	4501	{
4568	4502	//20180906 LJY TEST IsRotationDrawingEnable
4569		if (IsGetoutpoint((currentControl as SymControlN).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
	4503	if (IsGetoutpoint((currentControl as SymControlN).PointSet.Find(data => IsRotationDrawingEnable(data))))
4570	4504	{
4571	4505	return;
4572	4506	}
...	...
4584	4518	Background = new SolidColorBrush(Colors.Black),
4585	4519	STAMP = App.SystemInfo.STAMP,
4586	4520	STAMP_Contents = App.SystemInfo.STAMP_CONTENTS,
4587		ControlType = ControlType.Stamp
	4521	ControlType = ControlType.Stamp,
	4522	ZIndex = CommentUserInfo.MaxZIndex
4588	4523	};
4589	4524
4590	4525	currentControl.IsNew = true;
...	...
4595	4530	(currentControl as SymControlN).CommentAngle -= rotate.Angle;
4596	4531	currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex);
4597	4532	}
4598		//}
4599	4533	}
4600	4534	}
4601	4535	break;
...	...
4632	4566	if (currentControl is ITextControl)
4633	4567	{
4634	4568	var textBox = currentControl.ChildrenOfType<TextBox>().Where(x => x.Name == "PART_ArrowTextBox" \|\| x.Name == "Base_TextBox" \|\| x.Name == "PART_TextBox");
4635
4636		if (textBox.Count() > 0)
	4569	if (textBox.Any())
4637	4570	{
4638	4571	Behaviors.SpecialcharRemove specialcharRemove = new Behaviors.SpecialcharRemove();
4639	4572	specialcharRemove.Attach(textBox.First());
4640	4573	}
4641	4574	else
4642	4575	{
4643
4644	4576	}
4645
4646	4577	}
4647	4578	}
4648	4579	catch (Exception ex)
...	...
4651	4582
4652	4583	}
4653	4584
4654		if (currentControl is ArrowTextControl)
	4585	if (currentControl is ArrowTextControl ArrowTextCtrl)
4655	4586	{
4656		(currentControl as ArrowTextControl).EditEnded += (snd, evt) =>
	4587	ArrowTextCtrl.EditEnded += (snd, evt) =>
4657	4588	{
4658	4589	var control = snd as ArrowTextControl;
4659	4590
...	...
4662	4593	UndoCommand.Instance.Push(EventType.Delete, new[] { control });
4663	4594	}
4664	4595	};
4665
4666	4596	}
4667	4597
4668	4598	if (Common.ViewerDataModel.Instance.IsMacroCommand)
...	...
4675	4605	//txtBatch.Text = "Draw a TextBox";
4676	4606	//controlType = ControlType.ArrowTextBorderControl;
4677	4607	}
4678
4679		//if (currentControl != null)
4680		//{
4681		// currentControl.PageAngle = pageNavigator.CurrentPage.Angle;
4682		//}
4683	4608	}
	4609
4684	4610	if (mouseHandlingMode != MouseHandlingMode.None && e.LeftButton == MouseButtonState.Pressed)
4685	4611	{
4686	4612	// MACRO 버튼클릭하여 CLOUD RECT 그린 후
4687
4688
4689	4613	if (mouseHandlingMode == MouseHandlingMode.Adorner && SelectLayer.Children.Count > 0)
4690	4614	{
4691	4615	bool mouseOff = false;
...	...
4693	4617	{
4694	4618	if (item is AdornerFinal)
4695	4619	{
4696		var over = (item as AdornerFinal).Members.Where(data => data.DrawingData.IsMouseOver).FirstOrDefault();
	4620	var over = (item as AdornerFinal).Members.Find(data => data.DrawingData.IsMouseOver);
4697	4621	if (over != null)
4698	4622	{
4699	4623	mouseOff = true;
...	...
4710	4634	zoomAndPanControl.CaptureMouse();
4711	4635	e.Handled = true;
4712	4636	}
4713
4714	4637	}
4715	4638
4716
4717
4718
4719
	4639	/// <summary>
	4640	/// 뒤로 보내기
	4641	/// </summary>
	4642	/// <param name="sender"></param>
	4643	/// <param name="e"></param>
4720	4644	private void MenuSendBackward_Click(object sender, RoutedEventArgs e)
4721	4645	{
4722	4646	foreach (var item in SelectionSet.Instance.SelectedItems)
...	...
4725	4649	{
4726	4650	item.ZIndex--;
4727	4651	Canvas.SetZIndex(item, item.ZIndex);
4728		item.UpdateControl();
4729	4652	}
	4653	else
	4654	{
	4655	item.Index = 0;
	4656	}
	4657
	4658	item.UpdateControl();
4730	4659	}
4731	4660	ViewerDataModel.Instance.IsMarkupUpdate = true;
4732	4661	}
4733	4662
	4663	/// <summary>
	4664	/// 맨뒤로 보내기
	4665	/// </summary>
	4666	/// <param name="sender"></param>
	4667	/// <param name="e"></param>
4734	4668	private void MenuSendToBackward_Click(object sender, RoutedEventArgs e)
4735	4669	{
4736	4670	foreach (var item in SelectionSet.Instance.SelectedItems)
4737	4671	{
4738	4672	item.ZIndex = 0;
	4673	item.Index = 0;
4739	4674	Canvas.SetZIndex(item, item.ZIndex);
4740	4675	item.UpdateControl();
4741	4676	}
4742	4677	ViewerDataModel.Instance.IsMarkupUpdate = true;
4743	4678	}
4744	4679
	4680	/// <summary>
	4681	/// 앞으로 보내기
	4682	/// </summary>
	4683	/// <param name="sender"></param>
	4684	/// <param name="e"></param>
4745	4685	private void MenuBringForward_Click(object sender, RoutedEventArgs e)
4746	4686	{
4747	4687	foreach (var item in SelectionSet.Instance.SelectedItems)
4748	4688	{
4749		if (item.ZIndex < 100)
	4689	if (item.ZIndex < 99)
4750	4690	{
4751	4691	item.ZIndex++;
4752	4692	Canvas.SetZIndex(item, item.ZIndex);
4753		item.UpdateControl();
4754	4693	}
	4694	else
	4695	{
	4696	item.Index = -1;
	4697	}
	4698
	4699	item.UpdateControl();
4755	4700	}
4756	4701	ViewerDataModel.Instance.IsMarkupUpdate = true;
4757	4702	}
	4703
	4704	/// <summary>
	4705	/// 맨 앞으로 보내기
	4706	/// </summary>
	4707	/// <param name="sender"></param>
	4708	/// <param name="e"></param>
4758	4709	private void MenuBringToForward_Click(object sender, RoutedEventArgs e)
4759	4710	{
4760	4711	foreach (var item in SelectionSet.Instance.SelectedItems)
4761	4712	{
4762	4713	item.ZIndex = 99;
	4714	item.Index = -1;
4763	4715	Canvas.SetZIndex(item, item.ZIndex);
4764	4716	item.UpdateControl();
4765	4717	}

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 f1d6841f