개정판 ac4f1e13
Markup load 비동기로 변경
Change-Id: I471906b1090f7f3f0fd18e97d88a54f75fd1f673
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 29 | 29 |
using Svg2Xaml; |
| 30 | 30 |
using MarkupToPDF.Controls.Cad; |
| 31 | 31 |
using MarkupToPDF.Controls.Common; |
| 32 |
using System.Threading.Tasks; |
|
| 32 | 33 |
|
| 33 | 34 |
namespace MarkupToPDF.Controls.Parsing |
| 34 | 35 |
{
|
| ... | ... | |
| 207 | 208 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 208 | 209 |
/// </summary> |
| 209 | 210 |
/// <param name="MarkupString"></param> |
| 210 |
public static void Parse(string sProjectNo, string MarkupString, Canvas Layer, string DisplayColor, string ToolTipMessage)
|
|
| 211 |
public static async Task ParseAsync(string sProjectNo, string MarkupString, Canvas Layer, string DisplayColor, string ToolTipMessage)
|
|
| 211 | 212 |
{
|
| 212 | 213 |
if (MarkupString != "False") |
| 213 | 214 |
{
|
| ... | ... | |
| 219 | 220 |
|
| 220 | 221 |
foreach (var token in tokens) |
| 221 | 222 |
{
|
| 222 |
var item = JsonSerializerHelper.UnCompressString(token); //언패킹작업
|
|
| 223 |
var item = await JsonSerializerHelper.UnCompressStringAsync(token); //언패킹작업
|
|
| 223 | 224 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo); |
| 224 | 225 |
if (control != null) |
| 225 | 226 |
{
|
| ... | ... | |
| 269 | 270 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 270 | 271 |
/// </summary> |
| 271 | 272 |
/// <param name="MarkupString"></param> |
| 272 |
public static Control ParseEx(string sProjectNo, string MarkupString, ObservableCollection<CommentUserInfo> baseLayer, string DisplayColor, string ToolTipMessage, string markupInfoID = null, string commentId = null)
|
|
| 273 |
public static async Task<Control> ParseExAsync(string sProjectNo, string MarkupString, ObservableCollection<CommentUserInfo> baseLayer, string DisplayColor, string ToolTipMessage, string markupInfoID = null, string commentId = null)
|
|
| 273 | 274 |
{
|
| 274 | 275 |
Control res = null; |
| 275 | 276 |
|
| ... | ... | |
| 282 | 283 |
|
| 283 | 284 |
foreach (var dataPease in data) |
| 284 | 285 |
{
|
| 285 |
var item = JsonSerializerHelper.UnCompressString(dataPease); //언패킹작업
|
|
| 286 |
var item = await JsonSerializerHelper.UnCompressStringAsync(dataPease); //언패킹작업
|
|
| 286 | 287 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo); |
| 287 | 288 |
res = control as Control; |
| 288 | 289 |
if (control != null) |
| ... | ... | |
| 336 | 337 |
return res; |
| 337 | 338 |
} |
| 338 | 339 |
|
| 339 |
public static S_BaseControl GetBaseControl(string MarkupString)
|
|
| 340 |
public static async Task<S_BaseControl> GetBaseControlAsync(string MarkupString)
|
|
| 340 | 341 |
{
|
| 341 |
var item = JsonSerializerHelper.UnCompressString(MarkupString); //언패킹작업
|
|
| 342 |
var item = await JsonSerializerHelper.UnCompressStringAsync(MarkupString); //언패킹작업
|
|
| 342 | 343 |
var unknownData = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item); //복호화작업 |
| 343 | 344 |
return unknownData; |
| 344 | 345 |
} |
| 345 | 346 |
|
| 346 |
public static string GetMemo(string MarkupString)
|
|
| 347 |
public static async Task<string> GetMemoAsync(string MarkupString)
|
|
| 347 | 348 |
{
|
| 348 |
var item = JsonSerializerHelper.UnCompressString(MarkupString); //언패킹작업
|
|
| 349 |
var item = await JsonSerializerHelper.UnCompressStringAsync(MarkupString); //언패킹작업
|
|
| 349 | 350 |
var unknownData = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item); //복호화작업 |
| 350 | 351 |
return unknownData.Memo; |
| 351 | 352 |
} |
내보내기 Unified diff
