개정판 ac4f1e13
Markup load 비동기로 변경
Change-Id: I471906b1090f7f3f0fd18e97d88a54f75fd1f673
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 2445 | 2445 |
public double height { get; set; }
|
| 2446 | 2446 |
} |
| 2447 | 2447 |
*/ |
| 2448 |
private void CollapsedButton_Click() |
|
| 2448 |
private async void CollapsedButton_Click()
|
|
| 2449 | 2449 |
{
|
| 2450 | 2450 |
this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); // 저장하지 못한 데이터가 있다면 저장 |
| 2451 | 2451 |
|
| ... | ... | |
| 2465 | 2465 |
data = new string[instance.Count]; |
| 2466 | 2466 |
foreach (var markup in instance) |
| 2467 | 2467 |
{
|
| 2468 |
data[cnt++] = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString(markup.Data);
|
|
| 2468 |
data[cnt++] = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(markup.Data);
|
|
| 2469 | 2469 |
} |
| 2470 | 2470 |
} |
| 2471 | 2471 |
} |
| ... | ... | |
| 2721 | 2721 |
} |
| 2722 | 2722 |
} |
| 2723 | 2723 |
|
| 2724 |
public void Paste_Start() |
|
| 2724 |
public async void Paste_Start()
|
|
| 2725 | 2725 |
{
|
| 2726 | 2726 |
//마크업 붙여넣기 |
| 2727 | 2727 |
if (Clipboard.GetText().Contains("|OR||DZ|"))
|
| ... | ... | |
| 2753 | 2753 |
{
|
| 2754 | 2754 |
if (parse != "") |
| 2755 | 2755 |
{
|
| 2756 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty);
|
|
| 2756 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty);
|
|
| 2757 | 2757 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
| 2758 | 2758 |
|
| 2759 | 2759 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
내보내기 Unified diff
