개정판 bae83c92
- convert에서 한글 파일명 오류 수정
- merged pdf 실행하도록 메시지창 출력
Change-Id: I882454f7cf0f521c621f33db8876b568db5a8342
| KCOM/Common/ViewerDataModel.cs | ||
|---|---|---|
| 524 | 524 |
} |
| 525 | 525 |
} |
| 526 | 526 |
|
| 527 |
private bool _IsFinalPDF { get; set; }
|
|
| 528 |
public bool IsFinalPDF |
|
| 529 |
{
|
|
| 530 |
get |
|
| 531 |
{
|
|
| 532 |
return _IsFinalPDF; |
|
| 533 |
} |
|
| 534 |
set |
|
| 535 |
{
|
|
| 536 |
_IsFinalPDF = value; |
|
| 537 |
OnPropertyChanged("IsFinalPDF");
|
|
| 538 |
} |
|
| 539 |
} |
|
| 540 |
private DateTime _FinalPDFTime { get; set; }
|
|
| 541 |
public DateTime FinalPDFTime |
|
| 542 |
{
|
|
| 543 |
get |
|
| 544 |
{
|
|
| 545 |
return _FinalPDFTime; |
|
| 546 |
} |
|
| 547 |
set |
|
| 548 |
{
|
|
| 549 |
_FinalPDFTime = value; |
|
| 550 |
OnPropertyChanged("FinalPDFTime");
|
|
| 551 |
} |
|
| 552 |
} |
|
| 553 |
|
|
| 527 | 554 |
//////////////////////////////////////////////// |
| 528 | 555 |
|
| 529 | 556 |
|
| ... | ... | |
| 630 | 657 |
} |
| 631 | 658 |
} |
| 632 | 659 |
|
| 660 |
public bool SaveCheck() |
|
| 661 |
{
|
|
| 662 |
bool result = false; |
|
| 663 |
|
|
| 664 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
| 665 |
{
|
|
| 666 |
DateTime undoTime = UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
|
| 667 |
DateTime updatetime = DateTime.Now.AddDays(-1); |
|
| 668 |
|
|
| 669 |
if (_markupInfoList.Count > 0) |
|
| 670 |
{
|
|
| 671 |
updatetime = _markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 672 |
} |
|
| 673 |
|
|
| 674 |
if (undoTime > updatetime) |
|
| 675 |
{
|
|
| 676 |
result = false; |
|
| 677 |
} |
|
| 678 |
else |
|
| 679 |
{
|
|
| 680 |
result = true; |
|
| 681 |
} |
|
| 682 |
} |
|
| 683 |
else |
|
| 684 |
{
|
|
| 685 |
result = true; |
|
| 686 |
} |
|
| 687 |
|
|
| 688 |
return result; |
|
| 689 |
} |
|
| 690 |
|
|
| 691 |
public bool FinalPDFCheck() |
|
| 692 |
{
|
|
| 693 |
bool result = false; |
|
| 694 |
|
|
| 695 |
DateTime updatetime = DateTime.Now.AddDays(-1); |
|
| 696 |
|
|
| 697 |
if (_markupInfoList.Count > 0) |
|
| 698 |
{
|
|
| 699 |
var consolidateItems = _markupInfoList.Where(x => x.Consolidate == 1 && x.AvoidConsolidate == 0); |
|
| 700 |
|
|
| 701 |
if (consolidateItems.Count() > 0) |
|
| 702 |
{
|
|
| 703 |
updatetime = consolidateItems.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 704 |
} |
|
| 705 |
} |
|
| 706 |
|
|
| 707 |
if (FinalPDFTime > updatetime) |
|
| 708 |
{
|
|
| 709 |
result = true; |
|
| 710 |
} |
|
| 711 |
|
|
| 712 |
return result; |
|
| 713 |
} |
|
| 714 |
|
|
| 633 | 715 |
public void SetAngleVisible(Visibility visibility) |
| 634 | 716 |
{
|
| 635 | 717 |
this.MarkupAngleVisibility = visibility; |
내보내기 Unified diff
