개정판 40b3ce25
issue #754 Arc Arrow Line Control 추가
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3112 | 3112 |
} |
| 3113 | 3113 |
break; |
| 3114 | 3114 |
#endregion |
| 3115 |
#endregion |
|
| 3115 |
#region ArrowArc |
|
| 3116 |
case "ArrowArcControl": |
|
| 3117 |
using (S_ArrowArcControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowArcControl>(item)) |
|
| 3118 |
{
|
|
| 3119 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 3120 |
ArrowArcControl instance = new ArrowArcControl() |
|
| 3121 |
{
|
|
| 3122 |
StartPoint = s.StartPoint, |
|
| 3123 |
EndPoint = s.EndPoint, |
|
| 3124 |
DashSize = s.DashSize, |
|
| 3125 |
PointSet = s.PointSet, |
|
| 3126 |
isTransOn = s.IsTransOn, |
|
| 3127 |
MidPoint = s.MidPoint, |
|
| 3128 |
StrokeColor = _SetColor, |
|
| 3129 |
Opacity = s.Opac, |
|
| 3130 |
Clock = s.Clock, |
|
| 3131 |
LineSize = Convert.ToDouble(data2.First()), |
|
| 3132 |
UserID = s.UserID, |
|
| 3133 |
}; |
|
| 3116 | 3134 |
|
| 3135 |
Layer.Children.Add(instance); |
|
| 3136 |
instance.ApplyTemplate(); |
|
| 3137 |
instance.SetArcPath(); |
|
| 3138 |
} |
|
| 3139 |
break; |
|
| 3140 |
#endregion |
|
| 3141 |
#endregion |
|
| 3117 | 3142 |
#region Text |
| 3118 | 3143 |
case "TextControl": |
| 3119 | 3144 |
using (S_TextControl s = JsonSerializerHelper.JsonDeserialize<S_TextControl>(item)) |
| ... | ... | |
| 3810 | 3835 |
} |
| 3811 | 3836 |
break; |
| 3812 | 3837 |
#endregion |
| 3838 |
#region ArrowArc |
|
| 3839 |
case "ArrowArcControl": |
|
| 3840 |
using (S_ArrowArcControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowArcControl>(item)) |
|
| 3841 |
{
|
|
| 3842 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 3843 |
ArrowArcControl instance = new ArrowArcControl() |
|
| 3844 |
{
|
|
| 3845 |
StartPoint = s.StartPoint, |
|
| 3846 |
EndPoint = s.EndPoint, |
|
| 3847 |
DashSize = s.DashSize, |
|
| 3848 |
PointSet = s.PointSet, |
|
| 3849 |
isTransOn = s.IsTransOn, |
|
| 3850 |
MidPoint = s.MidPoint, |
|
| 3851 |
StrokeColor = _SetColor, |
|
| 3852 |
Clock = s.Clock, |
|
| 3853 |
Opacity = s.Opac, |
|
| 3854 |
LineSize = Convert.ToDouble(data2.First()), |
|
| 3855 |
UserID = s.UserID, |
|
| 3856 |
}; |
|
| 3857 |
instance.Memo = s.Memo; |
|
| 3858 |
//Layer.Children.Add(instance); |
|
| 3859 |
instance.MarkupInfoID = markupInfoID; |
|
| 3860 |
baseLayer.Add(instance); |
|
| 3861 |
instance.ApplyTemplate(); |
|
| 3862 |
instance.SetArcPath(); |
|
| 3863 |
} |
|
| 3864 |
break; |
|
| 3865 |
#endregion |
|
| 3813 | 3866 |
#region RectCloud |
| 3814 | 3867 |
case "RectCloudControl": |
| 3815 | 3868 |
using (S_RectCloudControl s = JsonSerializerHelper.JsonDeserialize<S_RectCloudControl>(item)) |
| ... | ... | |
| 4511 | 4564 |
} |
| 4512 | 4565 |
break; |
| 4513 | 4566 |
#endregion |
| 4567 |
#region ArrowArc |
|
| 4568 |
case "ArrowArcControl": |
|
| 4569 |
using (S_ArrowArcControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowArcControl>(item)) |
|
| 4570 |
{
|
|
| 4571 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 4572 |
ArrowArcControl instance = new ArrowArcControl() |
|
| 4573 |
{
|
|
| 4574 |
StartPoint = s.StartPoint, |
|
| 4575 |
EndPoint = s.EndPoint, |
|
| 4576 |
DashSize = s.DashSize, |
|
| 4577 |
PointSet = s.PointSet, |
|
| 4578 |
isTransOn = s.IsTransOn, |
|
| 4579 |
MidPoint = s.MidPoint, |
|
| 4580 |
StrokeColor = _SetColor, |
|
| 4581 |
Clock = s.Clock, |
|
| 4582 |
Opacity = s.Opac, |
|
| 4583 |
LineSize = Convert.ToDouble(data2.First()), |
|
| 4584 |
UserID = s.UserID, |
|
| 4585 |
}; |
|
| 4586 |
instance.Memo = s.Memo; |
|
| 4587 |
//Layer.Children.Add(instance); |
|
| 4588 |
instance.MarkupInfoID = markupInfoID; |
|
| 4589 |
baseLayer.Add(instance); |
|
| 4590 |
instance.CommentID = commentId; |
|
| 4591 |
instance.ApplyTemplate(); |
|
| 4592 |
instance.SetArcPath(); |
|
| 4593 |
} |
|
| 4594 |
break; |
|
| 4595 |
#endregion |
|
| 4596 |
|
|
| 4514 | 4597 |
#region RectCloud |
| 4515 | 4598 |
case "RectCloudControl": |
| 4516 | 4599 |
using (S_RectCloudControl s = JsonSerializerHelper.JsonDeserialize<S_RectCloudControl>(item)) |
| ... | ... | |
| 5041 | 5124 |
} |
| 5042 | 5125 |
break; |
| 5043 | 5126 |
#endregion |
| 5044 |
#endregion |
|
| 5127 |
#region ArrowArc |
|
| 5128 |
case "ArrowArcControl": |
|
| 5129 |
using (S_ArrowArcControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowArcControl>(item)) |
|
| 5130 |
{
|
|
| 5131 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 5132 |
ArrowArcControl instance = new ArrowArcControl() |
|
| 5133 |
{
|
|
| 5134 |
StartPoint = s.StartPoint, |
|
| 5135 |
EndPoint = s.EndPoint, |
|
| 5136 |
DashSize = s.DashSize, |
|
| 5137 |
PointSet = s.PointSet, |
|
| 5138 |
isTransOn = s.IsTransOn, |
|
| 5139 |
MidPoint = s.MidPoint, |
|
| 5140 |
StrokeColor = _SetColor, |
|
| 5141 |
Opacity = s.Opac, |
|
| 5045 | 5142 |
|
| 5143 |
Clock = s.Clock, |
|
| 5144 |
LineSize = Convert.ToDouble(data2.First()), |
|
| 5145 |
UserID = s.UserID, |
|
| 5146 |
}; |
|
| 5147 |
baseLayer.Add(instance); |
|
| 5148 |
instance.ApplyTemplate(); |
|
| 5149 |
instance.OnApplyTemplate(); |
|
| 5150 |
instance.SetArcPath(); |
|
| 5151 |
return_control = instance; |
|
| 5152 |
} |
|
| 5153 |
break; |
|
| 5154 |
#endregion |
|
| 5155 |
#endregion |
|
| 5046 | 5156 |
#region Text |
| 5047 | 5157 |
case "TextControl": |
| 5048 | 5158 |
using (S_TextControl s = JsonSerializerHelper.JsonDeserialize<S_TextControl>(item)) |
| ... | ... | |
| 5795 | 5905 |
} |
| 5796 | 5906 |
break; |
| 5797 | 5907 |
#endregion |
| 5908 |
#region Arc |
|
| 5909 |
case "ArrowArcControl": |
|
| 5910 |
using (S_ArrowArcControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowArcControl>(item)) |
|
| 5911 |
{
|
|
| 5912 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 5913 |
ArrowArcControl instance = new ArrowArcControl() |
|
| 5914 |
{
|
|
| 5915 |
StartPoint = s.StartPoint, |
|
| 5916 |
EndPoint = s.EndPoint, |
|
| 5917 |
DashSize = s.DashSize, |
|
| 5918 |
PointSet = s.PointSet, |
|
| 5919 |
isTransOn = s.IsTransOn, |
|
| 5920 |
MidPoint = s.MidPoint, |
|
| 5921 |
StrokeColor = _SetColor, |
|
| 5922 |
Clock = s.Clock, |
|
| 5923 |
Opacity = s.Opac, |
|
| 5924 |
LineSize = Convert.ToDouble(data2.First()), |
|
| 5925 |
UserID = s.UserID, |
|
| 5926 |
}; |
|
| 5927 |
instance.Memo = s.Memo; |
|
| 5928 |
//Layer.Children.Add(instance); |
|
| 5929 |
instance.MarkupInfoID = markupInfoID; |
|
| 5930 |
baseLayer.Add(instance); |
|
| 5931 |
instance.CommentID = commentId; |
|
| 5932 |
instance.ApplyTemplate(); |
|
| 5933 |
instance.SetArcPath(); |
|
| 5934 |
return_control = instance; |
|
| 5935 |
} |
|
| 5936 |
break; |
|
| 5937 |
#endregion |
|
| 5798 | 5938 |
#region RectCloud |
| 5799 | 5939 |
case "RectCloudControl": |
| 5800 | 5940 |
using (S_RectCloudControl s = JsonSerializerHelper.JsonDeserialize<S_RectCloudControl>(item)) |
내보내기 Unified diff
