/ - Diff - MARKUS - 일정관리

개정판 b68ac323

ID	b68ac323b3f8450c15202c3c48184bfb4b36ba8e
상위	f3c08420
하위	55b1b884, f8831a01

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

버전 변경

Change-Id: I0d0d891f9f73629f041729aa7d0b8ce7cb858601

CompareLib/CompareLib.csproj
95	95	<Content Include="OpenCvSharpExtern.dll">
96	96	<CopyToOutputDirectory>Always</CopyToOutputDirectory>
97	97	</Content>
	98	<Content Include="테스트.txt" />
98	99	</ItemGroup>
99	100	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100	101	<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

     - ????? ???
     eyJEb2N1bWVudEl0ZW1JRCI6IjE0MyIsImJQYXJ0bmVyIjpmYWxzZSwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoidHJ1ZSIsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjoidHJ1ZSIsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MH0=/
     - BIDDERS ???
     eyJEb2N1bWVudEl0ZW1JRCI6MTc4LCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MCwicElkIjoiUDAwMDAwMDAwMDE4IiwidUlkIjoiVTAwMDAwMDAwMDA0In0=/
     Telerik.Windows.Controls
     Telerik.Windows.Controls.Data
     Telerik.Windows.Controls.Docking
     Telerik.Windows.Controls.GridView
     Telerik.Windows.Controls.Input
     Telerik.Windows.Controls.Navigation
     Telerik.Windows.Controls.RibbonView
     Telerik.Windows.Data

KCOM/Properties/AssemblyInfo.cs
51	51	// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52	52	// 지정되도록 할 수 있습니다.
53	53	// [assembly: AssemblyVersion("1.0.*")]
54		[assembly: AssemblyVersion("2.1.0.000")]
55		[assembly: AssemblyFileVersion("2.1.0.000")]
	54	[assembly: AssemblyVersion("2.1.0.100")]
	55	[assembly: AssemblyFileVersion("2.1.0.100")]

KCOM/UpdateWindow.xaml.cs
37	37	string smartupdaterpath = string.Empty;
38	38	smartupdaterpath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SmartUpdate.exe");
39	39	Process.Start(smartupdaterpath, updateurl);
	40	this.Close();
40	41	}
41	42
42	43	private void btUpdate_Click(object sender, RoutedEventArgs e)
...	...
54	55
55	56	private void btCancel_Click(object sender, RoutedEventArgs e)
56	57	{
57		this.DialogResult = false;
	58	this.Close();
58	59	}
59	60	}
60	61	}

KCOM/Views/MainMenu.xaml.cs
1280	1280	(currentControl as CloudControl).ArcLength = ViewerDataModel.Instance.ArcLength;
1281	1281	}
1282	1282
	1283
	1284	#region // 모든 컨트롤의 공통기능 제어
	1285	if(controlType != ControlType.PenControl)
	1286	{
	1287	currentControl.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1288	}
	1289
	1290
	1291	#endregion
	1292
	1293	#region // 각 컨트롤의 특별한 기능을 제어한다.
	1294
1283	1295	switch (controlType)
1284	1296	{
1285	1297	case (ControlType.Coordinate):
...	...
1287	1299	var control = currentControl as CoordinateControl;
1288	1300	if (control != null)
1289	1301	{
1290		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1302	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1291	1303	control.DashSize = ViewerDataModel.Instance.DashSize;
1292	1304	control.Paint = ViewerDataModel.Instance.paintSet;
1293	1305	}
...	...
1298	1310	var control = currentControl as InsideWhiteControl;
1299	1311	if (control != null)
1300	1312	{
1301		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1313	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1302	1314	control.DashSize = ViewerDataModel.Instance.DashSize;
1303	1315	control.Paint = ViewerDataModel.Instance.paintSet;
1304	1316	control.Paint = PaintSet.Fill;
...	...
1310	1322	var control = currentControl as OverlapWhiteControl;
1311	1323	if (control != null)
1312	1324	{
1313		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1325	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1314	1326	control.DashSize = ViewerDataModel.Instance.DashSize;
1315	1327	control.Paint = ViewerDataModel.Instance.paintSet;
1316	1328	control.Paint = PaintSet.Fill;
...	...
1322	1334	var control = currentControl as ClipWhiteControl;
1323	1335	if (control != null)
1324	1336	{
1325		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1337	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1326	1338	control.DashSize = ViewerDataModel.Instance.DashSize;
1327	1339	control.Paint = ViewerDataModel.Instance.paintSet;
1328	1340	control.Paint = PaintSet.Fill;
...	...
1334	1346	var control = currentControl as RectCloudControl;
1335	1347	if (control != null)
1336	1348	{
1337		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1349	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1338	1350	control.DashSize = ViewerDataModel.Instance.DashSize;
1339	1351	control.Paint = ViewerDataModel.Instance.paintSet;
1340	1352	}
...	...
1349	1361	var control = currentControl as LineControl;
1350	1362	if (control != null)
1351	1363	{
1352		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1364	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1353	1365	control.DashSize = ViewerDataModel.Instance.DashSize;
1354	1366	}
1355	1367
...	...
1361	1373	var control = currentControl as ArcControl;
1362	1374	if (control != null)
1363	1375	{
1364		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1376	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1365	1377	control.DashSize = ViewerDataModel.Instance.DashSize;
1366	1378	}
1367	1379	}
...	...
1372	1384	var control = currentControl as ArrowArcControl;
1373	1385	if (control != null)
1374	1386	{
1375		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1387	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1376	1388	control.DashSize = ViewerDataModel.Instance.DashSize;
1377	1389	}
1378	1390	}
...	...
1383	1395	var control = currentControl as ArrowControl_Multi;
1384	1396	if (control != null)
1385	1397	{
1386		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1398	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1387	1399	control.DashSize = ViewerDataModel.Instance.DashSize;
1388	1400	}
1389	1401	}
...	...
1391	1403
1392	1404	case ControlType.Circle:
1393	1405	{
1394		if (currentControl != null)
	1406	var control = currentControl as CircleControl;
	1407
	1408	if (control != null)
1395	1409	{
1396		currentControl.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1397		(currentControl as CircleControl).DashSize = ViewerDataModel.Instance.DashSize;
1398		(currentControl as CircleControl).Paint = ViewerDataModel.Instance.paintSet;
	1410	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1411	control.DashSize = ViewerDataModel.Instance.DashSize;
	1412	control.Paint = ViewerDataModel.Instance.paintSet;
1399	1413	}
1400	1414	}
1401	1415	break;
...	...
1405	1419	var control = currentControl as CloudControl;
1406	1420	if (control != null)
1407	1421	{
1408		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1422	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1409	1423	control.DashSize = ViewerDataModel.Instance.DashSize;
1410	1424	control.Paint = ViewerDataModel.Instance.paintSet;
1411	1425	}
...	...
1417	1431	var control = currentControl as TriControl;
1418	1432	if (control != null)
1419	1433	{
1420		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1434	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1421	1435	control.DashSize = ViewerDataModel.Instance.DashSize;
1422	1436	control.Paint = ViewerDataModel.Instance.paintSet;
1423	1437	}
...	...
1429	1443	var control = currentControl as ImgControl;
1430	1444	if (control != null)
1431	1445	{
1432		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1446	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1433	1447	}
1434	1448	}
1435	1449	break;
...	...
1439	1453	var control = currentControl as DateControl;
1440	1454	if (control != null)
1441	1455	{
1442		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1456	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1443	1457	}
1444	1458	}
1445	1459	break;
...	...
1454	1468	var control = currentControl as ArrowTextControl;
1455	1469	if (control != null)
1456	1470	{
1457		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1471	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1458	1472	}
1459	1473	}
1460	1474	break;
...	...
1464	1478	var control = currentControl as PolygonControl;
1465	1479	if (control != null)
1466	1480	{
1467		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1481	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1468	1482	control.DashSize = ViewerDataModel.Instance.DashSize;
1469	1483	control.Paint = ViewerDataModel.Instance.paintSet;
1470	1484	}
...	...
1475	1489	var control = currentControl as SignControl;
1476	1490	if (control != null)
1477	1491	{
1478		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1492	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1479	1493	}
1480	1494	}
1481	1495	break;
...	...
1484	1498	var control = currentControl as SymControl;
1485	1499	if (control != null)
1486	1500	{
1487		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1501	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1488	1502	}
1489	1503	}
1490	1504	break;
...	...
1495	1509	{
1496	1510	if (control.STAMP != null)
1497	1511	{
1498		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1512	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1499	1513	}
1500	1514	else
1501	1515	{
...	...
1512	1526	var control = currentControl as RectangleControl;
1513	1527	if (control != null)
1514	1528	{
1515		control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
	1529	//control.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.checkAxis, ViewerDataModel.Instance.IsPressShift);
1516	1530	if(control.ControlType == ControlType.Mark) control.Paint = PaintSet.Fill;
1517	1531	control.DashSize = ViewerDataModel.Instance.DashSize;
1518	1532	}
...	...
1528	1542	break;
1529	1543	}
1530	1544
	1545	#endregion
1531	1546	if (ViewerDataModel.Instance.AngleVisibility == Visibility.Visible)
1532	1547	{
1533	1548	ViewerDataModel.Instance.Angle = currentControl.Angle;

MarkupToPDF/Controls/Common/MathSet.cs
418	418	public static double returnAngle(Point start, ref Point end, bool PressShift)
419	419	{
420	420	double angle = MathSet.getAngle(start.X, start.Y, end.X, end.Y);
	421	double approxAngle = MathSet.getMultipleAngle(UnitAngle, angle);
421	422
422	423	if (PressShift)
423	424	{
424		double approxAngle = MathSet.getMultipleAngle(UnitAngle, angle);
425	425	double distance = MathSet.DistanceTo(start, end);
426	426	end = MathSet.RotateAbout(start, new Point(start.X + distance, start.Y), approxAngle);
427		}
428
429		angle *= -1;
430	427
431		if (angle < 0)
432		{
433		angle = angle + 360;
	428	angle = approxAngle;
434	429	}
	430
435	431	return angle;
436	432	}
437	433

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 b68ac323