개정판 cd988cd8
issue #1119: Stamp string 를 가져와서 daelim replace 하는 부분을 묶고, ini 에서 replace 할 name 을 가져오도록 수정. User information 클릭 시 child 가 null 이여서 stamp 가 안보이는 현상 수정.
Change-Id: I520599b1b2740ad94319d96aa8d9ec93fa852162
| MarkupToPDF/Controls/Etc/SymControlN.cs | ||
|---|---|---|
| 237 | 237 |
pathFigure.IsClosed = true; |
| 238 | 238 |
pathGeometry.Figures.Add(pathFigure); |
| 239 | 239 |
this.Base_ViewBox.Width = pathGeometry.Bounds.Width; |
| 240 |
this.Base_ViewBox.Height = pathGeometry.Bounds.Height; ;
|
|
| 240 |
this.Base_ViewBox.Height = pathGeometry.Bounds.Height; |
|
| 241 | 241 |
this.Tag = pathGeometry; |
| 242 | 242 |
|
| 243 | 243 |
if(Base_ViewBox.Child == null) |
| ... | ... | |
| 250 | 250 |
} |
| 251 | 251 |
|
| 252 | 252 |
public void SetChild() |
| 253 |
{
|
|
| 254 |
//string appovalData = "eJyycS/KTFHwS8xNtVVKBAMlhYrcnLxiW6WMkpICK3394uSM1NzEYr3czOSi/OL8tBK95Pxc/fLMvLQKfSMDAzP9isTcHP2CotTi1LySxJLM/DwlOxuQqXpOicnZ6UX5pXkpdjbB+TmZKc75OflFTkWlxRkKYKatkrIbFCgp+BckJmeWVNoqGegZKino29noYxgSlJpckpiXnpOqEFxSlFqSnGGr5JaZk6ME4uZnp0KNMwACmFBIRmZydl5qMdA7pjAxn8y8VK/8zDxbpSCQsUpQ38MNV1IIz0wpAZptZADU45GamZ5RYqtkYamk4JyYVwYMCZ/UNKCArpGeKVwoJL8AJqIP8T00DILyy11S0zLzMkEBUwz0AjIfbrgWWBt2OWM9U3zSBviljfBJaiGFM7pDQ1IrSpxy8pOzFUAsWyXHgIAg/zBXFyUFt/y8knCoCa4VJUWJTvk5KRDh4MwqYEgaG4B4RamQaEOJFY/8oswqoMLEHMeczPS8XGCSsVVyBpKpRUoKYalFJZnJWKVgTrRVgqQNdNc5VSqkJKbmZOYS4TwjWjrPGBGkMAoAAAD//w=="; |
|
| 255 |
|
|
| 256 |
//var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(appovalData); |
|
| 257 |
//xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 258 |
////object obj = System.Windows.Markup.XamlReader.Load(xamlData); |
|
| 259 |
|
|
| 260 |
//System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
|
| 261 |
//System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
|
| 262 |
//writer.Write(xamlData); |
|
| 263 |
//writer.Flush(); |
|
| 264 |
//stream.Position = 0; |
|
| 265 |
|
|
| 266 |
//object obj = System.Windows.Markup.XamlReader.Load(stream); |
|
| 267 |
//UIElement ob = obj as UIElement; |
|
| 253 |
{
|
|
| 254 |
if(this.PathXathData != null) |
|
| 255 |
{
|
|
| 256 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStamp(this.PathXathData); |
|
| 257 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
|
| 258 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
|
| 259 |
writer.Write(xamlData); |
|
| 260 |
writer.Flush(); |
|
| 261 |
stream.Position = 0; |
|
| 268 | 262 |
|
| 269 |
//PathXathData = appovalData; |
|
| 270 |
//Base_ViewBox.Child = ob; |
|
| 263 |
object obj = System.Windows.Markup.XamlReader.Load(stream); |
|
| 264 |
UIElement ob = obj as UIElement; |
|
| 265 |
|
|
| 266 |
Base_ViewBox.Child = ob; |
|
| 267 |
} |
|
| 271 | 268 |
} |
| 272 | 269 |
|
| 273 | 270 |
public override bool IsSelected |
| ... | ... | |
| 347 | 344 |
{
|
| 348 | 345 |
if (this.StartPoint == this.EndPoint) |
| 349 | 346 |
{
|
| 350 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(this.STAMP); |
|
| 351 |
xamlData = xamlData.Replace("daelim", "DAELIM");
|
|
| 347 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStamp(this.STAMP); |
|
| 352 | 348 |
|
| 353 | 349 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
| 354 | 350 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
내보내기 Unified diff
