/KCOM/Views/MainMenu.xaml.cs - Diff - MARKUS - 일정관리

개정판 fd19a116

ID	fd19a1166b3c545ba5b10a9dbf1d7cfd64cfaaab
상위	284ed1c7
하위	e024b149

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

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

Change-Id: I54e1878e0365f94ede14e366e6e769fe9fd4b4ec

     using MarkupToPDF.Controls.Text;
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Linq;
     using System.Reflection;
-...
             public CommentUserInfo previousControl { get; set; }
             public CommentUserInfo currentControl { get; set; }
             public ControlType controlType { get; set; }
             private Move move = new Move();
             private double[] rotateValue = { 0, 90, 180, 270 };
             public MouseHandlingMode mouseHandlingMode = MouseHandlingMode.None;
             public MouseHandlingMode mouseHandlingMode { get; set; } = MouseHandlingMode.None;
             private static readonly double DragThreshold = 5;
             private System.Windows.Input.Cursor cursor { get; set; }
-...
             private Point canvasZoommovingMouseDownPoint;
             private List<object> ControlList = new List<object>();
             private ListBox listBox = new ListBox();
             private Dictionary<Geometry, string> selected_item = new Dictionary<Geometry, string>();
             private bool isDraggingSelectionRect = false;
             private VPRevision CurrentRev { get; set; }
             public RadRibbonButton btnConsolidate { get; set; }
-...
             public RadRibbonButton btnConsolidateFinalPDF { get; set; }
             public string Filename_ { get; set; }
             public double L_Size = 0;
             public AdornerFinal adorner_;
             public UndoData multi_UndoData;
             public string Symbol_ID = "";
-...
             private Point Sync_Offset_Point;
             //강인구 테스트
             private Path _SelectionPath { get; set; }
             public Path SelectionPath
+            {
                 get
+                {
                     return _SelectionPath;
+                }
                 set
+                {
                     if (_SelectionPath != value)
+                    {
                         _SelectionPath = value;
                         RaisePropertyChanged("SelectionPath");
+                    }
+                }
+            }
             private System.Windows.Controls.Image _imageViewer { get; set; }
             public System.Windows.Controls.Image imageViewer
-...
                 public int IsUpdate { get; set; }
+            }
             private List<TempDt> tempDtList = new List<TempDt>();
             public void SetCursor()
+            {
                 this.Cursor = cursor;
-...
                 /// add or update markup list
                 foreach (var control in ViewerDataModel.Instance.MarkupControls_USER)
+                {
                     #region Index를 저장한다.
                     control.Index = ViewerDataModel.Instance.MarkupControls_USER.IndexOf(control);
                     #endregion
                     var markup = MarkupParser.MarkupToString(control, App.ViewInfo.UserID);
                     var exist = ViewerDataModel.Instance.MyMarkupList.Find(data => data.ID == markup.CommentID);
-...
             private async Task PageChangingAsync(DOCPAGE currentPage, int changePageNumber, CancellationToken token)
+            {
                 var BalancePoint = ViewerDataModel.Instance.PageBalanceMode == true ? changePageNumber + ViewerDataModel.Instance.PageBalanceNumber : changePageNumber;
                 var BalancePoint = ViewerDataModel.Instance.PageBalanceMode ? changePageNumber + ViewerDataModel.Instance.PageBalanceNumber : changePageNumber;
                 #region 페이지가 벗어난 경우
-...
                 instanceMain.dzTopMenu.tlcurrentPage.Text = e.CurrentPage.PAGE_NUMBER.ToString();
                 instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = e.CurrentPage.PAGE_NUMBER.ToString();
                 instanceMain.dzTopMenu.rotateOffSet = 0;
                 var pageinfo = this.CurrentDoc.docInfo.DOCPAGE.FirstOrDefault(p => p.PAGE_NUMBER == e.CurrentPage.PAGE_NUMBER);
                 drawingPannelRotate(pageinfo.PAGE_ANGLE);
-...
                 textControl.Base_TextBlock.Visibility = Visibility.Visible;
+            }
             private SymControlN GetSymNControl(double PageWidth, double PageHeight, string userId, string markupInfoId, Point startPosition)
+            {
                 SymControlN result = null;
                 try
+                {
                     double height = 80;
                     double itemWidth = 180;
                     System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
                     System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y + height);
                     System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + height);
                     System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y);
                     result = new SymControlN
+                    {
                         CommentID = Commons.ShortGuid(),
                         MarkupInfoID = markupInfoId,
                         UserID = userId,
                         PointSet = new List<Point> { startPoint, leftBottomPoint, endPoint, topRightPoint },
                         StartPoint = startPoint,
                         EndPoint = endPoint,
                         CommentAngle = 0,
                         LeftBottomPoint = leftBottomPoint,
                         TopRightPoint = topRightPoint,
                         Opacity = 1,
                         PathXathData = "eJy1Ul1PwjAU/SvN9c3EdY5g1FAShyIxRgygxsemu7AbupZ0Vae/3g42/Azxxfuw9Z7Tnpx72t6lo4zdyAIFyHUBqwptSgG596tTzkuVYyHLqCDlbGnnPlK24C9k5hVP4viIV7LQfOWwROOlJ2ug36tVo1Sq5cLZJ5P1e1OrKRtYbV3qnsqcrZcC9oZNARuvpCL/KiCODoHxfo//EJmg8tIsNLKpd+hVLmBIWkPd2iU2cnGoFprlpJYGyzBOt8WuyeCVJSNgUstCM/1WHNgDZT5oJ3E4M0Ja5F7A8QmwgTTPIYlrnAfgIIm6W2hmVy3CN9M3GUzsyznOyVAdTBlG+NxvxffXx37nOlF3Fx3vppNd5P6nnL8bnWHlU23VktUrAWe3t5Px/cU5sKE1/qFRuKi8k6nV2Qae0ltIshPXncPNtX25lZF19BY2Sn2maWGK8GQEDMIXHbB7dJ7Ur1RrUcDmbXx3l76y0eN4endz+Qd/yX/663xk2v7eAQ==",
                         Memo = null
                     };
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());
+                }
                 return result;
+            }
             private RectangleControl GetRectControl(double PageWidth, double PageHeight, string userId, string markupInfoId, Point startPosition)
+            {
                 RectangleControl result = null;
                 try
+                {
                     double height = 80;
                     double itemWidth = 180;
                     System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
                     System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y + height);
                     System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + height);
                     System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y);
                     result = new RectangleControl
+                    {
                         CommentID = Commons.ShortGuid(),
                         MarkupInfoID = markupInfoId,
                         LineSize = 5,
                         Paint = MarkupToPDF.Controls.Common.PaintSet.None,
                         StartPoint = startPoint,
                         EndPoint = endPoint,
                         CommentAngle = 0,
                         StrokeColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 0x0, 0x0)),
                         //StrokeColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 64, 224, 208)),
                         FillColor = null,
                         DashSize = new System.Windows.Media.DoubleCollection(new[] { 999999.0 }),
                         Opacity = 1,
                         LeftBottomPoint = leftBottomPoint,
                         TopRightPoint = topRightPoint,
                         PointSet = new List<Point> { startPoint, leftBottomPoint, endPoint, topRightPoint },
                         UserID = userId,
                         Memo = null
                     };
+                }
                 catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());
+                }
                 return result;
+            }
             private TextControl GetTextControl(double PageWidth, double PageHeight, string userId, string markupInfoId, string Text, double fontSize, FontWeight fontWeight, TextAlignment textAlignment, Rect parentRect, double positionY)
+            {
                 TextControl result = null;
                 try
+                {
                     var txtSize = ShapeMeasure(new TextBlock { Text = Text, FontSize = fontSize, FontWeight = fontWeight, FontFamily = new FontFamily("Tahoma") });
                     double startPositionX = parentRect.X;
                     switch (textAlignment)
+                    {
                         case TextAlignment.Right:
                             startPositionX = parentRect.X + parentRect.Width - txtSize.Width;
                             break;
                         case TextAlignment.Center:
                             startPositionX = parentRect.X + parentRect.Width / 2 - txtSize.Width / 2 - 3;
                             break;
+                    }
                     Point startPosition = new Point
+                    {
                         X = startPositionX,
                         Y = positionY
                     };
                     System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
                     System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + txtSize.Width, startPosition.Y + txtSize.Height);
                     System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + txtSize.Height);
                     System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + txtSize.Width, startPosition.Y);
                     result = new TextControl
+                    {
                         CommentID = Commons.ShortGuid(),
                         MarkupInfoID = markupInfoId,
                         Text = Text,
                         StartPoint = startPoint,
                         EndPoint = endPoint,
                         CanvasX = startPosition.X,
                         CanvasY = startPosition.Y,
                         BoxWidth = txtSize.Width,
                         BoxHeight = txtSize.Height,
                         ControlType_No = 0,
                         LineSize = new Thickness(5),
                         TextSize = fontSize,
                         Foreground = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 0, 0)),
                         FontSize = 10,
                         UserID = userId,
                         IsHighLight = false,
                         CommentAngle = 0,
                         PointSet = new List<Point>(),
                         Opacity = 1,
                         IsSelected = false,
                         TextFamily = new FontFamily("Tahoma"),
                         TextStyle = FontStyles.Normal,
                         TextWeight = FontWeights.Bold
                     };
+                }
                 catch (Exception ex)
+                {
+                }
                 return result;
+            }
             public static Size ShapeMeasure(UIElement e)
+            {
                 // Measured Size is bounded to be less than maxSize
                 Size maxSize = new Size(
                      double.PositiveInfinity,
                      double.PositiveInfinity);
                 e.Measure(maxSize);
                 return e.DesiredSize;
+            }
             /// <summary>
             /// 주어진 pageNumber의 마크업 데이터를 읽어 화면에 표시한다.
             /// </summary>
-...
+                }
                 #endregion
                 System.Diagnostics.Debug.WriteLine("MarkupLoad - MarkupParser " + new TimeSpan(stopwatch.ElapsedTicks).ToString());
                 /// fire selection event
                 List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업
                 this.gridViewMarkup.UnselectAll();
-...
                 //db에 업데이트 한 list 를 view 에 업데이트
                 string sDocID = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID;
                 List<MarkupInfoItem> results = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, sDocID);
                 MarkupInfoItem dbinfo = results.Where(x => x.MarkupInfoID == markupinfo_id).FirstOrDefault();
                 MarkupInfoItem viewinfo = Common.ViewerDataModel.Instance._markupInfoList.Where(x => x.MarkupInfoID == markupinfo_id).FirstOrDefault();
                 MarkupInfoItem dbinfo = results.Find(x => x.MarkupInfoID == markupinfo_id);
                 MarkupInfoItem viewinfo = Common.ViewerDataModel.Instance._markupInfoList.FirstOrDefault(x => x.MarkupInfoID == markupinfo_id);
                 if (dbinfo.MarkupList.Count > 0)
+                {
                     if (viewinfo.MarkupList != null)
-...
+                {
                     ControlList.Clear();
                     listBox.Items.Clear();
                     selected_item.Clear();
                     (item as IMarkupCommonData).IsSelected = false;
+                }
+            }
             public void ReleaseSelectPath()
+            {
                 if (SelectionPath == null)
+                {
                     SelectionPath = new Path();
                     SelectionPath.Name = "";
+                }
                 if (SelectionPath.Name != "")
+                {
                     SelectionPath.Name = "None";
+                }
                 SelectionPath.Opacity = 0.01;
                 SelectionPath.RenderTransform = null;
                 SelectionPath.RenderTransformOrigin = new Point(0, 0);
+            }
             #region 컨트롤 초기화
             public void Control_Init(object control)
+            {
                 if (L_Size != 0 && (control as IPath) != null)
+                {
                     (control as IPath).LineSize = L_Size;
                     L_Size = 0;
+                }
                 switch (control.GetType().Name)
+                {
                     case "RectangleControl":
+                        {
                             (control as RectangleControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "CircleControl":
+                        {
                             (control as CircleControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "TriControl":
+                        {
                             (control as TriControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "RectCloudControl":
+                        {
                             (control as RectCloudControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "CloudControl":
+                        {
                             (control as CloudControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "PolygonControl":
+                        {
                             (control as PolygonControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "ArcControl":
+                        {
                             (control as ArcControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "ArrowArcControl":
+                        {
                             (control as ArrowArcControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "LineControl":
+                        {
                             (control as LineControl).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "ArrowControl_Multi":
+                        {
                             (control as ArrowControl_Multi).StrokeColor = Brushes.Red;
+                        }
                         break;
                     case "TextControl":
+                        {
                             (control as TextControl).BackInnerColor = new SolidColorBrush(Color.FromArgb(Convert.ToByte(255 * 0.6), Colors.White.R, Colors.White.G, Colors.White.B));
+                        }
                         break;
                     case "ArrowTextControl":
+                        {
                             (control as ArrowTextControl).BackInnerColor = new SolidColorBrush(Color.FromArgb(Convert.ToByte(255 * 0.6), Colors.White.R, Colors.White.G, Colors.White.B));
+                        }
                         break;
                     case "InsideWhiteControl":
+                        {
                             (control as InsideWhiteControl).StrokeColor = Brushes.White;
+                        }
                         break;
                     case "OverlapWhiteControl":
+                        {
                             (control as OverlapWhiteControl).StrokeColor = Brushes.White;
+                        }
                         break;
                     case "ClipWhiteControl":
+                        {
                             (control as ClipWhiteControl).StrokeColor = Brushes.White;
+                        }
                         break;
                     case "CoordinateControl":
+                        {
                             (control as CoordinateControl).StrokeColor = Brushes.Black;
+                        }
                         break;
+                }
+            }
             #endregion 컨트롤 초기화
             public void firstCondition_MouseLeave(object sender, MouseEventArgs e)
+            {
                 //Control_Init(e.Source);
+            }
             //private Window _dragdropWindow = null;
             [DllImport("user32.dll")]
-...
                 public Int32 Y;
             };
             /*
            public string symbol_id = null;
            public long symbol_group_id;
            public int symbol_SelectedIndex;
            public ImageSource symbol_img;
            public string symbol_Data = null;
            public void symboldata(string id, long group_id, int SelectedIndex, string Data_, ImageSource img)
+           {
                PlaceImageSymbol(symbol_id, symbol_group_id, symbol_SelectedIndex, new Point(zoomAndPanCanvas.ActualWidth / 2,
                    zoomAndPanCanvas.ActualHeight / 2));
                    if (this._dragdropWindow != null)
+                   {
                        this._dragdropWindow.Close();
                        this._dragdropWindow = null;
+                   }
                    symbol_id = id;
                    symbol_group_id = group_id;
                    symbol_SelectedIndex = SelectedIndex;
                    symbol_Data = Data_;
                    symbol_img = img;
                    CreateDragDropWindow2(img);
+        }
         private void CreateDragDropWindow2(ImageSource image)
+            {
                 this._dragdropWindow = new Window();
                 _dragdropWindow.Cursor = new Cursor(App.DefaultArrowCursorStream);
                 _dragdropWindow.WindowStyle = WindowStyle.None;
                 _dragdropWindow.AllowsTransparency = true;
                 _dragdropWindow.AllowDrop = false;
                 _dragdropWindow.Background = null;
                 _dragdropWindow.IsHitTestVisible = false;
                 _dragdropWindow.SizeToContent = SizeToContent.WidthAndHeight;
                 _dragdropWindow.Topmost = true;
                 _dragdropWindow.ShowInTaskbar = false;
                 Rectangle r = new Rectangle();
                 r.Width = image.Width;
                 r.Height = image.Height;
                 r.Opacity = 0.5;
                 r.Fill = new ImageBrush(image);
                 this._dragdropWindow.Content = r;
                 Win32Point w32Mouse = new Win32Point();
                 GetCursorPos(ref w32Mouse);
                 //w32Mouse.X = getCurrentPoint.X;
                 this._dragdropWindow.Left = w32Mouse.X - (image.Width / 2);
                 this._dragdropWindow.Top = w32Mouse.Y - (image.Height / 2);
                 this._dragdropWindow.Show();
+            }
              */
             public void MoveZoomAndPanControl(Vector dragOffset)
+            {
                 zoomAndPanControl.ContentOffsetX -= dragOffset.X;
-...
+                }
+            }
             private CommentUserInfo enterMouse = null;
             private object IntersectsControls(Point mousePosition, Canvas drawingRotateCanvas)
+            {
                 object result = null;
                 // 검색할 정사각형의 크기 및 반경 설정
                 double squareSize = 1;
                 Rect searchRect = new Rect(
                     mousePosition.X - squareSize,
                     mousePosition.Y - squareSize,
                     squareSize * 2,
                     squareSize * 2
                 );
                 foreach (CommentUserInfo child in drawingRotateCanvas.ChildrenOfType<CommentUserInfo>())
+                {
                     if (child is CommentUserInfo comment)
+                    {
                         // 검색 영역과 Rectangle의 경계가 겹치는지 확인합니다.
                         if (searchRect.IntersectsWith(child.ItemRect))
+                        {
                             child.IsMouseEnter = true;
                             result = (object)child;
                             // Geometry를 적용하거나 원하는 작업을 수행합니다.
                             // 예: rectangle.Fill = new SolidColorBrush(Colors.Red);
+                        }
                         else
+                        {
                             child.IsMouseEnter = false;
+                        }
+                    }
+                }
                 return result;
+            }
             private void zoomAndPanControl2_MouseMove(object sender, MouseEventArgs e)
+            {
                 if ((e.MiddleButton == MouseButtonState.Pressed) || (e.RightButton == MouseButtonState.Pressed))
-...
+                }
+            }
             private List<CommentUserInfo> hitList = new List<CommentUserInfo>();
             private void zoomAndPanControl_MouseUp(object sender, MouseButtonEventArgs e)
+            {
                 IsDrawing = false;
-...
                 ViewerDataModel.Instance.MarkupAngle = rotate.Angle;
+            }
             private void syncPannelRotate(double angle)
+            {
                 //Logger.sendCheckLog("pageNavigator_PageChanging_drawingPannelRotate Setting", 1);
                 rotate.Angle = angle;
                 var rotationNum = Math.Abs((rotate.Angle / 90));
                 if (angle == 90 || angle == 270)
+                {
                     double emptySize = zoomAndPanCanvas2.Width;
                     zoomAndPanCanvas2.Width = zoomAndPanCanvas2.Height;
                     zoomAndPanCanvas2.Height = emptySize;
+                }
                 if (angle == 0)
+                {
                     translate2.X = 0;
                     translate2.Y = 0;
+                }
                 else if (angle == 90)
+                {
                     translate2.X = zoomAndPanCanvas2.Width;
                     translate2.Y = 0;
+                }
                 else if (angle == 180)
+                {
                     translate2.X = zoomAndPanCanvas2.Width;
                     translate2.Y = zoomAndPanCanvas2.Height;
+                }
                 else
+                {
                     translate2.X = 0;
                     translate2.Y = zoomAndPanCanvas2.Height;
+                }
                 zoomAndPanControl2.RotationAngle = rotate.Angle;
+            }
             public void PlaceImageSymbol(string id, string groupID, int SelectedIndex, Point canvasZoomPanningMouseDownPoint)
+            {
                 string Data_ = "";
                 try
+                {
                     //Logger.sendReqLog("GetSymbolImageURL: ", id + "," + SelectedIndex, 1);
                     Data_ = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolImageURL(id, SelectedIndex);
                     if (Data_ != null || Data_ != "")
+                    {
                         //Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);
+                    }
                     else
+                    {
                         //Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);
+                    }
                     //MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP
                     //{
                     //    SYMBOL_ID = id,//InnerItem.Symbol_ID
                     //    STATE = 0,
                     //};
                     if (Data_ != null)
+                    {
                         Image img = new Image();
                         //img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(Data_));
                         if (Data_.Contains(".svg"))
+                        {
                             SharpVectors.Converters.SvgImageExtension svgImage = new SharpVectors.Converters.SvgImageExtension(Data_);
                             img.Source = (DrawingImage)svgImage.ProvideValue(null);
+                        }
                         else
+                        {
                             img.Source = new BitmapImage(new Uri(Data_));
+                        }
                         var currentControl = new MarkupToPDF.Controls.Etc.ImgControl
+                        {
                             PointSet = new List<Point>(),
                             FilePath = Data_,
                             ImageData = img.Source,
                             StartPoint = canvasZoomPanningMouseDownPoint,
                             EndPoint = new Point(canvasZoomPanningMouseDownPoint.X + img.Source.Width,
                             canvasZoomPanningMouseDownPoint.Y + img.Source.Height),
                             TopRightPoint = new Point(canvasZoomPanningMouseDownPoint.X + img.Source.Width,
                             canvasZoomPanningMouseDownPoint.Y),
                             LeftBottomPoint = new Point(canvasZoomPanningMouseDownPoint.X,
                             canvasZoomPanningMouseDownPoint.Y + img.Source.Height)
                         };
                         currentControl.PointSet = new List<Point>
+                                            {
                                                 currentControl.StartPoint,
                                                 currentControl.LeftBottomPoint,
                                                 currentControl.EndPoint,
                                                 currentControl.TopRightPoint,
                                             };
                         UndoDataGroup = new UndoDataGroup()
+                        {
                             IsUndo = false,
                             Event = EventType.Create
                         };
                         ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i =>
+                        {
                             ViewerDataModel.Instance.UndoDataList.Remove(i);
                         });
                         //multi_UndoData = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         var UndoData = new UndoData(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         UndoDataGroup.MarkupDataColl.Add(UndoData);
                         ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup);
                         ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         currentControl.CommentID = Commons.ShortGuid();
                         currentControl.SymbolID = id;
                         currentControl.GroupID = groupID;
                         currentControl.ApplyTemplate();
                         currentControl.SetImage();
                         ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         SelectLayer.Children.Add(final);
+                    }
+                }
                 catch (Exception ex)
+                {
                     this.ParentOfType<MainWindow>().dzMainMenu.DialogMessage_Alert(ex.Message, "Error");
+                }
+            }
             // 저장전 textbox 입력 완료 때문에 public로 하여 savecommand에서 호출하도록 임시로 함.
             public async void zoomAndPanControl_MouseDown(object sender, MouseButtonEventArgs e)
+            {
-...
+                                    }
                                     else
+                                    {
                                         this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null);
                                         await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync(null, null);
                                         if (ViewerDataModel.Instance.MyMarkupList.Any(d => d.PageNumber == Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber
                                          && d.Data_Type == Convert.ToInt32(MarkupToPDF.Controls.Common.ControlType.Coordinate)))
+                                        {
-...
+            {
                 foreach (var item in SelectionSet.Instance.SelectedItems)
+                {
                     item.ZIndex = 99;
                     item.ZIndex = CommentUserInfo.MaxZIndex;
                     item.Index = -1;
                     Canvas.SetZIndex(item, item.ZIndex);
                     item.UpdateControl();
-...
+                        {
                             if (item.GetType().Name == "AdornerFinal")
+                            {
                                 foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>())
                                 foreach (var InnerItem in (item as Controls.AdornerFinal).Members)
+                                {
                                     AdonerList.Add(InnerItem);
+                                }
-...
             private void RemoveLineStroke(Point P)
+            {
                 var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault();
                 var control = ViewerDataModel.Instance.MarkupControls_USER.FirstOrDefault(data => data.IsMouseEnter);
                 if (control != null)
+                {
                     UndoCommand.Instance.Push(EventType.Delete, new List<CommentUserInfo>() { control });
-...
                 if (result)
+                {
                     var consolidateItem = ViewerDataModel.Instance._markupInfoList.Where(x => x.Consolidate == 1 && x.AvoidConsolidate == 0);
                     if (consolidateItem?.Count() > 0)
+                    {
                         gridViewMarkup.Select(consolidateItem);
-...
+                        }
+                    }
                     var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync();
                     var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync(null, null);
                     if (isSave)
+                    {
                         var token = ViewerDataModel.Instance.NewMarkupCancelToken();
-...
+                }
                 else
+                {
                     var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync();
                     var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync(null, null);
                     if (isSave)
+                    {
                         var token = ViewerDataModel.Instance.NewMarkupCancelToken();
-...
+                }
+            }
             public async Task<PngBitmapEncoder> symImageAsync(string data)
+            {
                 Canvas _canvas = new Canvas();
                 _canvas.Background = Brushes.White;
                 _canvas.Width = adorner_.BorderSize.Width;
                 _canvas.Height = adorner_.BorderSize.Height;
                 await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, _canvas,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", ViewerDataModel.Instance.NewMarkupCancelToken(),
                     STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 RenderTargetBitmap renderBitmap = new RenderTargetBitmap((int)_canvas.Width + 50, (int)_canvas.Height + 50, 96d, 96d, PixelFormats.Pbgra32);
                 DrawingVisual dv = new DrawingVisual();
                 _canvas.Measure(new System.Windows.Size(adorner_.BorderSize.Width + 50, adorner_.BorderSize.Height + 50));
                 _canvas.Arrange(new Rect(new System.Windows.Point { X = -adorner_.BorderSize.X - 20, Y = -adorner_.BorderSize.Y - 20 }, new Point(adorner_.BorderSize.Width + 20, adorner_.BorderSize.Height + 20)));
                 using (DrawingContext ctx = dv.RenderOpen())
+                {
                     VisualBrush vb = new VisualBrush(_canvas);
                     ctx.DrawRectangle(vb, null, new Rect(new System.Windows.Point { X = -adorner_.BorderSize.X, Y = -adorner_.BorderSize.Y }, new Point(adorner_.BorderSize.Width + 20, adorner_.BorderSize.Height + 20)));
+                }
                 try
+                {
                     renderBitmap.Render(dv);
                     GC.Collect(2);
                     GC.WaitForPendingFinalizers();
                     //GC.Collect();
                     // encode png data
                     PngBitmapEncoder pngEncoder = new PngBitmapEncoder();
                     // puch rendered bitmap into it
                     pngEncoder.Interlace = PngInterlaceOption.Off;
                     pngEncoder.Frames.Add(BitmapFrame.Create(renderBitmap));
                     return pngEncoder;
+                }
                 catch //(Exception ex)
+                {
                     return null;
+                }
+            }
             public void DialogMessage_Alert(string content, string header)
+            {
                 App.splashScreen.Close();
-...
+            }
             */
+        }
         public class testItem
+        {
             public string Title { get; set; }
+        }
+    }

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 fd19a116