개정판 40d88a02
issue #1014: Highlight Text 오류
Change-Id: Id580d04582d21f977634ce89d5eb7364ce34cbd1
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 28 | 28 |
using MarkupToPDF.Common; |
| 29 | 29 |
using Svg2Xaml; |
| 30 | 30 |
using MarkupToPDF.Controls.Cad; |
| 31 |
using MarkupToPDF.Controls.Common; |
|
| 31 | 32 |
|
| 32 | 33 |
namespace MarkupToPDF.Controls.Parsing |
| 33 | 34 |
{
|
| ... | ... | |
| 3161 | 3162 |
FontColor = _SetColor, |
| 3162 | 3163 |
FontSize = 10, |
| 3163 | 3164 |
UserID = s.UserID, |
| 3164 |
//isHighLight = s.isHighLight,
|
|
| 3165 |
IsHighLight = s.isHighLight,
|
|
| 3165 | 3166 |
Angle = s.Angle, |
| 3166 | 3167 |
PointSet = s.PointSet, |
| 3167 | 3168 |
Opacity = s.Opac, |
| 3168 | 3169 |
TextFamily = new FontFamily(s.fontConfig[0]), |
| 3169 |
//인구 추가(2018.04.17) |
|
| 3170 | 3170 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
| 3171 | 3171 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
| 3172 | 3172 |
}; |
| ... | ... | |
| 4757 | 4757 |
FontColor = _SetColor, |
| 4758 | 4758 |
//FontSize = 10, |
| 4759 | 4759 |
UserID = s.UserID, |
| 4760 |
//isHighLight = s.isHighLight,
|
|
| 4760 |
IsHighLight = s.isHighLight,
|
|
| 4761 | 4761 |
Angle = s.Angle, |
| 4762 | 4762 |
PointSet = s.PointSet, |
| 4763 | 4763 |
Opacity = s.Opac, |
| ... | ... | |
| 5583 | 5583 |
FontColor = _SetColor, |
| 5584 | 5584 |
FontSize = 10, |
| 5585 | 5585 |
UserID = s.UserID, |
| 5586 |
//isHighLight = s.isHighLight,
|
|
| 5586 |
IsHighLight = s.isHighLight,
|
|
| 5587 | 5587 |
Angle = s.Angle, |
| 5588 | 5588 |
PointSet = s.PointSet, |
| 5589 | 5589 |
Opacity = s.Opac, |
| ... | ... | |
| 5591 | 5591 |
//인구 추가(2018.04.17) |
| 5592 | 5592 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
| 5593 | 5593 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
| 5594 |
}; |
|
| 5594 |
};
|
|
| 5595 | 5595 |
|
| 5596 | 5596 |
if (instance.Text != null) |
| 5597 | 5597 |
{
|
| ... | ... | |
| 6358 | 6358 |
using (S_TextControl s = JsonSerializerHelper.JsonDeserialize<S_TextControl>(item)) |
| 6359 | 6359 |
{
|
| 6360 | 6360 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 6361 |
TextControl instance = new TextControl() |
|
| 6362 |
{
|
|
| 6363 |
Text = s.Text, |
|
| 6364 |
StartPoint = s.StartPoint, |
|
| 6365 |
EndPoint = s.EndPoint, |
|
| 6366 |
CanvasX = s.StartPoint.X, |
|
| 6367 |
CanvasY = s.StartPoint.Y, |
|
| 6368 |
BoxWidth = s.BoxW, |
|
| 6369 |
BoxHeight = s.BoxH, |
|
| 6370 |
ControlType_No = s.paintMethod, |
|
| 6371 |
LineSize = new Thickness(Convert.ToDouble(data2.First())), |
|
| 6372 |
TextSize = Convert.ToDouble(data2[1]), |
|
| 6373 |
FontColor = _SetColor, |
|
| 6374 |
//FontSize = 10, |
|
| 6375 |
UserID = s.UserID, |
|
| 6376 |
//isHighLight = s.isHighLight, |
|
| 6377 |
Angle = s.Angle, |
|
| 6378 |
PointSet = s.PointSet, |
|
| 6379 |
Opacity = s.Opac, |
|
| 6380 |
TextFamily = new FontFamily(s.fontConfig[0]), |
|
| 6381 |
//인구 추가(2018.04.17) |
|
| 6382 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 6383 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 6384 |
}; |
|
| 6361 |
TextControl instance = new TextControl(); |
|
| 6362 |
|
|
| 6363 |
instance.Text = s.Text; |
|
| 6364 |
instance.StartPoint = s.StartPoint; |
|
| 6365 |
instance.EndPoint = s.EndPoint; |
|
| 6366 |
instance.CanvasX = s.StartPoint.X; |
|
| 6367 |
instance.CanvasY = s.StartPoint.Y; |
|
| 6368 |
instance.BoxWidth = s.BoxW; |
|
| 6369 |
instance.BoxHeight = s.BoxH; |
|
| 6370 |
instance.ControlType_No = s.paintMethod; |
|
| 6371 |
instance.LineSize = new Thickness(Convert.ToDouble(data2.First())); |
|
| 6372 |
instance.TextSize = Convert.ToDouble(data2[1]); |
|
| 6373 |
instance.FontColor = _SetColor; |
|
| 6374 |
//FontSize = 10, |
|
| 6375 |
instance.UserID = s.UserID; |
|
| 6376 |
instance.IsHighLight = s.isHighLight; |
|
| 6377 |
instance.Angle = s.Angle; |
|
| 6378 |
instance.PointSet = s.PointSet; |
|
| 6379 |
instance.Opacity = s.Opac; |
|
| 6380 |
instance.TextFamily = new FontFamily(s.fontConfig[0]); |
|
| 6381 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 6382 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 6385 | 6383 |
|
| 6386 | 6384 |
if (instance.Text != null) |
| 6387 | 6385 |
{
|
내보내기 Unified diff
