/ - Diff - MARKUS - 일정관리

개정판 39f0624f

ID	39f0624f0dbcbc7eead3e7b5aad58ff314a2edbf
상위	b9b3b659
하위	2db955fd

이지연이(가) 5년 이상 전에 추가함

issue #564 Markup List 동기화 수정중..

Change-Id: I7ef97cfe1e719e9f77cb2d195162a3dc68e128fe

                         </Border>
                         <Border VerticalAlignment="Stretch" Margin="0" Grid.Row="2" BorderThickness="0,0,0,0.5" BorderBrush="#828282" x:Name="gogo">
                             <telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" HorizontalAlignment="Stretch" x:Name="gogogo" ScrollViewer.VerticalScrollBarVisibility="Auto"
                                                 Background="Transparent" ItemsSource="{Binding MarkupInfoSmallList}" Loaded="gogogo_Loaded">
                             <telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" HorizontalAlignment="Stretch" x:Name="MarkupList" ScrollViewer.VerticalScrollBarVisibility="Auto"
                                                 Background="Transparent" ItemsSource="{Binding MarkupInfoSmallList}" Loaded="MarkupList_Loaded">
                                 <telerik:RadListBox.ItemContainerStyle>
                                     <Style TargetType="telerik:RadListBoxItem">
                                         <Setter Property="Padding" Value="0,0,0,0"/>

             public List<FAVORITE_DOC> _FavoriteSet { get; set; }
             public event PropertyChangedEventHandler PropertyChanged;
             public Sample()
+            {
                 //InitializeComponent();
+            {
                 App.splashString(ISplashMessage.SAMPLE);
                 this.Loaded += Sample_Loaded;
                 //_Initialize = true;
                 //lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
                 //ImgListbox.MouseDoubleClick += ImgListbox_MouseDoubleClick;
+            }
             private void Sample_Loaded(object sender, RoutedEventArgs e)
-...
                 if(!_Initialize)
+                {
                     InitializeComponent();
                     //System.Diagnostics.Debug.WriteLine("Sample() : " + sw.ElapsedMilliseconds.ToString() + "ms");
                     _Initialize = true;
                     this.lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
                     this.ImgListbox.SelectionChanged += new SelectionChangedEventHandler(ImgListbox_SelectionChanged);
-...
             private string _DefaultUri = null;
             public ThumbnailItem CurrentPage = null;
             public int PageCount = 0;
             private bool _Initialize;
             public event EventHandler<PageChangeEventArgs> PageChanged;
             public event EventHandler<PageChangeEventArgs> PageChanging;
-...
                 public string PageUri { get; set; }
                 public int PageNumber { get; set; }
+            }
             private bool _IsFitOn { get; set; }
             public bool IsFitOn
+            {
-...
                 expCommentPages.PreviewCollapsed += new Telerik.Windows.RadRoutedEventHandler(expCommentPages_PreviewCollapsed);
                 expCommentPages.PreviewExpanded += new Telerik.Windows.RadRoutedEventHandler(expCommentPages_PreviewExpanded);
+            }
             void rdoCommented_Checked(object sender, RoutedEventArgs e)
+            {
                 Logger.sendCheckLog("rdoCommented_Checked", 1);
-...
+            {
                 SetCommentPages();
+            }
             void user_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+            {
                 SetCommentPages();
                 //System.Diagnostics.Debug.WriteLine(e.PropertyName);
+            }
             public void SetCommentPages()
+            {
                 ThumbnailSet();
-...
+            {
                 if (e.ClickCount >= 2)
+                {
                     var selectItem = gogogo.SelectedItem as IKCOM.MarkupItem;
                     var selectItem = MarkupList.SelectedItem as IKCOM.MarkupItem;
                     GotoPage(selectItem.PageNumber);
                     var result = MarkupParser.GetBaseControl(selectItem.Data);
                     Rect rect = new Rect(new Point(result.StartPoint.X - 100, result.StartPoint.Y - 100), new Point(result.EndPoint.X + 100, result.EndPoint.Y + 100));
-...
                     //};
                     //imageViewer.SizeMode = Leadtools.Windows.Controls.SizeMode.Normal;
                     //GotoPage(gogogo.SelectedItem as MarkupList)
                     //GotoPage(MarkupList.SelectedItem as MarkupList)
+                }
+            }
             private void commentUser_SelectionChanged(object sender, SelectionChangedEventArgs e)
+            {
                 gogogo.ItemsSource = null;
                 MarkupList.ItemsSource = null;
                 tbSearch.Text = string.Empty;
                 //List<MarkupInfoItemSmall> TempMarkupInfoSmallList = new List<MarkupInfoItemSmall>();
                 TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList();
+                }
                 List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentUser.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();
+                }
                 if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
                 if (commentPage.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList();
+                }
                 if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList(); }
                 gogogo.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
                 /*
                 tbSearch.Text = string.Empty;
                 if (e.AddedItems.Count > 0)
+                {
                     if (commentUser.Items.Count > 0)
+                    {
                         MarkupInfoSmallList.Clear();
                         #region 주석
                         //var d = e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault().MarkupList.First();
                         //d.PageNumber
                         //e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault().MarkupList.First().
                         //gogo.DataContext = e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault().MarkupList;
                         //gogogo.ItemsSource = e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault().MarkupList;
                         //gogogo.ItemsSource = ViewerDataModel.Instance._markupInfoList.Where(d=>d.UserName ==  sender as RadCombo
                         #endregion
                         var temp = e.AddedItems.Cast<MarkupInfoItem>().FirstOrDefault();
                         var markuplist = ViewerDataModel.Instance.MyMarkupList.Where(d => d.MarkupInfoID == temp.MarkupInfoID).ToList();
                         markuplist.ForEach(d =>
+                        {
                             MarkupInfoSmallList.Add(new MarkupInfoItemSmall
+                            {
                                 Data = d.Data,
                                 Data_Type = d.Data_Type,
                                 PageNumber = d.PageNumber,
                                 UserID = temp.UserID,
                                 UserName = temp.UserName,
                             });
                         });
                         gogogo.ItemsSource = null;
                         gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+                    }
+                }
                 else
+                {
                     MarkupInfoSmallList.Clear();
                     ViewerDataModel.Instance._markupInfoList.ToList().ForEach(d =>
+                    {
                         var markuplist = ViewerDataModel.Instance.MyMarkupList.Where(u => u.MarkupInfoID == d.MarkupInfoID).ToList();
                         markuplist.ForEach(b =>
+                        {
                             MarkupInfoSmallList.Add(new MarkupInfoItemSmall
+                            {
                                 Data = b.Data,
                                 Data_Type = b.Data_Type,
                                 PageNumber = b.PageNumber,
                                 UserID = d.UserID,
                                 UserName = d.UserName,
                             });
                         });
                     });
                     gogogo.ItemsSource = null;
                     gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+                }
                 */
                 MarkupList.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+            }
             public class MarkupInfoItemSmall
-...
                 public int Data_Type { get; set; }
+            }
             List<MarkupInfoItemSmall> TempMarkupInfoSmallList = new List<MarkupInfoItemSmall>();
             private List<MarkupInfoItemSmall> _MarkupInfoSmallList { get; set; }
             public List<MarkupInfoItemSmall> MarkupInfoSmallList
+            {
-...
+                }
+            }
             private void gogogo_Loaded(object sender, RoutedEventArgs e)
             private void MarkupList_Loaded(object sender, RoutedEventArgs e)
+            {
                 if (MarkupInfoSmallList.Count == 0)
+                {
-...
                             });
+                        }
                     });
                     gogogo.ItemsSource = null;
                     gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                     MarkupList.ItemsSource = null;
                     MarkupList.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                     commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
                     commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList();
+                }
+            }
             public void markupListUpdate(MarkupReturn res, Event_Type eventType, string CommentID, MarkupInfoItem item)
             public void MarkupListUpdate(MarkupReturn res, Event_Type eventType, string CommentID, MarkupInfoItem item)
+            {
                 if (MarkupInfoSmallList.Count == 0)
+                {
-...
                             });
+                        }
                     });
                     gogogo.ItemsSource = null;
                     gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                     MarkupList.ItemsSource = null;
                     MarkupList.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                     commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
                     commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList();
+                }
-...
                             MarkupInfoSmallList.RemoveAll(p => p.Id.Equals(CommentID));
+                        }
                         break;
                     case Event_Type.Thumb://이동 회전,,,,,
                     case Event_Type.Thumb://이동 회전
                         MarkupInfoSmallList.RemoveAll(p => p.Id.Equals(res.CommentID));
                         MarkupInfoSmallList.Add(new MarkupInfoItemSmall
+                        {
-...
                         break;
                     default:
                         break;
+                }
                 //TempMarkupInfoSmallList = new List<MarkupInfoItemSmall>();
                 TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList();
+                }
                 if (commentUser.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();
+                }
                 List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
                 if (commentPage.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList();
+                }
                 if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();                 }
                 gogogo.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
                 MarkupList.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList();
                 commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
                 commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
+            }
             private void commentType_SelectionChanged(object sender, SelectionChangedEventArgs e)
+            {
                 gogogo.ItemsSource = null;
                 MarkupList.ItemsSource = null;
                 tbSearch.Text = string.Empty;
                 /*
                 if (e.AddedItems.Count > 0)
+                {
                     gogogo.ItemsSource = MarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(e.AddedItems[0])).ToList();
+                }
                 else
+                {
                     gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+                }
                 */
                 List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
                // List<MarkupInfoItemSmall> TempMarkupInfoSmallList = new List<MarkupInfoItemSmall>();
                 TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList();
+                }
                 if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList(); }
                 if (commentUser.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();
+                }
                 if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
                 if (commentPage.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList();
+                }
                 gogogo.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 MarkupList.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+            }
             private void commentPage_SelectionChanged(object sender, SelectionChangedEventArgs e)
+            {
                 gogogo.ItemsSource = null;
                 MarkupList.ItemsSource = null;
                 tbSearch.Text = string.Empty;
                 /*
                 if (e.AddedItems.Count > 0)
+                {
                     gogogo.ItemsSource = MarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(e.AddedItems[0])).ToList();
+                }
                 else
+                {
                     gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+                }
                 */
                 //List<MarkupInfoItemSmall> TempMarkupInfoSmallList = new List<MarkupInfoItemSmall>();
                 TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList();
+                }
                 List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); }
                 if (commentUser.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList();
+                }
                 if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList(); }
                 if (commentPage.SelectedValue != null)
+                {
                     TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList();
+                }
                 if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); }
                 gogogo.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
                 MarkupList.ItemsSource = TempMarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
+            }
             private void btnPanorama_Click(object sender, RoutedEventArgs e)
-...
+                                }
+                            }
                             break;
+                    }
+                }
                 gogogo.ItemsSource = null;
                 gogogo.ItemsSource = small_list.OrderBy(d => d.PageNumber).ToList();
                 MarkupList.ItemsSource = null;
                 MarkupList.ItemsSource = small_list.OrderBy(d => d.PageNumber).ToList();
                 tbSearch.Text = string.Empty;
+            }
+        }

                 ViewerDataModel.Instance.UndoDataList.Add(UndoData);
                 ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                 ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                     MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
                 control.ApplyOverViewData();

                                 id = (InnerItem.Symbol_ID != null) ? "|SymbolID|" + InnerItem.Symbol_ID : "";
                                 MarkupData += "|OR|" + data.ConvertData + id;
                                 ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                                 ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                                 null, Event_Type.Delete, data.CommentID, null);
+                            }

                     var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == comment.CommentID).FirstOrDefault();
                     ViewerDataModel.Instance.MyMarkupList.Remove(Item_);
                     ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                     ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                     null, Event_Type.Delete, MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID).CommentID, null);
+                }

                             UndoData.Markup_List.Add(multi_Undo_Data);
                             ViewerDataModel.Instance.UndoDataList.Add(UndoData);
                             ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                             ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                             MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
+                        }
+                    }
-...
                         Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final);
                         ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                         ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                             MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
+                    }
                     catch (Exception ex)

KCOM/Events/RedoCommand.cs
58	58	foreach (var item in redo.Markup_List)
59	59	{
60	60	ViewerDataModel.Instance.MarkupControls_USER.Add(item.Markup);
61		ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
	61	ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
62	62	MarkupParser.MarkupToString(item.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
63	63	}
64	64	}
...	...
68	68	foreach (var item in redo.Markup_List)
69	69	{
70	70	ViewerDataModel.Instance.MarkupControls_USER.Remove(item.Markup);
71		ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
	71	ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
72	72	null, Event_Type.Delete, item.Markup.CommentID, null);
73	73	}
74	74	}

KCOM/Events/UndoCommand.cs
88	88
89	89	multi_Undo_Data.Markup = comment;
90	90	UndoData.Markup_List.Add(multi_Undo_Data);
91		ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
	91	ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
92	92	MarkupParser.MarkupToString(multi_Undo_Data.Markup, App.ViewInfo.UserID), Event_Type.Thumb, null, null);
93	93
94	94	multi_Undo_Data = new Multi_Undo_data();
...	...
119	119	foreach (var item in undo.Markup_List)
120	120	{
121	121	ViewerDataModel.Instance.MarkupControls_USER.Remove((item.Markup));
122		ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
	122	ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
123	123	null, Event_Type.Delete, item.Markup.CommentID, null);
124	124	}
125	125	}
...	...
129	129	foreach (var item in undo.Markup_List)
130	130	{
131	131	ViewerDataModel.Instance.MarkupControls_USER.Add(item.Markup);
132		ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
	132	ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
133	133	MarkupParser.MarkupToString(item.Markup, App.ViewInfo.UserID), Event_Type.Create, null, null);
134	134	}
135	135	}

                 ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(a =>
+                {
                     ViewerDataModel.Instance.MarkupControls_USER.Remove(a);
                     ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.markupListUpdate(
                     ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.MarkupListUpdate(
                     null, Event_Type.Delete, a.CommentID, null);
                 });

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 39f0624f