개정판 6b6e937c
Compare기능 수정
Change-Id: I3697fbe30f47d5cc4a51ece85df0055f7c596bf2
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 584 | 584 |
|
| 585 | 585 |
/// delete markup list |
| 586 | 586 |
int iPageNo = this.pageNavigator.CurrentPage.PageNumber; |
| 587 |
|
|
| 587 | 588 |
var deleted = (from markup in ViewerDataModel.Instance.MyMarkupList |
| 588 |
where (markup.PageNumber == iPageNo) && (null == ViewerDataModel.Instance.MarkupControls_USER.Where(control => control.CommentID == markup.ID).FirstOrDefault()) |
|
| 589 |
where (markup.PageNumber == iPageNo) |
|
| 590 |
&& (null == ViewerDataModel.Instance.MarkupControls_USER.Where(control => control.CommentID == markup.ID).FirstOrDefault()) |
|
| 589 | 591 |
select markup).ToList(); |
| 590 |
foreach(var markup in deleted) ViewerDataModel.Instance.MyMarkupList.Remove(markup); |
|
| 592 |
|
|
| 593 |
foreach (var markup in deleted) |
|
| 594 |
{
|
|
| 595 |
ViewerDataModel.Instance.MyMarkupList.Remove(markup); |
|
| 596 |
} |
|
| 591 | 597 |
/// up to here |
| 592 | 598 |
|
| 593 | 599 |
//if (modified) |
| ... | ... | |
| 3298 | 3304 |
{
|
| 3299 | 3305 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3300 | 3306 |
//{
|
| 3301 |
if (currentControl is DateControl) |
|
| 3307 |
if (currentControl is DateControl) |
|
| 3308 |
{
|
|
| 3309 |
//20180906 LJY TEST IsRotationDrawingEnable |
|
| 3310 |
if (IsGetoutpoint((currentControl as DateControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
|
| 3302 | 3311 |
{
|
| 3303 |
//20180906 LJY TEST IsRotationDrawingEnable |
|
| 3304 |
if (IsGetoutpoint((currentControl as DateControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault())) |
|
| 3305 |
{
|
|
| 3306 |
return; |
|
| 3307 |
} |
|
| 3312 |
return; |
|
| 3313 |
} |
|
| 3308 | 3314 |
|
| 3309 |
CreateCommand.Instance.Execute(currentControl);
|
|
| 3310 |
currentControl = null;
|
|
| 3315 |
CreateCommand.Instance.Execute(currentControl); |
|
| 3316 |
currentControl = null; |
|
| 3311 | 3317 |
|
| 3312 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch")
|
|
| 3313 |
{
|
|
| 3314 |
controlType = ControlType.None;
|
|
| 3315 |
IsSwingMode = false;
|
|
| 3316 |
Common.ViewerDataModel.Instance.SelectedControl = "";
|
|
| 3317 |
Common.ViewerDataModel.Instance.ControlTag = null;
|
|
| 3318 |
mouseHandlingMode = MouseHandlingMode.None;
|
|
| 3319 |
this.ParentOfType<MainWindow>().dzTopMenu.btn_Batch.IsChecked = false;
|
|
| 3320 |
txtBatch.Visibility = Visibility.Collapsed;
|
|
| 3318 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
|
| 3319 |
{
|
|
| 3320 |
controlType = ControlType.None; |
|
| 3321 |
IsSwingMode = false; |
|
| 3322 |
Common.ViewerDataModel.Instance.SelectedControl = ""; |
|
| 3323 |
Common.ViewerDataModel.Instance.ControlTag = null; |
|
| 3324 |
mouseHandlingMode = MouseHandlingMode.None; |
|
| 3325 |
this.ParentOfType<MainWindow>().dzTopMenu.btn_Batch.IsChecked = false; |
|
| 3326 |
txtBatch.Visibility = Visibility.Collapsed; |
|
| 3321 | 3327 |
|
| 3322 |
} |
|
| 3323 | 3328 |
} |
| 3324 |
else |
|
| 3329 |
} |
|
| 3330 |
else |
|
| 3331 |
{
|
|
| 3332 |
currentControl = new DateControl |
|
| 3325 | 3333 |
{
|
| 3326 |
currentControl = new DateControl |
|
| 3327 |
{
|
|
| 3328 |
StartPoint = CanvasDrawingMouseDownPoint, |
|
| 3329 |
Background = new SolidColorBrush(Colors.Black) |
|
| 3330 |
}; |
|
| 3331 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 3332 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3333 |
currentControl.IsNew = true; |
|
| 3334 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3334 |
StartPoint = CanvasDrawingMouseDownPoint, |
|
| 3335 |
Background = new SolidColorBrush(Colors.Black) |
|
| 3336 |
}; |
|
| 3337 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 3338 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3339 |
currentControl.IsNew = true; |
|
| 3340 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3335 | 3341 |
|
| 3336 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3342 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3343 |
if (currentControl is ImgControl) |
|
| 3344 |
{
|
|
| 3337 | 3345 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle; |
| 3346 |
} |
|
| 3338 | 3347 |
} |
| 3339 | 3348 |
//} |
| 3340 | 3349 |
} |
| ... | ... | |
| 4298 | 4307 |
ViewerDataModel.Instance.PageBalanceNumber += balancePoint; |
| 4299 | 4308 |
} |
| 4300 | 4309 |
|
| 4310 |
|
|
| 4311 |
|
|
| 4301 | 4312 |
if (ViewerDataModel.Instance.PageNumber == pageNavigator.PageCount && balancePoint > 0) |
| 4302 | 4313 |
{
|
| 4303 | 4314 |
|
| ... | ... | |
| 4307 | 4318 |
ViewerDataModel.Instance.PageNumber += balancePoint; |
| 4308 | 4319 |
} |
| 4309 | 4320 |
|
| 4321 |
pageNavigator.GotoPage(ViewerDataModel.Instance.PageNumber); |
|
| 4322 |
|
|
| 4310 | 4323 |
if (!testPanel2.IsHidden) |
| 4311 | 4324 |
{
|
| 4312 | 4325 |
if (IsSyncPDFMode) |
| ... | ... | |
| 4338 | 4351 |
} |
| 4339 | 4352 |
else |
| 4340 | 4353 |
{
|
| 4341 |
string uri = this.GetImageURL(_ViewInfo.ProjectNO, ViewerDataModel.Instance.PageNumber);
|
|
| 4354 |
string uri = this.GetImageURL(CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 4342 | 4355 |
|
| 4343 | 4356 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri)); |
| 4344 | 4357 |
|
내보내기 Unified diff
