개정판 15bbef90
Issue #0001 Angle 수정 중단
Change-Id: I58a1524f2db148fe507627d1e4e84722c595d6c0
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 995 | 995 |
if (reSizePoint != new Point(0, 0)) |
| 996 | 996 |
{
|
| 997 | 997 |
MyThumb thumb = sender as MyThumb; |
| 998 |
|
|
| 999 |
//Point setPoint = Mouse.GetPosition(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanCanvas); |
|
| 1000 |
|
|
| 998 | 1001 |
Point setPoint = new Point(Canvas.GetLeft(thumb), Canvas.GetTop(thumb)); |
| 1002 |
|
|
| 1003 |
System.Diagnostics.Debug.WriteLine($"1. GetPoint : {GetPosition(thumb).X},{GetPosition(thumb).Y}");
|
|
| 1004 |
|
|
| 999 | 1005 |
thumb.Translate(e.HorizontalChange, e.VerticalChange, this.AngleValue); |
| 1000 | 1006 |
|
| 1001 | 1007 |
AdornerMember control = (from userThumb in this.Members |
| ... | ... | |
| 1003 | 1009 |
select userThumb).FirstOrDefault(); |
| 1004 | 1010 |
|
| 1005 | 1011 |
IPath AllControl = control.DrawingData as IPath; |
| 1012 |
|
|
| 1013 |
System.Diagnostics.Debug.WriteLine($"2. GetPoint : {GetPosition(thumb).X},{GetPosition(thumb).Y}");
|
|
| 1014 |
|
|
| 1015 |
//System.Diagnostics.Debug.WriteLine($"ResizeTm_DragDelta setPoint : {setPoint.X},{setPoint.Y} - {e.HorizontalChange},{e.VerticalChange}");
|
|
| 1006 | 1016 |
((control.DrawingData) as CommentUserInfo).OnMoveCtrlPoint(setPoint, e.HorizontalChange, e.VerticalChange); |
| 1017 |
System.Diagnostics.Debug.WriteLine($"3. GetPoint : {GetPosition(thumb).X},{GetPosition(thumb).Y}");
|
|
| 1007 | 1018 |
control.UpdateThumb(); |
| 1019 |
|
|
| 1020 |
System.Diagnostics.Debug.WriteLine($"4. GetPoint : {GetPosition(thumb).X},{GetPosition(thumb).Y}");
|
|
| 1008 | 1021 |
this.BorderUpdate(); |
| 1022 |
|
|
| 1023 |
System.Diagnostics.Debug.WriteLine($"5. GetPoint : {GetPosition(thumb).X},{GetPosition(thumb).Y}");
|
|
| 1009 | 1024 |
} |
| 1010 | 1025 |
} |
| 1011 | 1026 |
|
| 1027 |
private Point GetPosition(Thumb thumb) |
|
| 1028 |
{
|
|
| 1029 |
return new Point(Canvas.GetLeft(thumb), Canvas.GetTop(thumb)); |
|
| 1030 |
} |
|
| 1031 |
|
|
| 1012 | 1032 |
#endregion |
| 1013 | 1033 |
#region 이벤트 |
| 1014 | 1034 |
|
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
| 14 | 14 |
</PropertyGroup> |
| 15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments>
|
|
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDAwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
| 17 | 17 |
</PropertyGroup> |
| 18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| KCOM_API/Web.config | ||
|---|---|---|
| 10 | 10 |
</sectionGroup> |
| 11 | 11 |
</configSections> |
| 12 | 12 |
<connectionStrings> |
| 13 |
<add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=DESKTOP-DOUFJUT;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/>
|
|
| 14 |
<add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=DESKTOP-DOUFJUT;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/>
|
|
| 13 |
<add name="ConnectionString" connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/>
|
|
| 14 |
<add name="CIConnectionString" connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/>
|
|
| 15 | 15 |
</connectionStrings> |
| 16 | 16 |
|
| 17 | 17 |
<!-- |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 1005 | 1005 |
/// 텍스트박스의 좌표 설정 |
| 1006 | 1006 |
Canvas.SetLeft(Base_TextBox, this.EndPoint.X); |
| 1007 | 1007 |
Canvas.SetTop(Base_TextBox, this.EndPoint.Y); |
| 1008 |
System.Diagnostics.Debug.WriteLine($"TextBox Set {this.EndPoint.X},{this.EndPoint.Y}");
|
|
| 1008 |
//System.Diagnostics.Debug.WriteLine($"TextBox Set {this.EndPoint.X},{this.EndPoint.Y}");
|
|
| 1009 | 1009 |
|
| 1010 | 1010 |
|
| 1011 | 1011 |
List<Point> ps = new List<Point>(); |
| ... | ... | |
| 1722 | 1722 |
{
|
| 1723 | 1723 |
IPath path = (this as IPath); |
| 1724 | 1724 |
|
| 1725 |
//System.Diagnostics.Debug.WriteLine($"OnMoveCtrlPoint : {path.PointSet[1].X},{path.PointSet[1].Y}");
|
|
| 1726 |
|
|
| 1725 | 1727 |
Point selected = MathSet.getNearPoint(path.PointSet, pt); |
| 1726 | 1728 |
|
| 1727 | 1729 |
//StartPoint에 표시된 Thumb는 dx,dy가 +로 더해줘야한다. |
| ... | ... | |
| 1764 | 1766 |
if (path.PointSet.Count > i) {
|
| 1765 | 1767 |
path.PointSet[i] = selected; |
| 1766 | 1768 |
} |
| 1767 |
|
|
| 1769 |
//System.Diagnostics.Debug.WriteLine($"OnMoveCtrlPoint end : {path.PointSet[1].X},{path.PointSet[1].Y}");
|
|
| 1768 | 1770 |
this.UpdateControl(); |
| 1769 | 1771 |
} |
| 1770 | 1772 |
|
| ... | ... | |
| 1815 | 1817 |
STemp.Name = this.GetType().Name.ToString(); |
| 1816 | 1818 |
STemp.isTrans = this.isTrans; |
| 1817 | 1819 |
STemp.MidPoint = this.MidPoint; |
| 1818 |
STemp.Angle = this.CommentAngle;
|
|
| 1820 |
STemp.Angle = this.PageAngle;
|
|
| 1819 | 1821 |
STemp.fontConfig = new List<string>() |
| 1820 | 1822 |
{
|
| 1821 | 1823 |
this.TextFamily.ToString(), |
| ... | ... | |
| 1863 | 1865 |
instance.BoxWidth = s.BoxWidth; |
| 1864 | 1866 |
instance.BoxHeight = s.BoxHeight; |
| 1865 | 1867 |
instance.isFixed = s.isFixed; |
| 1866 |
instance.CommentAngle = s.Angle;
|
|
| 1868 |
instance.PageAngle = s.Angle;
|
|
| 1867 | 1869 |
instance.UserID = s.UserID; |
| 1868 | 1870 |
instance.isTrans = s.isTrans; |
| 1869 | 1871 |
instance.MidPoint = s.MidPoint; |
내보내기 Unified diff
