개정판 4f017ed3
Final ArrowTextControl 수정
Change-Id: Ifdd9876909e6a4ce288d70acb74a00b37e88e6a0
| 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) |
|
| 68 |
public static CommentUserInfo FromString(string item, SolidColorBrush brush, string sProjectNo,double PageAngle)
|
|
| 69 | 69 |
{
|
| 70 | 70 |
CommentUserInfo instance = null; |
| 71 | 71 |
var unkown = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item); //복호화작업 |
| ... | ... | |
| 142 | 142 |
|
| 143 | 143 |
#region ArrowText |
| 144 | 144 |
case "ArrowTextControl": |
| 145 |
instance = ArrowTextControl.FromString(item, brush, sProjectNo); |
|
| 145 |
instance = ArrowTextControl.FromString(item, brush, sProjectNo,PageAngle);
|
|
| 146 | 146 |
break; |
| 147 | 147 |
#endregion |
| 148 | 148 |
|
| ... | ... | |
| 208 | 208 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 209 | 209 |
/// </summary> |
| 210 | 210 |
/// <param name="MarkupString"></param> |
| 211 |
public static async Task<bool> ParseAsync(string sProjectNo, string MarkupString, Canvas Layer, string DisplayColor, string ToolTipMessage, System.Threading.CancellationToken cts) |
|
| 211 |
public static async Task<bool> ParseAsync(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); |
|
| 226 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo,PageAngle);
|
|
| 227 | 227 |
|
| 228 | 228 |
if (control != null) |
| 229 | 229 |
{
|
| ... | ... | |
| 277 | 277 |
/// 데이터베이스의 마크업데이터를 컨트롤로 변환한다. |
| 278 | 278 |
/// </summary> |
| 279 | 279 |
/// <param name="MarkupString"></param> |
| 280 |
public static async Task<Control> ParseExAsync(System.Threading.CancellationToken? cts,string sProjectNo, string MarkupString, ObservableCollection<CommentUserInfo> baseLayer, string DisplayColor, string ToolTipMessage, string markupInfoID = null, string commentId = null) |
|
| 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)
|
|
| 281 | 281 |
{
|
| 282 | 282 |
Control res = null; |
| 283 | 283 |
|
| ... | ... | |
| 306 | 306 |
item = await JsonSerializerHelper.UnCompressStringAsync(dataPease, cts); //언패킹작업 |
| 307 | 307 |
} |
| 308 | 308 |
|
| 309 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo); |
|
| 309 |
CommentUserInfo control = MarkupParser.FromString(item, _SetColor, sProjectNo, PageAngle);
|
|
| 310 | 310 |
|
| 311 | 311 |
res = control as Control; |
| 312 | 312 |
if (control != null) |
내보내기 Unified diff
