개정판 e1b36bc0
Feature: Grouping 기능 추가(Ctrl+G : Group, Ctrl+Shift+G : Ungroup)
Change-Id: I99a3309acd55799ff7101522feaa035225b80e48
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 522 | 522 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 523 | 523 |
}); |
| 524 | 524 |
|
| 525 |
string GroupID = Guid.NewGuid().ToString(); |
|
| 525 | 526 |
foreach (string parse in data) |
| 526 | 527 |
{
|
| 527 | 528 |
if (!string.IsNullOrEmpty(parse)) |
| ... | ... | |
| 530 | 531 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 531 | 532 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.ShortGuid(); |
| 532 | 533 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 534 |
(item as MarkupToPDF.Common.CommentUserInfo).GroupID = GroupID; |
|
| 533 | 535 |
|
| 534 | 536 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
| 535 | 537 |
|
| ... | ... | |
| 564 | 566 |
} |
| 565 | 567 |
else |
| 566 | 568 |
{
|
| 567 |
await PlaceImageSymbol(id, 0);
|
|
| 569 |
await PlaceImageSymbol(id, string.Empty);
|
|
| 568 | 570 |
} |
| 569 | 571 |
} |
| 570 | 572 |
catch (Exception ex) |
| ... | ... | |
| 592 | 594 |
/// </summary> |
| 593 | 595 |
/// <param name="id"></param> |
| 594 | 596 |
/// <param name="group_id"></param> |
| 595 |
private async Task PlaceImageSymbol(string id, long group_id)
|
|
| 597 |
private async Task PlaceImageSymbol(string id, string groupID)
|
|
| 596 | 598 |
{
|
| 597 | 599 |
try |
| 598 | 600 |
{
|
| ... | ... | |
| 654 | 656 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 655 | 657 |
currentControl.CommentID = Commons.ShortGuid(); |
| 656 | 658 |
currentControl.SymbolID = id; |
| 657 |
currentControl.GroupID = group_id;
|
|
| 659 |
currentControl.GroupID = groupID;
|
|
| 658 | 660 |
currentControl.ApplyTemplate(); |
| 659 | 661 |
currentControl.SetImage(); |
| 660 | 662 |
|
| ... | ... | |
| 686 | 688 |
/// <summary> |
| 687 | 689 |
/// |
| 688 | 690 |
/// </summary> |
| 691 |
/* |
|
| 689 | 692 |
private void ApplyDragSelectionRect() |
| 690 | 693 |
{
|
| 691 | 694 |
var multi_UndoData = new UndoData(); |
| ... | ... | |
| 729 | 732 |
multi_UndoData = new UndoData(); |
| 730 | 733 |
if (item.GroupID > 0) |
| 731 | 734 |
{
|
| 732 |
|
|
| 733 | 735 |
} |
| 734 | 736 |
} |
| 735 | 737 |
} |
| ... | ... | |
| 745 | 747 |
this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children.Add(final); |
| 746 | 748 |
} |
| 747 | 749 |
} |
| 750 |
*/ |
|
| 748 | 751 |
|
| 749 | 752 |
///private Move move; |
| 750 | 753 |
#region Symbol DoubleClick Event |
내보내기 Unified diff
