개정판 01cbc243
Arrow Text 생성시 Leader선이 가까운 Point로 이동하지 않는 문제 조치
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 2523 | 2523 |
//{
|
| 2524 | 2524 |
// return; |
| 2525 | 2525 |
//} |
| 2526 |
if(ViewerDataModel.Instance.UndoDataList == null) |
|
| 2526 |
if (ViewerDataModel.Instance.UndoDataList == null)
|
|
| 2527 | 2527 |
{
|
| 2528 | 2528 |
return; |
| 2529 | 2529 |
} |
| 2530 | 2530 |
|
| 2531 |
|
|
| 2532 | 2531 |
if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().Event == Event_Type.Thumb) |
| 2533 | 2532 |
{
|
| 2534 | 2533 |
return; |
| KCOM/Controls/CheckList.xaml.cs | ||
|---|---|---|
| 228 | 228 |
{
|
| 229 | 229 |
MinWidth = 400, |
| 230 | 230 |
MinHeight = 100, |
| 231 |
//Closed = (obj, args) => this.MarkupNamePromptClose(MarkupData, args), |
|
| 231 | 232 |
Header = "Alert", |
| 232 | 233 |
Content = check, |
| 233 | 234 |
ResizeMode = System.Windows.ResizeMode.NoResize, |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1780 | 1780 |
{
|
| 1781 | 1781 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
| 1782 | 1782 |
Point tempPoint = control.EndPoint; |
| 1783 |
|
|
| 1783 |
//control.MidPoint = currentCanvasDrawingMouseMovePoint; |
|
| 1784 | 1784 |
|
| 1785 | 1785 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
| 1786 | 1786 |
{
|
| ... | ... | |
| 1791 | 1791 |
{
|
| 1792 | 1792 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
| 1793 | 1793 |
} |
| 1794 |
control.MidPoint = MathSet.getMiddlePoint(control.StartPoint, control.EndPoint); |
|
| 1794 | 1795 |
control.isFixed = true; |
| 1795 | 1796 |
|
| 1796 | 1797 |
control.PointSet = new List<Point> |
| ... | ... | |
| 1848 | 1849 |
{
|
| 1849 | 1850 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
| 1850 | 1851 |
} |
| 1852 |
|
|
| 1853 |
control.MidPoint = MathSet.getMiddlePoint(control.StartPoint, control.EndPoint); |
|
| 1851 | 1854 |
control.PointSet = new List<Point> |
| 1852 | 1855 |
{
|
| 1853 | 1856 |
control.StartPoint, |
| ... | ... | |
| 1903 | 1906 |
{
|
| 1904 | 1907 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
| 1905 | 1908 |
} |
| 1909 |
control.MidPoint = MathSet.getMiddlePoint(control.StartPoint, control.EndPoint); |
|
| 1906 | 1910 |
control.PointSet = new List<Point> |
| 1907 | 1911 |
{
|
| 1908 | 1912 |
control.StartPoint, |
| KCOM/Views/TopMenu.xaml | ||
|---|---|---|
| 283 | 283 |
telerik:StyleManager.Theme="Windows7" |
| 284 | 284 |
ToolTipService.ToolTip="Interval Value" |
| 285 | 285 |
ValueChanged="cbIntervalSize_ValueChanged" |
| 286 |
Value="{Binding Interval, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 286 |
Value="{Binding Interval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}"
|
|
| 287 | 287 |
/> |
| 288 | 288 |
</telerik:RadButtonGroup> |
| 289 | 289 |
|
| ... | ... | |
| 361 | 361 |
telerik:StyleManager.Theme="Windows7" |
| 362 | 362 |
ToolTipService.ToolTip="Interval Value" |
| 363 | 363 |
ValueChanged="cbArcLength_ValueChanged" |
| 364 |
Value="{Binding ArcLength, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 364 |
Value="{Binding ArcLength, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}"
|
|
| 365 | 365 |
/> |
| 366 | 366 |
</telerik:RadButtonGroup> |
| 367 | 367 |
|
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 1147 | 1147 |
ps.Add(new Point(Canvas.GetLeft(Base_TextBox) + this.BoxWidth, Canvas.GetTop(Base_TextBox) + this.BoxHeight / 2)); //우단 |
| 1148 | 1148 |
|
| 1149 | 1149 |
#region 정밀도 추가 |
| 1150 |
ps.Add(new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox))); //상단 |
|
| 1151 |
ps.Add(new Point(Canvas.GetLeft(Base_TextBox) + this.BoxWidth, Canvas.GetTop(Base_TextBox))); //상단 |
|
| 1152 |
ps.Add(new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox) + this.BoxHeight)); //좌단 |
|
| 1153 |
ps.Add(new Point(Canvas.GetLeft(Base_TextBox) + this.BoxWidth, Canvas.GetTop(Base_TextBox) + this.BoxHeight)); //상단 |
|
| 1150 |
//ps.Add(new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox))); //상단
|
|
| 1151 |
//ps.Add(new Point(Canvas.GetLeft(Base_TextBox) + this.BoxWidth, Canvas.GetTop(Base_TextBox))); //상단
|
|
| 1152 |
//ps.Add(new Point(Canvas.GetLeft(Base_TextBox), Canvas.GetTop(Base_TextBox) + this.BoxHeight)); //좌단
|
|
| 1153 |
//ps.Add(new Point(Canvas.GetLeft(Base_TextBox) + this.BoxWidth, Canvas.GetTop(Base_TextBox) + this.BoxHeight)); //상단
|
|
| 1154 | 1154 |
#endregion |
| 1155 | 1155 |
|
| 1156 | 1156 |
|
| ... | ... | |
| 1257 | 1257 |
//Point testP = new Point(endP.X-100,endP.Y); |
| 1258 | 1258 |
Point testP = endP; |
| 1259 | 1259 |
|
| 1260 |
//Point testP = new Point(endP.X, endP.Y - 50); |
|
| 1260 | 1261 |
|
| 1261 | 1262 |
|
| 1262 | 1263 |
if (isFixed) |
내보내기 Unified diff
