/KCOM/Events/Implementation/TopMenuEvent.cs - Diff - MARKUS - 일정관리

개정판 fd19a116

ID	fd19a1166b3c545ba5b10a9dbf1d7cfd64cfaaab
상위	284ed1c7
하위	e024b149

백흠경이(가) 3달 전에 추가함

Fix: Conslidate할때 Z정렬이 유지되지 않는 오류 수정

Change-Id: I54e1878e0365f94ede14e366e6e769fe9fd4b4ec

+    {
         public partial class TopMenu : UserControl
+        {
             public int rotateOffSet = 0;
             private double[] rotateValue = { 0, 90, 180, 270 };
             public System.Windows.Threading.DispatcherTimer SaveTimer { get; set; }
             public bool isClosed = true;
-...
                 Error,
+            }
             /// <summary>
             ///  comment의 속성 변경시 저장여부 확인 하도록 undocommand에 추가
             /// </summary>
             /// <param name="adnoerFinal"></param>
             public void ChangeComment(Controls.AdornerFinal adnoerFinal)
+            {
                 var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>();
                 if (adornerMembers.Count() > 0)
+                {
                     //UndoCommand.Instance.Push(adornerMembers.Select(x => x.DrawingData).Cast<CommentUserInfo>().ToList(), adnoerFinal.AngleValue);
                     UndoCommand.Instance.Push(EventType.Operation, adornerMembers.Select(x => x.DrawingData).Cast<CommentUserInfo>().ToList());
+                }
+            }
             //강인구 추가(Undo End)
             private void SetPaintEvent()
+            {
-...
             /// </summary>
             /// <param name="sender"></param>
             /// <param name="e"></param>
             public  void SaveEventCallback(object sender, RoutedEventArgs e)
             public async void SaveEventCallback(object sender, RoutedEventArgs e)
+            {
                 var mianMenu = this.ParentOfType<MainWindow>().dzMainMenu;
                 if (mianMenu.busyIndicator.IsBusy == true)
                 if (mianMenu.busyIndicator.IsBusy)
+                {
                     return;
+                }
-...
                 //{
                     this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = true;
                     _SaveEvent(sender, e);
                     await SaveEventAsync(sender, e);
                     mianMenu.busyIndicator.IsBusy = false;
-...
             ///  - unselect and update my markup list
             /// <param name="sender"></param>
             /// <param name="e"></param>
             public async Task<bool> _SaveEvent(object sender, RoutedEventArgs e)
             public async Task<bool> SaveEventAsync(object sender, RoutedEventArgs e)
+            {
                 bool result = false;
-...
                 return result;
+            }
             public async Task<bool>  SaveEventAsync()
+            {
                 bool result = false;
                 var mainMenu = this.ParentOfType<MainWindow>().dzMainMenu;
                 try
+                {
                     mainMenu.ConvertInkControlToPolygon();
                     // update mylist and gridview
                     mainMenu.UpdateMyMarkupList();
                     if (mainMenu.gridViewMarkup.SelectedItems.Count == 0 && mainMenu.gridViewMarkup.Items.Count > 0)
+                    {
                         this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
+                    }
                     else
+                    {
                         foreach (var item in mainMenu.gridViewMarkup.SelectedItems)
+                        {
                             if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID)
+                            {
                                 /// 저장 서비스 호출
                                 result = await this.ExecuteSaveCommandAsync(mainMenu);
                                 ViewerDataModel.Instance._markupInfoList.Where(data => data.MarkupInfoID == (item as IKCOM.MarkupInfoItem).MarkupInfoID).FirstOrDefault().UpdateTime = DateTime.Now;
+                            }
+                        }
+                    }
                     mainMenu.SetCommentPages(null);
                     ViewerDataModel.Instance.UndoDataList.Clear();
                     result = true;
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine("_SaveEvent Error : " + ex.ToString());
+                }
                 finally
+                {
                     /*
                     /// delete markup information when 코멘트가 없을 경우
                     if (ViewerDataModel.Instance.MyMarkupList.Count == 0)
+                    {
                         foreach (var item in menu.gridViewMarkup.SelectedItems)
+                        {
                             if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID)
+                            {
                                 //this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem));
+                            }
+                        }
+                    }
                     */
+                }
                 return result;
+            }
             /// <summary>
             /// 마크업 데이터를 저장한다.
             /// </summary>
-...
                         instanceMain.dzMainMenu.rotate.Angle -= 90;
+                    }
+                }
                 //double angle = (double)rotateValue.GetValue(rotateOffSet);
                 //instanceMain.dzMainMenu.rotate.Angle = angle;
                 //var rotationNum = Math.Abs((instanceMain.dzMainMenu.rotate.Angle / 90));
-...
                  public double height { get; set; }
+             }
              */
             private async void CollapsedButton_Click()
+            {
                 this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); // 저장하지 못한 데이터가 있다면 저장
                 string[] data = new string[0];
                 int cnt = 0;
                 var menu = this.ParentOfType<MainWindow>().dzMainMenu;
                 List<MarkupInfoItem> gridSelectionItem = menu.gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업
                 foreach (var item in gridSelectionItem)
+                {
                     if ((item.UserID == App.ViewInfo.UserID) && (ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage != null))
+                    {
                         var instance = ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber &&
                         d.MarkupInfoID == item.MarkupInfoID).ToList();
                         data = new string[instance.Count];
                         foreach (var markup in instance)
+                        {
                             data[cnt++] = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(markup.Data,ViewerDataModel.Instance.NewMarkupCancelToken());
+                        }
+                    }
+                }
                 if (data != null && KCOM.Properties.Settings.Default.cad == 1)
+                {
                     string FilePath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\Cad");
                     string FileName = FilePath + "\\commentstring.json"; // Default file name
                     if (!File.Exists(FilePath))
+                    {
                         Directory.CreateDirectory(FilePath);
+                    }
                     if (!string.IsNullOrEmpty(FileName))
+                    {
                         //  File.WriteAllText(SaveDig.FileName, data);
                         File.WriteAllLines(FileName, data);
+                    }
+                }
+            }
             private double minHeight;
             private double minWidth;

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 fd19a116