개정판 4f017ed3
Final ArrowTextControl 수정
Change-Id: Ifdd9876909e6a4ce288d70acb74a00b37e88e6a0
MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
---|---|---|
78 | 78 |
Base_TextBox.LostFocus += new RoutedEventHandler(Base_TextBox_LostFocus); |
79 | 79 |
Base_TextBox.SelectionChanged += (sender, e) => MoveCustomCaret(); |
80 | 80 |
this.KeyDown += ArrowTextControl_KeyDown; |
81 |
SetArrowTextPath(); |
|
81 | ||
82 |
SetArrowTextPath(true); |
|
83 | ||
82 | 84 |
Base_TextBox.IsTabStop = true; |
83 | 85 |
} |
84 | 86 | |
... | ... | |
980 | 982 |
Base_TextBox.Margin.Right + 4, Base_TextBox.Margin.Bottom + 4); |
981 | 983 |
} |
982 | 984 | |
983 |
private void SetArrowTextPath() |
|
985 |
private void SetArrowTextPath(bool IsInit = false)
|
|
984 | 986 |
{ |
985 | 987 |
instanceGroup.Children.Clear(); |
986 | 988 | |
... | ... | |
1357 | 1359 |
OverViewEndPoint = connectorMEGeometry.EndPoint; |
1358 | 1360 |
OverViewStartPoint = connectorSMGeometry.StartPoint; |
1359 | 1361 | |
1360 |
var tempAngle = Math.Abs(this.PageAngle); |
|
1362 |
var tempAngle = Math.Abs(this.VisualPageAngle);
|
|
1361 | 1363 | |
1362 | 1364 |
if (tempAngle == Convert.ToDouble(90) || tempAngle == Convert.ToDouble(270)) |
1363 | 1365 |
{ |
... | ... | |
1845 | 1847 |
/// </summary> |
1846 | 1848 |
/// <param name="str"></param> |
1847 | 1849 |
/// <returns></returns> |
1848 |
public static ArrowTextControl FromString(string str, SolidColorBrush brush, string sProjectNo) |
|
1850 |
public static ArrowTextControl FromString(string str, SolidColorBrush brush, string sProjectNo,double PageAngle)
|
|
1849 | 1851 |
{ |
1850 | 1852 |
ArrowTextControl instance = null; |
1851 | 1853 |
using (S_ArrowTextControl s = JsonSerializerHelper.JsonDeserialize<S_ArrowTextControl>(str)) |
1852 | 1854 |
{ |
1853 | 1855 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
1854 | 1856 |
instance = new ArrowTextControl(); |
1857 |
instance.PageAngle = s.Angle; |
|
1855 | 1858 |
instance.LineSize = Convert.ToDouble(data2.First()); |
1856 | 1859 |
instance.PointSet = s.PointSet; |
1857 | 1860 |
instance.StartPoint = s.StartPoint; |
... | ... | |
1866 | 1869 |
instance.BoxWidth = s.BoxWidth; |
1867 | 1870 |
instance.BoxHeight = s.BoxHeight; |
1868 | 1871 |
instance.isFixed = s.isFixed; |
1869 |
instance.PageAngle = s.Angle;
|
|
1872 |
//instance.VisualPageAngle = s.Angle;
|
|
1870 | 1873 |
instance.UserID = s.UserID; |
1871 | 1874 |
instance.isTrans = s.isTrans; |
1872 | 1875 |
instance.MidPoint = s.MidPoint; |
내보내기 Unified diff