개정판 d4b0c723
- 상단 네비게이션 변경
- 상단 기능에 대한 Undo Redo 기능 추가
- Text Style 저장 및 불러오기 오류 수정
- FinalPDF시 Text Style 적용 되도록 수정
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3137 | 3137 |
PointSet = s.PointSet, |
| 3138 | 3138 |
Opacity = s.Opac, |
| 3139 | 3139 |
TextFamily = new FontFamily(s.fontConfig[0]), |
| 3140 |
//TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 3141 |
//TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 3140 |
//인구 추가(2018.04.17) |
|
| 3141 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 3142 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 3142 | 3143 |
}; |
| 3143 | 3144 |
|
| 3144 | 3145 |
if (instance.Text != null) |
| ... | ... | |
| 3197 | 3198 |
s.fontConfig.Add("30");
|
| 3198 | 3199 |
} |
| 3199 | 3200 |
instance.TextFamily = new FontFamily(s.fontConfig[0]); |
| 3200 |
//instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 3201 |
//instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 3201 |
//인구 추가(2018.04.17) |
|
| 3202 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 3203 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 3202 | 3204 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 3203 | 3205 |
instance.ApplyTemplate(); |
| 3204 | 3206 |
instance.SetArrowTextPath(); |
| ... | ... | |
| 3453 | 3455 |
s.fontConfig.Add("30");
|
| 3454 | 3456 |
} |
| 3455 | 3457 |
instance.TextFamily = new FontFamily(s.fontConfig[0]); |
| 3456 |
//instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 3457 |
//instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 3458 |
//인구 추가(2018.04.17) |
|
| 3459 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 3460 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 3458 | 3461 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 3459 | 3462 |
instance.ApplyTemplate(); |
| 3460 | 3463 |
instance.SetArrowTextPath(); |
| ... | ... | |
| 3736 | 3739 |
PointSet = s.PointSet, |
| 3737 | 3740 |
Opacity = s.Opac, |
| 3738 | 3741 |
TextFamily = new FontFamily(s.fontConfig[0]), |
| 3739 |
//TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 3740 |
//TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 3742 |
//인구 추가(2018.04.17) |
|
| 3743 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 3744 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 3741 | 3745 |
}; |
| 3742 | 3746 |
|
| 3743 | 3747 |
if (instance.Text != null) |
| ... | ... | |
| 4130 | 4134 |
} |
| 4131 | 4135 |
|
| 4132 | 4136 |
instance.TextFamily = new FontFamily(s.fontConfig[0]); |
| 4137 |
//인구 추가(2018.04.17) |
|
| 4138 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 4139 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 4133 | 4140 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 4134 | 4141 |
instance.SetArrowTextPath(); |
| 4135 | 4142 |
instance.Base_TextBox.IsHitTestVisible = false; |
| ... | ... | |
| 4422 | 4429 |
PointSet = s.PointSet, |
| 4423 | 4430 |
Opacity = s.Opac, |
| 4424 | 4431 |
TextFamily = new FontFamily(s.fontConfig[0]), |
| 4425 |
//TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 4426 |
//TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 4432 |
//인구 추가(2018.04.17) |
|
| 4433 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 4434 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 4427 | 4435 |
}; |
| 4428 | 4436 |
|
| 4429 | 4437 |
if (instance.Text != null) |
| ... | ... | |
| 5041 | 5049 |
PointSet = s.PointSet, |
| 5042 | 5050 |
Opacity = s.Opac, |
| 5043 | 5051 |
TextFamily = new FontFamily(s.fontConfig[0]), |
| 5044 |
//TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 5045 |
//TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 5052 |
//인구 추가(2018.04.17) |
|
| 5053 |
TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]), |
|
| 5054 |
TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]), |
|
| 5046 | 5055 |
}; |
| 5047 | 5056 |
|
| 5048 | 5057 |
if (instance.Text != null) |
| ... | ... | |
| 5102 | 5111 |
s.fontConfig.Add("30");
|
| 5103 | 5112 |
} |
| 5104 | 5113 |
instance.TextFamily = new FontFamily(s.fontConfig[0]); |
| 5105 |
//instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 5106 |
//instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 5114 |
//인구 추가(2018.04.17) |
|
| 5115 |
instance.TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]); |
|
| 5116 |
instance.TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]); |
|
| 5107 | 5117 |
instance.TextSize = Convert.ToDouble(s.fontConfig[3]); |
| 5108 | 5118 |
baseLayer.Add(instance); |
| 5109 | 5119 |
instance.ApplyTemplate(); |
내보내기 Unified diff
