개정판 4804a4fb
issue #937: line size 계산 로직 수정, 텍스트가 뒤집혀 나오는 현상 수정, arc length 계산 로직 추가
Change-Id: I74b1e59bd6f2983c8cc107ea34654ecf791fc470
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2313 | 2313 |
break; |
| 2314 | 2314 |
case ControlType.PolygonControl: |
| 2315 | 2315 |
{
|
| 2316 |
|
|
| 2317 | 2316 |
var control = currentControl as PolygonControl; |
| 2318 | 2317 |
|
| 2319 | 2318 |
if (control != null) |
| ... | ... | |
| 2866 | 2865 |
|
| 2867 | 2866 |
} |
| 2868 | 2867 |
|
| 2868 |
/// <summary> |
|
| 2869 |
/// select items by dragging |
|
| 2870 |
/// </summary> |
|
| 2869 | 2871 |
private void ApplyDragSelectionRect() |
| 2870 | 2872 |
{
|
| 2871 | 2873 |
multi_Undo_Data = new Multi_Undo_data(); |
| ... | ... | |
| 3005 | 3007 |
} |
| 3006 | 3008 |
} |
| 3007 | 3009 |
|
| 3008 |
public bool IsSelectionControl(Rect dragRect, Rect controlRect, Geometry OverViewPathData, ControlType type) |
|
| 3009 |
{
|
|
| 3010 |
//// X, Y, WIDTH, HEIGHT 형태로 RECT를 만든다. |
|
| 3011 |
|
|
| 3012 |
bool result = false; |
|
| 3013 |
if (dragRect.Contains(controlRect)) |
|
| 3014 |
{
|
|
| 3015 |
result = true; |
|
| 3016 |
//잡은 객체들을 담은 리스트 |
|
| 3017 |
try |
|
| 3018 |
{
|
|
| 3019 |
selected_item.Add(OverViewPathData, type.ToString()); |
|
| 3020 |
} |
|
| 3021 |
catch (Exception) |
|
| 3022 |
{
|
|
| 3023 |
|
|
| 3024 |
} |
|
| 3025 |
} |
|
| 3026 |
return result; |
|
| 3027 |
} |
|
| 3028 |
|
|
| 3029 | 3010 |
private void drawingPannelRotate(double angle) |
| 3030 | 3011 |
{
|
| 3031 | 3012 |
Logger.sendCheckLog("pageNavigator_PageChanging_drawingPannelRotate Setting", 1);
|
| ... | ... | |
| 4841 | 4822 |
control.LineSize = ViewerDataModel.Instance.LineSize; |
| 4842 | 4823 |
control.PointSet.Add(firstPoint); |
| 4843 | 4824 |
|
| 4844 |
///control.SetPolyPath(); |
|
| 4845 |
|
|
| 4846 | 4825 |
control.ApplyOverViewData(); |
| 4847 | 4826 |
|
| 4848 | 4827 |
CreateControl(); |
| ... | ... | |
| 4863 | 4842 |
currentControl.CommentID = Commons.shortGuid(); |
| 4864 | 4843 |
currentControl.IsNew = true; |
| 4865 | 4844 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4866 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl);
|
|
| 4867 |
//currentControl.OnApplyTemplate();
|
|
| 4845 |
polygonControl.StartPoint = canvasDrawingMouseDownPoint;
|
|
| 4846 |
polygonControl.EndPoint = canvasDrawingMouseDownPoint;
|
|
| 4868 | 4847 |
polygonControl.PointSet.Add(canvasDrawingMouseDownPoint); |
| 4869 | 4848 |
polygonControl.PointSet.Add(canvasDrawingMouseDownPoint); |
| 4849 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 4870 | 4850 |
polygonControl.ApplyTemplate(); |
| 4871 | 4851 |
polygonControl.Visibility = Visibility.Visible; |
| 4872 | 4852 |
} |
내보내기 Unified diff
