개정판 ac4f1e13
Markup load 비동기로 변경
Change-Id: I471906b1090f7f3f0fd18e97d88a54f75fd1f673
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 162 | 162 |
lstSymbolPublic.ItemsSource = Custom_List; |
| 163 | 163 |
} |
| 164 | 164 |
|
| 165 |
public PngBitmapEncoder symImage(string data)
|
|
| 165 |
public async Task<PngBitmapEncoder> symImageAsync(string data)
|
|
| 166 | 166 |
{
|
| 167 | 167 |
|
| 168 | 168 |
Canvas _canvas = new Canvas(); |
| 169 | 169 |
_canvas.Background = Brushes.White; |
| 170 | 170 |
_canvas.Width = finalItem.BorderSize.Width; |
| 171 | 171 |
_canvas.Height = finalItem.BorderSize.Height; |
| 172 |
MarkupParser.Parse(App.ViewInfo.ProjectNO, data, _canvas, "#FFFF0000", "");
|
|
| 172 |
await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, _canvas, "#FFFF0000", "");
|
|
| 173 | 173 |
|
| 174 | 174 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 175 | 175 |
|
| ... | ... | |
| 287 | 287 |
{
|
| 288 | 288 |
if (args.DialogResult.Value) |
| 289 | 289 |
{
|
| 290 |
PngBitmapEncoder _Encoder = symImage(data);
|
|
| 290 |
PngBitmapEncoder _Encoder = await symImageAsync(data);
|
|
| 291 | 291 |
|
| 292 | 292 |
System.IO.MemoryStream fs = new System.IO.MemoryStream(); |
| 293 | 293 |
_Encoder.Save(fs); |
| ... | ... | |
| 418 | 418 |
/// </summary> |
| 419 | 419 |
/// <date>2018.06.14</date> |
| 420 | 420 |
/// <param name="id"></param> |
| 421 |
private void PlaceSymbol(string id,Point CurrentMousePoint) |
|
| 421 |
private async void PlaceSymbol(string id,Point CurrentMousePoint)
|
|
| 422 | 422 |
{
|
| 423 | 423 |
string Data_ = ""; |
| 424 | 424 |
|
| ... | ... | |
| 474 | 474 |
{
|
| 475 | 475 |
if (parse != "") |
| 476 | 476 |
{
|
| 477 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty);
|
|
| 477 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty);
|
|
| 478 | 478 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
| 479 | 479 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 480 | 480 |
//(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
내보내기 Unified diff
