개정판 b200de5a
- Stamp 하드코딩 남아있던 부분 모두 삭제
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 32 | 32 |
public partial class LayerControl : Control |
| 33 | 33 |
{
|
| 34 | 34 |
public GetUserSign getUser = new GetUserSign(); |
| 35 |
public string appovalData = "eJyycS/KTFHwS8xNtVVKBAMlhYrcnLxiW6WMkpICK3394uSM1NzEYr3czOSi/OL8tBK95Pxc/fLMvLQKfSMDAzP9isTcHP2CotTi1LySxJLM/DwlOxuQqXpOicnZ6UX5pXkpdjbB+TmZKc75OflFTkWlxRkKYKatkrIbFCgp+BckJmeWVNoqGegZKino29noYxgSlJpckpiXnpOqEFxSlFqSnGGr5JaZk6ME4uZnp0KNMwACmFBIRmZydl5qMdA7pjAxn8y8VK/8zDxbpSCQsUpQ38MNV1IIz0wpAZptZADU45GamZ5RYqtkYamk4JyYVwYMCZ/UNKCArpGeKVwoJL8AJqIP8T00DILyy11S0zLzMkEBUwz0AjIfbrgWWBt2OWM9U3zSBviljfBJaiGFM7pDQ1IrSpxy8pOzFUAsWyXHgIAg/zBXFyUFt/y8knCoCa4VJUWJTvk5KRDh4MwqYEgaG4B4RamQaEOJFY/8oswqoMLEHMeczPS8XGCSsVVyBpKpRUoKYalFJZnJWKVgTrRVgqQNdNc5VSqkJKbmZOYS4TwjWjrPGBGkMAoAAAD//w=="; |
|
| 35 |
//public string appovalData = "eJyycS/KTFHwS8xNtVVKBAMlhYrcnLxiW6WMkpICK3394uSM1NzEYr3czOSi/OL8tBK95Pxc/fLMvLQKfSMDAzP9isTcHP2CotTi1LySxJLM/DwlOxuQqXpOicnZ6UX5pXkpdjbB+TmZKc75OflFTkWlxRkKYKatkrIbFCgp+BckJmeWVNoqGegZKino29noYxgSlJpckpiXnpOqEFxSlFqSnGGr5JaZk6ME4uZnp0KNMwACmFBIRmZydl5qMdA7pjAxn8y8VK/8zDxbpSCQsUpQ38MNV1IIz0wpAZptZADU45GamZ5RYqtkYamk4JyYVwYMCZ/UNKCArpGeKVwoJL8AJqIP8T00DILyy11S0zLzMkEBUwz0AjIfbrgWWBt2OWM9U3zSBviljfBJaiGFM7pDQ1IrSpxy8pOzFUAsWyXHgIAg/zBXFyUFt/y8knCoCa4VJUWJTvk5KRDh4MwqYEgaG4B4RamQaEOJFY/8oswqoMLEHMeczPS8XGCSsVVyBpKpRUoKYalFJZnJWKVgTrRVgqQNdNc5VSqkJKbmZOYS4TwjWjrPGBGkMAoAAAD//w==";
|
|
| 36 | 36 |
public string ProjectNo = ""; |
| 37 | 37 |
|
| 38 | 38 |
#region 주석 |
| ... | ... | |
| 2803 | 2803 |
var unknownData = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(item); //복호화작업 |
| 2804 | 2804 |
return unknownData.Memo; |
| 2805 | 2805 |
} |
| 2806 |
|
|
| 2806 |
|
|
| 2807 | 2807 |
//프린트 |
| 2808 | 2808 |
public void markupParse(string MarkupString, Canvas Layer, string DisplayColor, string ToolTipMessage) |
| 2809 | 2809 |
{
|
| ... | ... | |
| 3328 | 3328 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
| 3329 | 3329 |
//instance.PathXathData = s.DBData; |
| 3330 | 3330 |
|
| 3331 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
|
| 3332 |
xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 3333 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
|
| 3334 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
|
| 3335 |
writer.Write(xamlData); |
|
| 3336 |
writer.Flush(); |
|
| 3337 |
stream.Position = 0; |
|
| 3331 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData);
|
|
| 3332 |
//xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 3333 |
//System.IO.MemoryStream stream = new System.IO.MemoryStream();
|
|
| 3334 |
//System.IO.StreamWriter writer = new System.IO.StreamWriter(stream);
|
|
| 3335 |
//writer.Write(xamlData);
|
|
| 3336 |
//writer.Flush();
|
|
| 3337 |
//stream.Position = 0;
|
|
| 3338 | 3338 |
|
| 3339 |
object obj = XamlReader.Load(stream); |
|
| 3340 |
instance.Base_ViewBox.Child = obj as UIElement; |
|
| 3341 |
instance.PathXathData = appovalData; |
|
| 3342 |
instance.SetViewBox(); |
|
| 3339 |
//object obj = XamlReader.Load(stream);
|
|
| 3340 |
//instance.Base_ViewBox.Child = obj as UIElement;
|
|
| 3341 |
//instance.PathXathData = appovalData;
|
|
| 3342 |
//instance.SetViewBox();
|
|
| 3343 | 3343 |
} |
| 3344 | 3344 |
break; |
| 3345 | 3345 |
#endregion |
| ... | ... | |
| 3773 | 3773 |
instance.UnderLine = TextDecorations.Underline; |
| 3774 | 3774 |
instance.Base_TextBlock.TextDecorations = instance.UnderLine; |
| 3775 | 3775 |
} |
| 3776 |
instance.Base_TextBlock.Margin = new Thickness(0,0,10,0);
|
|
| 3776 |
instance.Base_TextBlock.Margin = new Thickness(0, 0, 10, 0);
|
|
| 3777 | 3777 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 3778 | 3778 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 3779 | 3779 |
instance.DrawingCloud(); |
| ... | ... | |
| 3936 | 3936 |
break; |
| 3937 | 3937 |
#endregion |
| 3938 | 3938 |
#region Symbol |
| 3939 |
// case "SymControl": |
|
| 3940 |
// using (S_SymControl s = JsonSerializerHelper.JsonDeserialize<S_SymControl>(item)) |
|
| 3941 |
// {
|
|
| 3942 |
// string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 3943 |
// StringToPathConverter sm = new StringToPathConverter(); |
|
| 3944 |
// SymControl instance = new SymControl() |
|
| 3945 |
// {
|
|
| 3946 |
// LineSize = Convert.ToDouble(data2.First()), |
|
| 3947 |
// PointSet = s.PointSet, |
|
| 3948 |
// Paint = s.PaintState, |
|
| 3949 |
// StartPoint = s.StartPoint, |
|
| 3950 |
// StrokeColor = _SetColor, |
|
| 3951 |
// EndPoint = s.EndPoint, |
|
| 3952 |
// Angle = s.Angle, |
|
| 3953 |
// LeftBottomPoint = s.LB, |
|
| 3954 |
// TopRightPoint = s.TR, |
|
| 3955 |
// PathData = sm.Convert(s.PathInfo.ToString()), |
|
| 3956 |
// Opacity = s.Opac, |
|
| 3957 |
// }; |
|
| 3958 |
// //if (ToolTipService.GetToolTip(instance).ToString() == "") |
|
| 3959 |
// //{
|
|
| 3960 |
//#if SILVERLIGHT |
|
| 3961 |
// ToolTipService.SetToolTip(instance, UserNumber); |
|
| 3962 |
//#endif |
|
| 3963 |
// //} //조장원 |
|
| 3964 |
// Layer.Children.Add(instance); |
|
| 3965 |
// instance.ApplyTemplate(); |
|
| 3966 |
// instance.SetSymPath(); |
|
| 3967 |
// } |
|
| 3968 |
// break; |
|
| 3939 |
// case "SymControl":
|
|
| 3940 |
// using (S_SymControl s = JsonSerializerHelper.JsonDeserialize<S_SymControl>(item))
|
|
| 3941 |
// {
|
|
| 3942 |
// string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 3943 |
// StringToPathConverter sm = new StringToPathConverter();
|
|
| 3944 |
// SymControl instance = new SymControl()
|
|
| 3945 |
// {
|
|
| 3946 |
// LineSize = Convert.ToDouble(data2.First()),
|
|
| 3947 |
// PointSet = s.PointSet,
|
|
| 3948 |
// Paint = s.PaintState,
|
|
| 3949 |
// StartPoint = s.StartPoint,
|
|
| 3950 |
// StrokeColor = _SetColor,
|
|
| 3951 |
// EndPoint = s.EndPoint,
|
|
| 3952 |
// Angle = s.Angle,
|
|
| 3953 |
// LeftBottomPoint = s.LB,
|
|
| 3954 |
// TopRightPoint = s.TR,
|
|
| 3955 |
// PathData = sm.Convert(s.PathInfo.ToString()),
|
|
| 3956 |
// Opacity = s.Opac,
|
|
| 3957 |
// };
|
|
| 3958 |
// //if (ToolTipService.GetToolTip(instance).ToString() == "")
|
|
| 3959 |
// //{
|
|
| 3960 |
//#if SILVERLIGHT
|
|
| 3961 |
// ToolTipService.SetToolTip(instance, UserNumber);
|
|
| 3962 |
//#endif
|
|
| 3963 |
// //} //조장원
|
|
| 3964 |
// Layer.Children.Add(instance);
|
|
| 3965 |
// instance.ApplyTemplate();
|
|
| 3966 |
// instance.SetSymPath();
|
|
| 3967 |
// }
|
|
| 3968 |
// break;
|
|
| 3969 | 3969 |
#endregion |
| 3970 | 3970 |
#region Image |
| 3971 | 3971 |
case "ImgControl": |
| ... | ... | |
| 4021 | 4021 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
| 4022 | 4022 |
//instance.PathXathData = s.DBData; |
| 4023 | 4023 |
|
| 4024 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
|
| 4025 |
xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 4026 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
|
| 4027 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
|
| 4028 |
writer.Write(xamlData); |
|
| 4029 |
writer.Flush(); |
|
| 4030 |
stream.Position = 0; |
|
| 4024 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData);
|
|
| 4025 |
//xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 4026 |
//System.IO.MemoryStream stream = new System.IO.MemoryStream();
|
|
| 4027 |
//System.IO.StreamWriter writer = new System.IO.StreamWriter(stream);
|
|
| 4028 |
//writer.Write(xamlData);
|
|
| 4029 |
//writer.Flush();
|
|
| 4030 |
//stream.Position = 0;
|
|
| 4031 | 4031 |
|
| 4032 |
object obj = XamlReader.Load(stream); |
|
| 4033 |
instance.Base_ViewBox.Child = obj as UIElement; |
|
| 4034 |
instance.PathXathData = appovalData; |
|
| 4035 |
instance.SetViewBox(); |
|
| 4032 |
//object obj = XamlReader.Load(stream);
|
|
| 4033 |
//instance.Base_ViewBox.Child = obj as UIElement;
|
|
| 4034 |
//instance.PathXathData = appovalData;
|
|
| 4035 |
//instance.SetViewBox();
|
|
| 4036 | 4036 |
} |
| 4037 | 4037 |
break; |
| 4038 | 4038 |
#endregion |
| ... | ... | |
| 4155 | 4155 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
| 4156 | 4156 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
| 4157 | 4157 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 4158 |
|
|
| 4158 |
|
|
| 4159 | 4159 |
if (s.fontConfig.Count() == 5) |
| 4160 | 4160 |
{
|
| 4161 | 4161 |
instance.UnderLine = TextDecorations.Underline; |
| ... | ... | |
| 4390 | 4390 |
instance.Memo = s.Memo; |
| 4391 | 4391 |
//Layer.Children.Add(instance); |
| 4392 | 4392 |
instance.MarkupInfoID = markupInfoID; |
| 4393 |
baseLayer.Add(instance);
|
|
| 4394 |
instance.CommentID = commentId;
|
|
| 4393 |
baseLayer.Add(instance); |
|
| 4394 |
instance.CommentID = commentId; |
|
| 4395 | 4395 |
instance.PointSet = s.PointSet; |
| 4396 | 4396 |
instance.ApplyTemplate(); |
| 4397 | 4397 |
instance.ClosePath(); |
| ... | ... | |
| 4714 | 4714 |
instance.CommentID = commentId; |
| 4715 | 4715 |
instance.ApplyTemplate(); |
| 4716 | 4716 |
|
| 4717 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
|
| 4718 |
//instance.PathXathData = s.DBData; |
|
| 4719 |
|
|
| 4720 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
|
| 4717 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(instance.PathXathData); |
|
| 4721 | 4718 |
xamlData = xamlData.Replace("daelim", "DAELIM");
|
| 4722 | 4719 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
| 4723 | 4720 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
| ... | ... | |
| 4727 | 4724 |
|
| 4728 | 4725 |
object obj = XamlReader.Load(stream); |
| 4729 | 4726 |
instance.Base_ViewBox.Child = obj as UIElement; |
| 4730 |
instance.PathXathData = appovalData; |
|
| 4727 |
//instance.PathXathData = appovalData;
|
|
| 4731 | 4728 |
instance.SetViewBox(); |
| 4732 | 4729 |
} |
| 4733 | 4730 |
break; |
| ... | ... | |
| 4740 | 4737 |
} |
| 4741 | 4738 |
} |
| 4742 | 4739 |
|
| 4743 |
//강인구 추가(12/12)
|
|
| 4740 |
//강인구 추가(12/12)
|
|
| 4744 | 4741 |
public Control markupParse_Paste(string MarkupString, ObservableCollection<CommentUserInfo> baseLayer) |
| 4745 | 4742 |
{
|
| 4746 | 4743 |
//GetUserSign getUser = new GetUserSign(); |
| ... | ... | |
| 5096 | 5093 |
|
| 5097 | 5094 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 5098 | 5095 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 5099 |
|
|
| 5096 |
|
|
| 5100 | 5097 |
return_control = instance; |
| 5101 | 5098 |
} |
| 5102 | 5099 |
break; |
| ... | ... | |
| 5310 | 5307 |
} |
| 5311 | 5308 |
break; |
| 5312 | 5309 |
#endregion |
| 5313 |
|
|
| 5310 |
|
|
| 5314 | 5311 |
#region SymbolN |
| 5315 | 5312 |
case "SymControlN": |
| 5316 | 5313 |
using (S_SymControlN s = JsonSerializerHelper.JsonDeserialize<S_SymControlN>(item)) |
내보내기 Unified diff
