개정판 a1e2ba68
markus 외부주소 오류 수정
Change-Id: I03bd3df4edb78472d7d45f7a8c5db87fdfda226b
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 65 | 65 |
/// </summary> |
| 66 | 66 |
/// <param name="str"></param> |
| 67 | 67 |
/// <returns></returns> |
| 68 |
public static CommentUserInfo FromString(string item, SolidColorBrush brush, string sProjectNo,double PageAngle) |
|
| 68 |
public static CommentUserInfo FromString(string baseUri,string item, SolidColorBrush brush, string sProjectNo,double PageAngle)
|
|
| 69 | 69 |
{
|
| 70 | 70 |
CommentUserInfo instance = null; |
| 71 | 71 |
var unkown = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item); //복호화작업 |
| ... | ... | |
| 162 | 162 |
#endregion |
| 163 | 163 |
#region Image |
| 164 | 164 |
case "ImgControl": |
| 165 |
instance = ImgControl.FromString(item, brush, sProjectNo); |
|
| 165 |
instance = ImgControl.FromString(item, brush, sProjectNo, baseUri);
|
|
| 166 | 166 |
break; |
| 167 | 167 |
#endregion |
| 168 | 168 |
#region Sign |
| ... | ... | |
| 208 | 208 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 209 | 209 |
/// </summary> |
| 210 | 210 |
/// <param name="MarkupString"></param> |
| 211 |
public static async Task<bool> ParseAsync(string sProjectNo, string MarkupString, Canvas Layer,double PageAngle, string DisplayColor, string ToolTipMessage, System.Threading.CancellationToken cts) |
|
| 211 |
public static async Task<bool> ParseAsync(string baseUri, string sProjectNo, string MarkupString, Canvas Layer,double PageAngle, string DisplayColor, string ToolTipMessage, System.Threading.CancellationToken cts)
|
|
| 212 | 212 |
{
|
| 213 | 213 |
bool result = false; |
| 214 | 214 |
|
| ... | ... | |
| 223 | 223 |
foreach (var token in tokens) |
| 224 | 224 |
{
|
| 225 | 225 |
var item = await JsonSerializerHelper.UnCompressStringAsync(token,cts); //언패킹작업 |
| 226 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo,PageAngle); |
|
| 226 |
CommentUserInfo control = MarkupParser.FromString(baseUri, item, _SetColor, sProjectNo,PageAngle);
|
|
| 227 | 227 |
|
| 228 | 228 |
if (control != null) |
| 229 | 229 |
{
|
| ... | ... | |
| 264 | 264 |
_instance.Base_ViewBox.Child = obj as UIElement; |
| 265 | 265 |
_instance.SetViewBox(); |
| 266 | 266 |
} |
| 267 |
else if(control is ImgControl) |
|
| 268 |
{
|
|
| 269 |
|
|
| 270 |
} |
|
| 267 | 271 |
|
| 268 | 272 |
result = true; |
| 269 | 273 |
} |
| ... | ... | |
| 277 | 281 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 278 | 282 |
/// </summary> |
| 279 | 283 |
/// <param name="MarkupString"></param> |
| 280 |
public static async Task<Control> ParseExAsync(System.Threading.CancellationToken? cts,string sProjectNo, string MarkupString, ObservableCollection<CommentUserInfo> baseLayer,double PageAngle, string DisplayColor, string ToolTipMessage, string markupInfoID = null, string commentId = null) |
|
| 284 |
public static async Task<Control> ParseExAsync(string baseUri, System.Threading.CancellationToken? cts,string sProjectNo, string MarkupString, ObservableCollection<CommentUserInfo> baseLayer,double PageAngle, string DisplayColor, string ToolTipMessage, string markupInfoID = null, string commentId = null)
|
|
| 281 | 285 |
{
|
| 282 | 286 |
Control res = null; |
| 283 | 287 |
|
| ... | ... | |
| 306 | 310 |
// item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, cts); //언패킹작업 |
| 307 | 311 |
//} |
| 308 | 312 |
|
| 309 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo, PageAngle); |
|
| 313 |
CommentUserInfo control = MarkupParser.FromString(baseUri, item, _SetColor, sProjectNo, PageAngle);
|
|
| 310 | 314 |
|
| 311 | 315 |
res = control as Control; |
| 312 | 316 |
if (control != null) |
내보내기 Unified diff
