개정판 284ed1c7
Fix: 심볼을 배치할때 심볼이 밑으로 배치되는 오류 수정
- ArrowTextControl에서 시작점, 중간점 이동 오류 수정
Change-Id: Iafa96ec0854b5a5716729e103308b87e4cfd5013
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 527 | 527 |
{
|
| 528 | 528 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, string.Empty, string.Empty, |
| 529 | 529 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 530 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.ShortGuid(); |
|
| 531 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
|
| 532 |
(item as MarkupToPDF.Common.CommentUserInfo).GroupID = GroupID; |
|
| 530 |
if (item is MarkupToPDF.Common.CommentUserInfo comment) |
|
| 531 |
{
|
|
| 532 |
comment.CommentID = Commons.ShortGuid(); |
|
| 533 |
comment.SymbolID = id; |
|
| 534 |
comment.GroupID = GroupID; |
|
| 535 |
comment.ZIndex = CommentUserInfo.MaxZIndex; |
|
| 533 | 536 |
|
| 534 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo);
|
|
| 537 |
adornerSet.Add(comment);
|
|
| 535 | 538 |
|
| 536 |
var UndoData = new UndoData(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 537 |
UndoDataGroup.MarkupDataColl.Add(UndoData); |
|
| 538 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup); |
|
| 539 |
var UndoData = new UndoData(comment); |
|
| 540 |
UndoDataGroup.MarkupDataColl.Add(UndoData); |
|
| 541 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup); |
|
| 542 |
} |
|
| 539 | 543 |
} |
| 540 | 544 |
} |
| 541 | 545 |
|
| ... | ... | |
| 625 | 629 |
StartPoint = new Point(0, 0), |
| 626 | 630 |
EndPoint = new Point(img.Source.Width, img.Source.Height), |
| 627 | 631 |
TopRightPoint = new Point(img.Source.Width, 0), |
| 628 |
LeftBottomPoint = new Point(0, img.Source.Height) |
|
| 632 |
LeftBottomPoint = new Point(0, img.Source.Height), |
|
| 633 |
ZIndex = CommentUserInfo.MaxZIndex |
|
| 629 | 634 |
}; |
| 630 | 635 |
|
| 631 | 636 |
currentControl.PointSet = new List<Point> |
| 632 |
{
|
|
| 633 |
currentControl.StartPoint,
|
|
| 634 |
currentControl.LeftBottomPoint,
|
|
| 635 |
currentControl.EndPoint,
|
|
| 636 |
currentControl.TopRightPoint,
|
|
| 637 |
};
|
|
| 637 |
{
|
|
| 638 |
currentControl.StartPoint, |
|
| 639 |
currentControl.LeftBottomPoint, |
|
| 640 |
currentControl.EndPoint, |
|
| 641 |
currentControl.TopRightPoint, |
|
| 642 |
}; |
|
| 638 | 643 |
UndoDataGroup = new UndoDataGroup() |
| 639 | 644 |
{
|
| 640 | 645 |
IsUndo = false, |
내보내기 Unified diff
