개정판 f8769f8a
issue #768 textbox line size 변경이 안되는 현상
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 746 | 746 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Shape.CircleControl).LineSize = ViewerDataModel.Instance.LineSize; |
| 747 | 747 |
} |
| 748 | 748 |
break; |
| 749 |
case ("ArrowTextControl"):
|
|
| 750 |
{
|
|
| 751 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).LineSize = ViewerDataModel.Instance.LineSize; |
|
| 752 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).BorderSize = new Thickness(ViewerDataModel.Instance.LineSize); |
|
| 753 |
} |
|
| 754 |
break; |
|
| 755 |
case ("TextControl"):
|
|
| 756 |
{
|
|
| 757 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).LineSize = new Thickness(ViewerDataModel.Instance.LineSize); |
|
| 758 |
} |
|
| 759 |
break; |
|
| 749 | 760 |
} |
| 750 | 761 |
|
| 751 | 762 |
|
| ... | ... | |
| 945 | 956 |
{
|
| 946 | 957 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Shape.CircleControl).DashSize = (cbDashStyle.SelectedValue as DashStyle).dashData; |
| 947 | 958 |
} |
| 948 |
break; |
|
| 959 |
break;
|
|
| 949 | 960 |
} |
| 950 | 961 |
|
| 951 | 962 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
| MarkupToPDF/Controls/Parsing/MarkupCopy.cs | ||
|---|---|---|
| 1029 | 1029 |
///강인구 추가(2017.11.02) |
| 1030 | 1030 |
///Memo 추가 |
| 1031 | 1031 |
STemp.Memo = instance.Memo; |
| 1032 |
|
|
| 1032 |
STemp.BorderSize = instance.BorderSize; |
|
| 1033 | 1033 |
///강인구 추가(2017.11.02) |
| 1034 | 1034 |
///DATA_TYPE추가로 인한 클래스 변수 대입 |
| 1035 | 1035 |
//ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize())); |
| ... | ... | |
| 1646 | 1646 |
{
|
| 1647 | 1647 |
STemp.fontConfig.Add("true");
|
| 1648 | 1648 |
} |
| 1649 |
|
|
| 1649 |
STemp.BorderSize = instance.BorderSize; |
|
| 1650 | 1650 |
ConvertData += "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize())); |
| 1651 | 1651 |
}; |
| 1652 | 1652 |
break; |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3194 | 3194 |
case "ArrowTextControl": |
| 3195 | 3195 |
using (S_ArrowTextControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowTextControl>(item)) |
| 3196 | 3196 |
{
|
| 3197 |
//string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 3197 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 3198 | 3198 |
ArrowTextControl instance = new ArrowTextControl(); |
| 3199 | 3199 |
Layer.Children.Add(instance); |
| 3200 |
//instance.LineSize = Convert.ToDouble(data2.First());
|
|
| 3200 |
instance.LineSize = Convert.ToDouble(data2.First()); |
|
| 3201 | 3201 |
instance.PointSet = s.PointSet; |
| 3202 | 3202 |
instance.StartPoint = s.StartPoint; |
| 3203 | 3203 |
instance.EndPoint = s.EndPoint; |
| ... | ... | |
| 3455 | 3455 |
case "ArrowTextControl": |
| 3456 | 3456 |
using (S_ArrowTextControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowTextControl>(item)) |
| 3457 | 3457 |
{
|
| 3458 |
//string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 3458 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 3459 | 3459 |
ArrowTextControl instance = new ArrowTextControl(); |
| 3460 | 3460 |
instance.MarkupInfoID = markupInfoID; |
| 3461 | 3461 |
//Layer.Children.Add(instance); |
| 3462 | 3462 |
baseLayer.Add(instance); |
| 3463 |
//instance.LineSize = Convert.ToDouble(data2.First());
|
|
| 3463 |
instance.LineSize = Convert.ToDouble(data2.First()); |
|
| 3464 | 3464 |
instance.PointSet = s.PointSet; |
| 3465 | 3465 |
instance.StartPoint = s.StartPoint; |
| 3466 | 3466 |
instance.EndPoint = s.EndPoint; |
| ... | ... | |
| 4164 | 4164 |
|
| 4165 | 4165 |
|
| 4166 | 4166 |
#region 신규 |
| 4167 |
//string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 4167 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 4168 | 4168 |
ArrowTextControl instance = new ArrowTextControl(); |
| 4169 | 4169 |
instance.MarkupInfoID = markupInfoID; |
| 4170 | 4170 |
//Layer.Children.Add(instance); |
| 4171 | 4171 |
baseLayer.Add(instance); |
| 4172 | 4172 |
instance.ApplyTemplate(); |
| 4173 |
//instance.LineSize = Convert.ToDouble(data2.First());
|
|
| 4173 |
instance.LineSize = Convert.ToDouble(data2.First()); |
|
| 4174 | 4174 |
instance.PointSet = s.PointSet; |
| 4175 | 4175 |
instance.StartPoint = s.StartPoint; |
| 4176 | 4176 |
instance.EndPoint = s.EndPoint; |
| ... | ... | |
| 5210 | 5210 |
case "ArrowTextControl": |
| 5211 | 5211 |
using (S_ArrowTextControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowTextControl>(item)) |
| 5212 | 5212 |
{
|
| 5213 |
//string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 5213 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 5214 | 5214 |
ArrowTextControl instance = new ArrowTextControl(); |
| 5215 |
//instance.LineSize = Convert.ToDouble(data2.First());
|
|
| 5215 |
instance.LineSize = Convert.ToDouble(data2.First()); |
|
| 5216 | 5216 |
instance.PointSet = s.PointSet; |
| 5217 | 5217 |
instance.StartPoint = s.StartPoint; |
| 5218 | 5218 |
instance.EndPoint = s.EndPoint; |
| ... | ... | |
| 5494 | 5494 |
using (S_ArrowTextControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowTextControl>(item)) |
| 5495 | 5495 |
{
|
| 5496 | 5496 |
#region 신규 |
| 5497 |
//string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 5497 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 5498 | 5498 |
ArrowTextControl instance = new ArrowTextControl(); |
| 5499 | 5499 |
instance.MarkupInfoID = markupInfoID; |
| 5500 | 5500 |
//Layer.Children.Add(instance); |
| 5501 | 5501 |
baseLayer.Add(instance); |
| 5502 | 5502 |
instance.ApplyTemplate(); |
| 5503 |
//instance.LineSize = Convert.ToDouble(data2.First());
|
|
| 5503 |
instance.LineSize = Convert.ToDouble(data2.First()); |
|
| 5504 | 5504 |
instance.PointSet = s.PointSet; |
| 5505 | 5505 |
instance.StartPoint = s.StartPoint; |
| 5506 | 5506 |
instance.EndPoint = s.EndPoint; |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 680 | 680 |
"isTrans", typeof(bool), typeof(ArrowTextControl), new PropertyMetadata(false, PointValueChanged)); |
| 681 | 681 |
|
| 682 | 682 |
public static readonly DependencyProperty BorderSizeProperty = DependencyProperty.Register( |
| 683 |
"BorderSize", typeof(Thickness), typeof(ArrowTextControl), new PropertyMetadata(null));
|
|
| 683 |
"BorderSize", typeof(Thickness), typeof(ArrowTextControl), new PropertyMetadata(new Thickness(0), PointValueChanged));
|
|
| 684 | 684 |
|
| 685 | 685 |
public static readonly DependencyProperty ArrowTextProperty = DependencyProperty.Register( |
| 686 | 686 |
"ArrowText", typeof(string), typeof(ArrowTextControl), new PropertyMetadata(null)); |
| ... | ... | |
| 1494 | 1494 |
break; |
| 1495 | 1495 |
default: |
| 1496 | 1496 |
{
|
| 1497 |
this.BorderSize = new Thickness(3); //올라
|
|
| 1497 |
this.BorderSize = new Thickness(LineSize); //올라
|
|
| 1498 | 1498 |
DrawingRect(); |
| 1499 | 1499 |
} |
| 1500 | 1500 |
|
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 561 | 561 |
"UnderLine", typeof(TextDecorationCollection), typeof(TextControl), new PropertyMetadata(null)); |
| 562 | 562 |
|
| 563 | 563 |
public static readonly DependencyProperty LineSizeProperty = DependencyProperty.Register( |
| 564 |
"LineSize", typeof(Thickness), typeof(TextControl), new PropertyMetadata(new Thickness(4)));
|
|
| 564 |
"LineSize", typeof(Thickness), typeof(TextControl), new PropertyMetadata(new Thickness(4), PointValueChanged)); //여기만 4인지 모르겠지만 4 그대로 두겠음
|
|
| 565 | 565 |
|
| 566 | 566 |
public static readonly DependencyProperty PointSetProperty = DependencyProperty.Register( |
| 567 | 567 |
"PointSet", typeof(List<Point>), typeof(TextControl), new PropertyMetadata(new List<Point>())); |
내보내기 Unified diff
