개정판 4f017ed3
Final ArrowTextControl 수정
Change-Id: Ifdd9876909e6a4ce288d70acb74a00b37e88e6a0
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 650 | 650 |
// 마크업 로드 |
| 651 | 651 |
//await this.Dispatcher.InvokeAsync(()=>MarkupLoad(e.PageNumber)); |
| 652 | 652 |
|
| 653 |
var token = ViewerDataModel.Instance.NewCancellationToken();
|
|
| 653 |
ViewerDataModel.Instance.PageAngle = e.CurrentPage.PAGE_ANGLE;
|
|
| 654 | 654 |
|
| 655 |
await MarkupLoadAsync(e.PageNumber,token); |
|
| 655 |
var token = ViewerDataModel.Instance.NewCancellationToken(); |
|
| 656 |
|
|
| 657 |
await MarkupLoadAsync(e.PageNumber, ViewerDataModel.Instance.PageAngle, token); |
|
| 656 | 658 |
|
| 657 | 659 |
// 페이지 이미지 변경 |
| 658 | 660 |
await PageChangingAsync(e.CurrentPage, e.PageNumber, token); |
| ... | ... | |
| 1067 | 1069 |
return e.DesiredSize; |
| 1068 | 1070 |
} |
| 1069 | 1071 |
|
| 1070 |
private async Task MarkupLoadAsync(int pageNumber, CancellationToken cts) |
|
| 1072 |
private async Task MarkupLoadAsync(int pageNumber,Double PageAngle, CancellationToken cts)
|
|
| 1071 | 1073 |
{
|
| 1072 | 1074 |
System.Diagnostics.Stopwatch stopwatch = new Stopwatch(); |
| 1073 | 1075 |
stopwatch.Start(); |
| ... | ... | |
| 1091 | 1093 |
string sColor = (info.UserID == App.ViewInfo.UserID) ? "#FFFF0000" : info.DisplayColor; |
| 1092 | 1094 |
if (info.UserID == App.ViewInfo.UserID) |
| 1093 | 1095 |
{
|
| 1094 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, sColor, "", |
|
| 1096 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, PageAngle, sColor, "",
|
|
| 1095 | 1097 |
markup.MarkupInfoID, markup.ID); |
| 1096 | 1098 |
control.Visibility = Visibility.Hidden; |
| 1097 | 1099 |
} |
| 1098 | 1100 |
else |
| 1099 | 1101 |
{
|
| 1100 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, sColor, "", |
|
| 1102 |
var control = await MarkupParser.ParseExAsync(cts, App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, PageAngle, sColor, "",
|
|
| 1101 | 1103 |
markup.MarkupInfoID, markup.ID); |
| 1102 | 1104 |
control.Visibility = Visibility.Hidden; |
| 1103 | 1105 |
} |
| ... | ... | |
| 1128 | 1130 |
|
| 1129 | 1131 |
foreach (var markupitem in markupitems) |
| 1130 | 1132 |
{
|
| 1131 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID); |
|
| 1133 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,PageAngle, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 1132 | 1134 |
|
| 1133 | 1135 |
if (cts.IsCancellationRequested) |
| 1134 | 1136 |
{
|
| ... | ... | |
| 2024 | 2026 |
|
| 2025 | 2027 |
#endregion // 각 컨트롤의 특별한 기능을 제어한다. |
| 2026 | 2028 |
|
| 2027 |
if (ViewerDataModel.Instance.AngleVisibility == Visibility.Visible) |
|
| 2029 |
if (ViewerDataModel.Instance.MarkupAngleVisibility == Visibility.Visible)
|
|
| 2028 | 2030 |
{
|
| 2029 |
ViewerDataModel.Instance.Angle = currentControl.CommentAngle; |
|
| 2031 |
ViewerDataModel.Instance.MarkupAngle = currentControl.CommentAngle;
|
|
| 2030 | 2032 |
} |
| 2031 | 2033 |
} |
| 2032 | 2034 |
} |
| ... | ... | |
| 2506 | 2508 |
ViewerDataModel.Instance.ContentHeight = zoomAndPanCanvas.Height; |
| 2507 | 2509 |
ViewerDataModel.Instance.AngleOffsetX = translate.X; |
| 2508 | 2510 |
ViewerDataModel.Instance.AngleOffsetY = translate.Y; |
| 2509 |
ViewerDataModel.Instance.Angle = rotate.Angle; |
|
| 2511 |
ViewerDataModel.Instance.MarkupAngle = rotate.Angle;
|
|
| 2510 | 2512 |
} |
| 2511 | 2513 |
|
| 2512 | 2514 |
private void syncPannelRotate(double angle) |
| ... | ... | |
| 4047 | 4049 |
currentControl = new ArrowTextControl() |
| 4048 | 4050 |
{
|
| 4049 | 4051 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect, |
| 4050 |
ControlType = ControlType.ArrowTransTextBorderControl |
|
| 4052 |
ControlType = ControlType.ArrowTransTextBorderControl, |
|
| 4053 |
PageAngle = ViewerDataModel.Instance.PageAngle |
|
| 4051 | 4054 |
}; |
| 4055 |
|
|
| 4056 |
|
|
| 4052 | 4057 |
currentControl.CommentID = Commons.shortGuid(); |
| 4053 | 4058 |
currentControl.IsNew = true; |
| 4054 | 4059 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| ... | ... | |
| 4393 | 4398 |
break; |
| 4394 | 4399 |
} |
| 4395 | 4400 |
|
| 4396 |
if (currentControl != null) |
|
| 4397 |
{
|
|
| 4398 |
currentControl.PageAngle = pageNavigator.CurrentPage.Angle; |
|
| 4399 |
} |
|
| 4401 |
//if (currentControl != null)
|
|
| 4402 |
//{
|
|
| 4403 |
// currentControl.PageAngle = pageNavigator.CurrentPage.Angle;
|
|
| 4404 |
//}
|
|
| 4400 | 4405 |
} |
| 4401 | 4406 |
if (mouseHandlingMode != MouseHandlingMode.None && e.LeftButton == MouseButtonState.Pressed) |
| 4402 | 4407 |
{
|
| ... | ... | |
| 4800 | 4805 |
}; |
| 4801 | 4806 |
} |
| 4802 | 4807 |
} |
| 4803 |
|
|
| 4808 |
|
|
| 4804 | 4809 |
//강인구 추가(페이지 이동시 코멘트 재 호출) |
| 4805 | 4810 |
ViewerDataModel.Instance.MarkupControls_Sync.Clear(); |
| 4806 | 4811 |
List<MarkupInfoItem> gridSelectionRevItem = gridViewRevMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); |
| ... | ... | |
| 4810 | 4815 |
var markupitems = item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.PageNumber).ToList(); |
| 4811 | 4816 |
foreach (var markupitem in markupitems) |
| 4812 | 4817 |
{
|
| 4813 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID); |
|
| 4818 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync,0, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 4814 | 4819 |
} |
| 4815 | 4820 |
} |
| 4816 | 4821 |
|
| ... | ... | |
| 5429 | 5434 |
_canvas.Background = Brushes.White; |
| 5430 | 5435 |
_canvas.Width = adorner_.BorderSize.Width; |
| 5431 | 5436 |
_canvas.Height = adorner_.BorderSize.Height; |
| 5432 |
await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, _canvas, "#FFFF0000", "", ViewerDataModel.Instance.CancellationToken()); |
|
| 5437 |
await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.CancellationToken());
|
|
| 5433 | 5438 |
|
| 5434 | 5439 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
| 5435 | 5440 |
|
| ... | ... | |
| 5714 | 5719 |
string Select_ID = (((e.Source as Telerik.Windows.Controls.RadButton).DataContext) as IKCOM.MarkupInfoItem).MarkupInfoID; |
| 5715 | 5720 |
foreach (var items in ViewerDataModel.Instance._markupInfoRevList) |
| 5716 | 5721 |
{
|
| 5717 |
if (items.UserID == Select_ID)
|
|
| 5722 |
if (items.MarkupInfoID == Select_ID)
|
|
| 5718 | 5723 |
{
|
| 5719 | 5724 |
foreach (var item in items.MarkupList) |
| 5720 | 5725 |
{
|
| 5721 | 5726 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 5722 | 5727 |
{
|
| 5723 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", |
|
| 5728 |
await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "",
|
|
| 5724 | 5729 |
items.MarkupInfoID, Commons.shortGuid()); |
| 5725 | 5730 |
} |
| 5726 | 5731 |
} |
내보내기 Unified diff
