개정판 2eac4f76
그리기모드 Escape수정
Axis Lock 꺽은선과 폴리라인 추가
| ConvertService/ConverterService/DZConverterLib/DZConverter.cs | ||
|---|---|---|
| 595 | 595 |
int a = doc.GetPageCount(); |
| 596 | 596 |
//throw new AccessViolationException(); |
| 597 | 597 |
_pageNo = itr.GetPageNumber(); |
| 598 |
//Page _page = itr.Current();
|
|
| 599 |
Page _page = doc.GetPage(27); |
|
| 598 |
Page _page = itr.Current(); |
|
| 599 |
//Page _page = doc.GetPage(27);
|
|
| 600 | 600 |
itr.Next(); |
| 601 | 601 |
|
| 602 | 602 |
int widthData = (int)_page.GetPageWidth(); |
| ... | ... | |
| 628 | 628 |
{
|
| 629 | 629 |
|
| 630 | 630 |
} |
| 631 |
|
|
| 632 | 631 |
++cnt; |
| 633 | 632 |
this.SetCurrentPage(cnt, IConverterPDF.ConverterStatus.Crop); |
| 634 | 633 |
|
| KCOM/Controls/Panorama.xaml.cs | ||
|---|---|---|
| 59 | 59 |
if (e.ClickCount >=2) |
| 60 | 60 |
{
|
| 61 | 61 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(((sender as Border).DataContext as ThumbnailItem).PageNumber); |
| 62 |
|
|
| 63 |
//Panorama infoScreen = (Panorama)this.Parent; |
|
| 64 |
//infoScreen.Close(); |
|
| 62 | 65 |
} |
| 63 |
|
|
| 64 | 66 |
} |
| 65 | 67 |
|
| 66 | 68 |
private void tileList_PreviewMouseWheel(object sender, MouseWheelEventArgs e) |
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 584 | 584 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
| 585 | 585 |
this.dzMainMenu.currentControl = null; |
| 586 | 586 |
|
| 587 |
//모든 컨트롤 초기화 하고 Selection모드로 변경 |
|
| 588 |
dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Selecting; |
|
| 589 |
dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.None; |
|
| 590 |
|
|
| 591 |
var toggleList = this.ChildrenOfType<RadToggleButton>(); |
|
| 592 |
var toggleList2 = this.ChildrenOfType<RadRibbonToggleButton>(); |
|
| 593 |
|
|
| 594 |
foreach (var item in toggleList) |
|
| 595 |
{
|
|
| 596 |
if (item.Name == "btnSelection") |
|
| 597 |
{
|
|
| 598 |
item.IsChecked = true; |
|
| 599 |
} |
|
| 600 |
else |
|
| 601 |
{
|
|
| 602 |
item.IsChecked = false; |
|
| 603 |
} |
|
| 604 |
} |
|
| 605 |
|
|
| 606 |
foreach (var item in toggleList2) |
|
| 607 |
{
|
|
| 608 |
item.IsChecked = false; |
|
| 609 |
} |
|
| 587 | 610 |
} |
| 588 | 611 |
break; |
| 589 | 612 |
#endregion |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1644 | 1644 |
|
| 1645 | 1645 |
if (control != null) |
| 1646 | 1646 |
{
|
| 1647 |
|
|
| 1647 | 1648 |
control.PointSet.RemoveAt(control.PointSet.Count - 1); |
| 1648 | 1649 |
control.PointSet.Add(currentCanvasDrawingMouseMovePoint); |
| 1650 |
|
|
| 1651 |
Point tempPoint = control.PointSet[control.PointSet.Count - 1]; |
|
| 1652 |
|
|
| 1653 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 1654 |
{
|
|
| 1655 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
| 1656 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.PointSet[control.PointSet.Count-2], ref tempPoint, true); |
|
| 1657 |
control.PointSet[control.PointSet.Count - 1] = tempPoint; |
|
| 1658 |
//control.EndPoint = tempPoint; |
|
| 1659 |
} |
|
| 1660 |
else |
|
| 1661 |
{
|
|
| 1662 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
| 1663 |
} |
|
| 1664 |
|
|
| 1649 | 1665 |
control.SetPolyPath(); |
| 1650 | 1666 |
//movePoint.X = currentCanvasDrawingMouseMovePoint.X; |
| 1651 | 1667 |
//movePoint.Y = currentCanvasDrawingMouseMovePoint.Y; |
| ... | ... | |
| 1759 | 1775 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
| 1760 | 1776 |
{
|
| 1761 | 1777 |
//var AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
| 1762 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
|
|
| 1778 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true);
|
|
| 1763 | 1779 |
control.EndPoint = tempPoint; |
| 1764 | 1780 |
} |
| 1765 | 1781 |
else |
| 1766 | 1782 |
{
|
| 1767 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
| 1783 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, false);
|
|
| 1768 | 1784 |
} |
| 1769 | 1785 |
|
| 1770 | 1786 |
} |
| ... | ... | |
| 3547 | 3563 |
(currentControl as PolygonControl).ApplyOverViewData(); |
| 3548 | 3564 |
//controlType = ControlType.None; |
| 3549 | 3565 |
currentControl = null; |
| 3566 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
| 3550 | 3567 |
return; |
| 3551 | 3568 |
} |
| 3552 | 3569 |
|
| ... | ... | |
| 3554 | 3571 |
{
|
| 3555 | 3572 |
//control.PointC.pointSet.Add(control.EndPoint); |
| 3556 | 3573 |
control.PointSet.Add(control.EndPoint); |
| 3574 |
this.MainAngle.Visibility = Visibility.Visible; |
|
| 3557 | 3575 |
} |
| 3558 | 3576 |
//else |
| 3559 | 3577 |
//{
|
| ... | ... | |
| 3573 | 3591 |
{
|
| 3574 | 3592 |
if (mouseButtonDown == MouseButton.Left) |
| 3575 | 3593 |
{
|
| 3594 |
MainAngle.Visibility = Visibility.Visible; |
|
| 3576 | 3595 |
currentControl = new PolygonControl |
| 3577 | 3596 |
{
|
| 3578 | 3597 |
PointSet = new List<Point>(), |
| ... | ... | |
| 3688 | 3707 |
var content = currentControl as ArrowControl_Multi; |
| 3689 | 3708 |
if (content.MiddlePoint == new Point(0, 0)) |
| 3690 | 3709 |
{
|
| 3691 |
content.MiddlePoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 3710 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
| 3711 |
{
|
|
| 3712 |
content.MiddlePoint = content.EndPoint; |
|
| 3713 |
} |
|
| 3714 |
else |
|
| 3715 |
{
|
|
| 3716 |
content.MiddlePoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
| 3717 |
} |
|
| 3692 | 3718 |
} |
| 3693 | 3719 |
else |
| 3694 | 3720 |
{
|
| ... | ... | |
| 4073 | 4099 |
|
| 4074 | 4100 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, canvasDrawingMouseDownPoint); |
| 4075 | 4101 |
|
| 4102 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
|
| 4103 |
|
|
| 4076 | 4104 |
(currentControl as ArrowTextControl).isFixed = true; |
| 4077 | 4105 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
| 4078 | 4106 |
|
| 4079 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
|
| 4080 |
|
|
| 4081 | 4107 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
| 4082 | 4108 |
this.MainAngle.Visibility = Visibility.Visible; |
| 4083 | 4109 |
//currentControl.Focus(); |
| KCOM/Views/TopMenu.xaml | ||
|---|---|---|
| 231 | 231 |
Size="Medium" |
| 232 | 232 |
Click="ControlEvent" |
| 233 | 233 |
Tag="Select" |
| 234 |
x:Name="btnSelection" |
|
| 234 | 235 |
telerik:ScreenTip.Description="범위를 선택하여 마크업을 선택합니다" |
| 235 | 236 |
telerik:ScreenTip.Title="Eraser" |
| 236 |
Text="Selection" /> |
|
| 237 |
Text="Selection" Margin="0,-4,0,4" />
|
|
| 237 | 238 |
<telerik:RadRibbonToggleButton |
| 238 | 239 |
CollapseToMedium="WhenGroupIsMedium" |
| 239 | 240 |
CollapseToSmall="WhenGroupIsSmall" |
내보내기 Unified diff
