개정판 17a22987
Escape선택 시 연속 그리기 해제
꺽은선과 폴리라인에 Axis Lock기능 적용
Shift선택 시 Circle, Rectangle, RectCloud 정도형 그리기 설정
| ConvertService/ConverterService/ConverterStation/obj/Debug/ConverterStation.csproj.CoreCompileInputs.cache | ||
|---|---|---|
| 1 |
a851819576578a882e94594461fe4dca86c03732 |
|
| 1 |
7088ad7402aeb3c56591dc81f65fb32a821f7360 |
|
| ConvertService/ConverterService/ConvertionWebService/obj/Debug/ConvertionWebService.csproj.CoreCompileInputs.cache | ||
|---|---|---|
| 1 |
294274a23dc07fdea0ca7565744e117802b67d2e |
|
| 1 |
80afafb6fcd3c1dd737c121639589e196677efa1 |
|
| ConvertService/ConverterService/DBAggrigater/AssemblySettings/obj/Debug/AssemblySettings.csproj.CoreCompileInputs.cache | ||
|---|---|---|
| 1 |
99180c0ea67e311271a0519d6fb42f84b8b95e67 |
|
| 1 |
badcc8987b3160b01e0f757372bf5a79ec8a8e39 |
|
| ConvertService/ConverterService/DBAggrigater/DeepViewDataModel/obj/Debug/DeepViewDataModel.csproj.CoreCompileInputs.cache | ||
|---|---|---|
| 1 |
147376fa3fa42e37cf07885f09858864e31c5e8f |
|
| 1 |
45fe0b081f29af05d26fff68e1974f01376f649b |
|
| ConvertService/ConverterService/DBAggrigater/DeepViewDataModel/obj/Debug/DeepViewDataModel.csproj.FileListAbsolute.txt | ||
|---|---|---|
| 437 | 437 |
D:\Project_By_Kang\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.csproj.CoreCompileInputs.cache |
| 438 | 438 |
D:\Project_By_Kang\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.dll |
| 439 | 439 |
D:\Project_By_Kang\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.pdb |
| 440 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\App.Config |
|
| 441 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\DeepViewDataModel.dll.config |
|
| 442 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\DeepViewDataModel.dll |
|
| 443 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\DeepViewDataModel.pdb |
|
| 444 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\AssemblySettings.dll |
|
| 445 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\EntityFramework.dll |
|
| 446 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\AssemblySettings.pdb |
|
| 447 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\EntityFramework.xml |
|
| 448 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\bin\Debug\ko\EntityFramework.resources.dll |
|
| 449 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.csprojResolveAssemblyReference.cache |
|
| 450 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.csproj.CoreCompileInputs.cache |
|
| 451 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.dll |
|
| 452 |
C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\DBAggrigater\DeepViewDataModel\obj\Debug\DeepViewDataModel.pdb |
|
| ConvertService/ConverterService/Main/PDFConverter/.vs/config/applicationhost.config | ||
|---|---|---|
| 162 | 162 |
</site> |
| 163 | 163 |
<site name="ConvertionWebService" id="2"> |
| 164 | 164 |
<application path="/" applicationPool="Clr4IntegratedAppPool"> |
| 165 |
<virtualDirectory path="/" physicalPath="D:\Project_By_Kang\ConverterService\ConvertionWebService" />
|
|
| 165 |
<virtualDirectory path="/" physicalPath="C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-17\MarkUS\ConvertService\ConverterService\ConvertionWebService" />
|
|
| 166 | 166 |
</application> |
| 167 | 167 |
<bindings> |
| 168 | 168 |
<binding protocol="http" bindingInformation="*:5295:localhost" /> |
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 891 | 891 |
|
| 892 | 892 |
Point setPoint = new Point(Canvas.GetLeft(thumb), Canvas.GetTop(thumb)); |
| 893 | 893 |
|
| 894 |
|
|
| 894 | 895 |
//if (this.isDragging && MemberSet.Count <= 1) |
| 895 | 896 |
//if (thumb.IsDragging && MemberSet.Count <= 1 && DraggerThumb == thumb) |
| 896 | 897 |
//if (DraggerThumb == thumb) |
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 591 | 591 |
var toggleList = this.ChildrenOfType<RadToggleButton>(); |
| 592 | 592 |
var toggleList2 = this.ChildrenOfType<RadRibbonToggleButton>(); |
| 593 | 593 |
|
| 594 |
foreach (var item in toggleList) |
|
| 594 |
foreach (var item in toggleList) |
|
| 595 |
{
|
|
| 596 |
if (item.Name == "btnSelection") |
|
| 595 | 597 |
{
|
| 596 |
if (item.Name == "btnSelection") |
|
| 597 |
{
|
|
| 598 | 598 |
item.IsChecked = true; |
| 599 | 599 |
} |
| 600 |
else |
|
| 601 |
{
|
|
| 602 |
item.IsChecked = false; |
|
| 603 |
} |
|
| 604 |
} |
|
| 605 |
|
|
| 606 |
foreach (var item in toggleList2) |
|
| 600 |
else |
|
| 607 | 601 |
{
|
| 608 | 602 |
item.IsChecked = false; |
| 609 | 603 |
} |
| 604 |
} |
|
| 605 |
|
|
| 606 |
//foreach (var item in toggleList2) |
|
| 607 |
//{
|
|
| 608 |
// item.IsChecked = false; |
|
| 609 |
//} |
|
| 610 | 610 |
} |
| 611 | 611 |
break; |
| 612 | 612 |
#endregion |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1387 | 1387 |
} |
| 1388 | 1388 |
else |
| 1389 | 1389 |
{
|
| 1390 |
//control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y);
|
|
| 1391 |
//control.LeftBottomPoint = new Point(canvasDrawingMouseDownPoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
| 1392 |
//control.TopRightPoint = new Point(currentCanvasDrawingMouseMovePoint.X, canvasDrawingMouseDownPoint.Y);
|
|
| 1393 |
//control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
| 1390 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1391 |
control.LeftBottomPoint = new Point(canvasDrawingMouseDownPoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1392 |
control.TopRightPoint = new Point(currentCanvasDrawingMouseMovePoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 1393 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
| 1394 | 1394 |
|
| 1395 | 1395 |
|
| 1396 |
if (ViewerDataModel.Instance.IsPressShift) |
|
| 1397 |
{
|
|
| 1398 |
Point setpoint = ShiftDrawing(control.StartPoint, control.EndPoint); |
|
| 1399 |
control.LeftBottomPoint = new Point(control.LeftBottomPoint.X, setpoint.Y); |
|
| 1400 |
control.TopRightPoint = new Point(setpoint.X, control.TopRightPoint.Y); |
|
| 1401 |
control.EndPoint = new Point(setpoint.X, setpoint.Y); |
|
| 1402 |
} |
|
| 1403 |
|
|
| 1396 | 1404 |
//control.PointSet = new List<Point> |
| 1397 | 1405 |
//{
|
| 1398 | 1406 |
// control.StartPoint, |
| ... | ... | |
| 1400 | 1408 |
// control.EndPoint, |
| 1401 | 1409 |
// control.TopRightPoint, |
| 1402 | 1410 |
//}; |
| 1411 |
|
|
| 1403 | 1412 |
control.PointSet = new List<Point> |
| 1404 | 1413 |
{
|
| 1405 |
new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y),
|
|
| 1406 |
new Point(canvasDrawingMouseDownPoint.X, currentCanvasDrawingMouseMovePoint.Y),
|
|
| 1407 |
new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y),
|
|
| 1408 |
new Point(currentCanvasDrawingMouseMovePoint.X, canvasDrawingMouseDownPoint.Y),
|
|
| 1414 |
control.StartPoint,
|
|
| 1415 |
control.LeftBottomPoint,
|
|
| 1416 |
control.EndPoint,
|
|
| 1417 |
control.TopRightPoint,
|
|
| 1409 | 1418 |
}; |
| 1410 | 1419 |
control.updateControl(); |
| 1411 | 1420 |
} |
| ... | ... | |
| 1435 | 1444 |
control.TopRightPoint = new Point(currentCanvasDrawingMouseMovePoint.X, canvasDrawingMouseDownPoint.Y); |
| 1436 | 1445 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
| 1437 | 1446 |
|
| 1447 |
if (ViewerDataModel.Instance.IsPressShift) |
|
| 1448 |
{
|
|
| 1449 |
Point setpoint = ShiftDrawing(control.StartPoint, control.EndPoint); |
|
| 1450 |
control.LeftBottomPoint = new Point(control.LeftBottomPoint.X, setpoint.Y); |
|
| 1451 |
control.TopRightPoint = new Point(setpoint.X, control.TopRightPoint.Y); |
|
| 1452 |
control.EndPoint = new Point(setpoint.X, setpoint.Y); |
|
| 1453 |
} |
|
| 1454 |
|
|
| 1438 | 1455 |
control.PointSet = new List<Point> |
| 1439 | 1456 |
{
|
| 1440 | 1457 |
control.StartPoint, |
| ... | ... | |
| 1817 | 1834 |
control.TopRightPoint = new Point(currentCanvasDrawingMouseMovePoint.X, canvasDrawingMouseDownPoint.Y); |
| 1818 | 1835 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
| 1819 | 1836 |
|
| 1837 |
if (ViewerDataModel.Instance.IsPressShift) |
|
| 1838 |
{
|
|
| 1839 |
Point setpoint = ShiftDrawing(control.StartPoint, control.EndPoint); |
|
| 1840 |
control.LeftBottomPoint = new Point(control.LeftBottomPoint.X, setpoint.Y); |
|
| 1841 |
control.TopRightPoint = new Point(setpoint.X, control.TopRightPoint.Y); |
|
| 1842 |
control.EndPoint = new Point(setpoint.X, setpoint.Y); |
|
| 1843 |
} |
|
| 1844 |
|
|
| 1820 | 1845 |
control.PointSet = new List<Point> |
| 1821 | 1846 |
{
|
| 1822 | 1847 |
control.StartPoint, |
| ... | ... | |
| 1873 | 1898 |
control.MidPoint, |
| 1874 | 1899 |
control.EndPoint, |
| 1875 | 1900 |
}; |
| 1901 |
|
|
| 1902 |
//if (ViewerDataModel.Instance.IsPressShift) |
|
| 1903 |
//{
|
|
| 1904 |
// Point setpoint = ShiftDrawing(control.StartPoint, control.EndPoint); |
|
| 1905 |
// control.MidPoint = new Point(setpoint.X, setpoint.Y); |
|
| 1906 |
// control.EndPoint = new Point(setpoint.X, setpoint.Y); |
|
| 1907 |
//} |
|
| 1908 |
|
|
| 1909 |
|
|
| 1876 | 1910 |
} |
| 1877 | 1911 |
//강인구 추가 |
| 1878 | 1912 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| ... | ... | |
| 4891 | 4925 |
|
| 4892 | 4926 |
}//괄호 다시 확인 필요 |
| 4893 | 4927 |
|
| 4894 |
//강인구 추가 |
|
| 4895 |
//가로 세로 동일한 컨트롤 그리기(계산 다시 필요) |
|
| 4896 |
private Point ShiftDrawing(Point StartP, Point EndP) |
|
| 4897 |
{
|
|
| 4898 |
Point Return_Point = EndP; |
|
| 4899 |
//Shift key를 눌렀을때만 발동 |
|
| 4900 |
if (ViewerDataModel.Instance.IsPressShift) |
|
| 4901 |
{
|
|
| 4902 |
Square square = new Square(); |
|
| 4903 |
double pt_X = 0; |
|
| 4904 |
double pt_Y = 0; |
|
| 4905 |
double result = 0; |
|
| 4906 |
|
|
| 4907 |
//pt_X = Math.Max(StartP.X, EndP.X) - Math.Min(StartP.X, EndP.X); |
|
| 4908 |
//pt_Y = Math.Max(StartP.Y, EndP.Y) - Math.Min(StartP.Y, EndP.Y); |
|
| 4909 |
if (EndP.X > StartP.X && EndP.Y > StartP.Y) |
|
| 4910 |
{
|
|
| 4911 |
pt_X = EndP.X - StartP.X; |
|
| 4912 |
pt_Y = EndP.Y - StartP.Y; |
|
| 4913 |
} |
|
| 4914 |
else if (EndP.X < StartP.X && EndP.Y > StartP.Y) |
|
| 4915 |
{
|
|
| 4916 |
pt_X = StartP.X - EndP.X; |
|
| 4917 |
pt_Y = EndP.Y - StartP.Y; |
|
| 4918 |
} |
|
| 4919 |
else if (EndP.X > StartP.X && EndP.Y < StartP.Y) |
|
| 4920 |
{
|
|
| 4921 |
pt_X = EndP.X - StartP.X; |
|
| 4922 |
pt_Y = StartP.Y - EndP.Y |
|
| 4923 |
; |
|
| 4924 |
} |
|
| 4925 |
result = Math.Max(pt_X, pt_Y) - Math.Min(pt_X, pt_Y); |
|
| 4926 |
if (pt_X < pt_Y) |
|
| 4927 |
{
|
|
| 4928 |
Return_Point = new Point(EndP.X + result, EndP.Y); |
|
| 4929 |
} |
|
| 4930 |
else |
|
| 4931 |
{
|
|
| 4932 |
Return_Point = new Point(EndP.X, EndP.Y + result); |
|
| 4933 |
} |
|
| 4934 |
} |
|
| 4935 |
|
|
| 4936 |
return Return_Point; |
|
| 4937 |
} |
|
| 4938 | 4928 |
|
| 4939 | 4929 |
private void SyncCompare_Click(object sender, RoutedEventArgs e) |
| 4940 | 4930 |
{
|
| ... | ... | |
| 6124 | 6114 |
|
| 6125 | 6115 |
} |
| 6126 | 6116 |
} |
| 6117 |
|
|
| 6118 |
|
|
| 6119 |
//강인구 추가 |
|
| 6120 |
//가로 세로 동일한 컨트롤 그리기(계산 다시 필요) |
|
| 6121 |
private Point ShiftDrawing(Point StartP, Point EndP) |
|
| 6122 |
{
|
|
| 6123 |
Point Return_Point = EndP; |
|
| 6124 |
//Shift key를 눌렀을때만 발동 |
|
| 6125 |
if (ViewerDataModel.Instance.IsPressShift) |
|
| 6126 |
{
|
|
| 6127 |
//Square square = new Square(); |
|
| 6128 |
double pt_X = 0; |
|
| 6129 |
double pt_Y = 0; |
|
| 6130 |
double result = 0; |
|
| 6131 |
|
|
| 6132 |
if (EndP.X > StartP.X && EndP.Y > StartP.Y) |
|
| 6133 |
{
|
|
| 6134 |
pt_X = EndP.X - StartP.X; |
|
| 6135 |
pt_Y = EndP.Y - StartP.Y; |
|
| 6136 |
|
|
| 6137 |
result = Math.Max(pt_X, pt_Y) - Math.Min(pt_X, pt_Y); |
|
| 6138 |
|
|
| 6139 |
if (pt_X < pt_Y) |
|
| 6140 |
{
|
|
| 6141 |
Return_Point = new Point(EndP.X + result, EndP.Y); |
|
| 6142 |
} |
|
| 6143 |
else |
|
| 6144 |
{
|
|
| 6145 |
Return_Point = new Point(EndP.X, EndP.Y + result); |
|
| 6146 |
} |
|
| 6147 |
} |
|
| 6148 |
else if (EndP.X < StartP.X && EndP.Y > StartP.Y) |
|
| 6149 |
{
|
|
| 6150 |
pt_X = StartP.X - EndP.X; |
|
| 6151 |
pt_Y = EndP.Y - StartP.Y; |
|
| 6152 |
|
|
| 6153 |
result = Math.Max(pt_X, pt_Y) - Math.Min(pt_X, pt_Y); |
|
| 6154 |
|
|
| 6155 |
if (pt_X < pt_Y) |
|
| 6156 |
{
|
|
| 6157 |
Return_Point = new Point(EndP.X - result, EndP.Y); |
|
| 6158 |
} |
|
| 6159 |
else |
|
| 6160 |
{
|
|
| 6161 |
Return_Point = new Point(EndP.X, EndP.Y + result); |
|
| 6162 |
} |
|
| 6163 |
} |
|
| 6164 |
else if (EndP.X > StartP.X && EndP.Y < StartP.Y) |
|
| 6165 |
{
|
|
| 6166 |
pt_X = EndP.X - StartP.X; |
|
| 6167 |
pt_Y = StartP.Y - EndP.Y; |
|
| 6168 |
|
|
| 6169 |
result = Math.Max(pt_X, pt_Y) - Math.Min(pt_X, pt_Y); |
|
| 6170 |
|
|
| 6171 |
if (pt_X < pt_Y) |
|
| 6172 |
{
|
|
| 6173 |
Return_Point = new Point(EndP.X + result, EndP.Y); |
|
| 6174 |
} |
|
| 6175 |
else |
|
| 6176 |
{
|
|
| 6177 |
Return_Point = new Point(EndP.X, EndP.Y - result); |
|
| 6178 |
} |
|
| 6179 |
} |
|
| 6180 |
else if (EndP.X < StartP.X && EndP.Y < StartP.Y) |
|
| 6181 |
{
|
|
| 6182 |
pt_X = StartP.X - EndP.X; |
|
| 6183 |
pt_Y = StartP.Y - EndP.Y; |
|
| 6184 |
|
|
| 6185 |
result = Math.Max(pt_X, pt_Y) - Math.Min(pt_X, pt_Y); |
|
| 6186 |
|
|
| 6187 |
if (pt_X < pt_Y) |
|
| 6188 |
{
|
|
| 6189 |
Return_Point = new Point(EndP.X - result, EndP.Y); |
|
| 6190 |
} |
|
| 6191 |
else |
|
| 6192 |
{
|
|
| 6193 |
Return_Point = new Point(EndP.X, EndP.Y - result); |
|
| 6194 |
} |
|
| 6195 |
} |
|
| 6196 |
} |
|
| 6197 |
|
|
| 6198 |
return Return_Point; |
|
| 6199 |
} |
|
| 6127 | 6200 |
} |
| 6128 | 6201 |
} |
| KCOM/Views/TopMenu.xaml | ||
|---|---|---|
| 234 | 234 |
x:Name="btnSelection" |
| 235 | 235 |
telerik:ScreenTip.Description="범위를 선택하여 마크업을 선택합니다" |
| 236 | 236 |
telerik:ScreenTip.Title="Eraser" |
| 237 |
Text="Selection" Margin="0,-4,0,4" />
|
|
| 237 |
Text="Selection"/> |
|
| 238 | 238 |
<telerik:RadRibbonToggleButton |
| 239 | 239 |
CollapseToMedium="WhenGroupIsMedium" |
| 240 | 240 |
CollapseToSmall="WhenGroupIsSmall" |
내보내기 Unified diff
