개정판 8129f2a5
issue #1035: Consolidate 시 데이터가 정상적으로 취합되지 않는 현상
Change-Id: I344ef162ace8d1b3c3818ad7ae1242695cd0ef33
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 329 | 329 |
var menu = this.ParentOfType<MainWindow>().dzMainMenu; |
| 330 | 330 |
try |
| 331 | 331 |
{
|
| 332 |
// update mylist and gridview |
|
| 333 |
menu.UpdateMyMarkupList(); |
|
| 334 |
|
|
| 332 | 335 |
SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu); |
| 333 | 336 |
|
| 334 | 337 |
this.ParentOfType<MainWindow>().dzMainMenu.InkControl_Convert(); |
| ... | ... | |
| 343 | 346 |
return; |
| 344 | 347 |
} |
| 345 | 348 |
else |
| 346 |
{
|
|
| 349 |
{
|
|
| 347 | 350 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
| 348 | 351 |
{
|
| 349 | 352 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
| ... | ... | |
| 382 | 385 |
} |
| 383 | 386 |
finally |
| 384 | 387 |
{
|
| 388 |
/* |
|
| 385 | 389 |
/// delete markup information when 코멘트가 없을 경우 |
| 386 | 390 |
if (ViewerDataModel.Instance.MyMarkupList.Count == 0) |
| 387 | 391 |
{
|
| ... | ... | |
| 389 | 393 |
{
|
| 390 | 394 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
| 391 | 395 |
{
|
| 392 |
this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem)); |
|
| 396 |
//this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem));
|
|
| 393 | 397 |
} |
| 394 | 398 |
} |
| 395 | 399 |
} |
| 400 |
*/ |
|
| 396 | 401 |
} |
| 397 | 402 |
} |
| 398 | 403 |
|
| ... | ... | |
| 420 | 425 |
} |
| 421 | 426 |
} |
| 422 | 427 |
|
| 423 |
menu.UpdateMyMarkupList(); |
|
| 428 |
|
|
| 424 | 429 |
SaveCommand.Instance.Execute(SelectedMarkupInfos, SaveCommand.Instance.page_no); |
| 425 | 430 |
SaveCommand.Instance.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
| 426 | 431 |
} |
내보내기 Unified diff
