개정판 d62c0439
issue #923: remove undo after selecting item, fixed multi selection logic
Change-Id: Id2a6e63336747aeaf3337218f5e2e3b35fba5dfa
| KCOM/Common/TempFile.cs | ||
|---|---|---|
| 408 | 408 |
if (control != null) |
| 409 | 409 |
{
|
| 410 | 410 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(control); |
| 411 |
var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 412 |
ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
|
|
| 411 |
var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 412 |
ViewerDataModel.Instance.MyMarkupList.Remove(Item_);
|
|
| 413 | 413 |
} |
| 414 | 414 |
|
| 415 | 415 |
//Control |
| ... | ... | |
| 434 | 434 |
if (control != null) |
| 435 | 435 |
{
|
| 436 | 436 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(control); |
| 437 |
var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 438 |
ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
|
|
| 437 |
var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 438 |
ViewerDataModel.Instance.MyMarkupList.Remove(Item_);
|
|
| 439 | 439 |
} |
| 440 | 440 |
|
| 441 | 441 |
//Control |
| ... | ... | |
| 461 | 461 |
if (control != null) |
| 462 | 462 |
{
|
| 463 | 463 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(control); |
| 464 |
var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 465 |
ViewerDataModel.Instance.MarkupList_USER.Remove(Item_);
|
|
| 464 |
var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == (control as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault();
|
|
| 465 |
ViewerDataModel.Instance.MyMarkupList.Remove(Item_);
|
|
| 466 | 466 |
} |
| 467 | 467 |
break; |
| 468 | 468 |
} |
| ... | ... | |
| 482 | 482 |
updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
| 483 | 483 |
} |
| 484 | 484 |
|
| 485 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.EmptyControlCheck(); |
|
| 486 |
|
|
| 487 | 485 |
if (undoTime > updatetime) |
| 488 | 486 |
{
|
| 489 | 487 |
if (ViewerDataModel.Instance.MarkupControls_USER.Count > 0) |
| ... | ... | |
| 492 | 490 |
{
|
| 493 | 491 |
var root = MarkupParser.MarkupToString(control, App.ViewInfo.UserID); |
| 494 | 492 |
|
| 495 |
var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault();
|
|
| 493 |
var existItem = ViewerDataModel.Instance.MyMarkupList.Where(data => data.ID == root.CommentID).FirstOrDefault();
|
|
| 496 | 494 |
if (existItem != null) |
| 497 | 495 |
{
|
| 498 | 496 |
if (existItem.Data != root.ConvertData) |
| ... | ... | |
| 512 | 510 |
{
|
| 513 | 511 |
if (root.CommentID != null) |
| 514 | 512 |
{
|
| 515 |
var currentCommentCheck = ViewerDataModel.Instance.MarkupList_USER.Where(dt => dt.ID == control.CommentID).FirstOrDefault();
|
|
| 513 |
var currentCommentCheck = ViewerDataModel.Instance.MyMarkupList.Where(dt => dt.ID == control.CommentID).FirstOrDefault();
|
|
| 516 | 514 |
if (currentCommentCheck != null) |
| 517 | 515 |
{
|
| 518 | 516 |
tempDtList.Add(new TempDt() |
내보내기 Unified diff
