개정판 44c5e27e
issue #680 modify method
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 401 | 401 |
} |
| 402 | 402 |
|
| 403 | 403 |
void TempFileAdd() |
| 404 |
{
|
|
| 404 |
{
|
|
| 405 | 405 |
Dispatcher.Invoke(DispatcherPriority.Normal, new Action(delegate |
| 406 | 406 |
{
|
| 407 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, PageNumber); |
|
| 408 |
} |
|
| 409 |
|
|
| 410 |
var defaultBitmapImage = new BitmapImage(new Uri(uri)); |
|
| 411 |
|
|
| 412 |
ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage; |
|
| 413 |
ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth; |
|
| 414 |
ViewerDataModel.Instance.ImageViewHeight = defaultBitmapImage.PixelHeight; |
|
| 415 |
|
|
| 416 |
if (defaultBitmapImage.IsDownloading) |
|
| 417 |
{
|
|
| 418 |
defaultBitmapImage.DownloadCompleted += (ex, arg) => |
|
| 407 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
| 419 | 408 |
{
|
| 420 |
ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage; |
|
| 421 |
ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth; |
|
| 422 |
ViewerDataModel.Instance.ImageViewHeight = defaultBitmapImage.PixelHeight; |
|
| 423 |
}; |
|
| 424 |
} |
|
| 409 |
DateTime undoTime = ViewerDataModel.Instance.UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
|
| 410 |
DateTime updatetime = DateTime.Now.AddDays(-1); |
|
| 411 |
if (ViewerDataModel.Instance._markupInfoList.Count > 0) |
|
| 412 |
{
|
|
| 413 |
updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 414 |
} |
|
| 425 | 415 |
|
| 426 | 416 |
EmptyControlCheck(); |
| 427 | 417 |
|
| ... | ... | |
| 432 | 422 |
foreach (var control in ViewerDataModel.Instance.MarkupControls_USER) |
| 433 | 423 |
{
|
| 434 | 424 |
var root = layerControl.MarkupToString(control, App.ViewInfo.UserID); |
| 435 |
|
|
| 425 |
|
|
| 436 | 426 |
var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault(); |
| 437 | 427 |
if (existItem != null) |
| 438 | 428 |
{
|
| 439 |
if (existItem.Data != root.ConvertData)
|
|
| 429 |
if (existItem.Data != root.ConvertData) |
|
| 440 | 430 |
{
|
| 441 | 431 |
tempDtList.Add(new TempDt() |
| 442 | 432 |
{
|
| ... | ... | |
| 480 | 470 |
} |
| 481 | 471 |
} |
| 482 | 472 |
} |
| 483 |
}
|
|
| 473 |
} |
|
| 484 | 474 |
} |
| 485 | 475 |
|
| 486 | 476 |
temp.WriteTemp(tempDtList); |
내보내기 Unified diff
