/KCOM/Controls/Symbol.xaml.cs - Diff - MARKUS - 일정관리

개정판 7fa95b67

ID	7fa95b67b2188294dfc9d6c9ea6ab79f3fae90cb
상위	5a223b60
하위	26c9c3bf

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

Fix: 이미지 심볼 배치 오류 수정

Change-Id: Ice2ccb7ab56cedc7adc7c535d95c410d01001cd3

                     };
                     Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted;
                     //Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);
                     Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private);
+                }
                 catch (Exception)
-...
             private async void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e)
+            {
                 //Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
                 await DataBindAsync();
+            }
             private async void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e)
+            {
                 //Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
                 await DataBindAsync();
+            }
-...
             /// <param name="id"></param>
             private async Task PlaceSymbol(string id, Point CurrentMousePoint)
+            {
                 string Data_ = "";
                 var systemMain = Common.ViewerDataModel.Instance.SystemMain;
                 var mainMenu = systemMain.dzMainMenu;
-...
                 try
+                {
                     Data_ = mainMenu.BaseClient.GetSymbolData(id, RadTab.SelectedIndex);
                     if (string.IsNullOrEmpty(Data_)) return;
                     if (Data_.Contains("|DZ|"))
                     string Data_ = mainMenu.BaseClient.GetSymbolData(id, RadTab.SelectedIndex);
                     if (!string.IsNullOrEmpty(Data_) && Data_.Contains("|DZ|"))
+                    {
                         List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>();
                         string[] delimiterChars = { "|DZ|" };
                         string[] data = Data_.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries);
                         UndoData multi_UndoData = new UndoData();
                         UndoDataGroup = new UndoDataGroup()
+                        {
                             IsUndo = false,
-...
                                 adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo);
                                 multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
                                 var multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
                                 UndoDataGroup.MarkupDataColl.Add(multi_UndoData);
                                 ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup);
+                            }
-...
                         mainMenu.SelectLayer.Children.Add(final);
                         //var finalPosition = new Point(Canvas.GetLeft(final), Canvas.GetTop(final));
                         //Rect rect = new Rect(finalPosition, Point.Add(finalPosition,new Vector(final.Width,final.Height)));
-...
+                    }
                     else
+                    {
                         PlaceImageSymbol(id, 0);
                         await PlaceImageSymbol(id, 0);
+                    }
+                }
                 catch (Exception ex)
-...
                 return targetPoint;
+            }
             private void PlaceImageSymbol(string id, long group_id)
             /// <summary>
             /// 이미지 심볼을 배치한다.
             /// </summary>
             /// <param name="id"></param>
             /// <param name="group_id"></param>
             private async Task PlaceImageSymbol(string id, long group_id)
+            {
                 //canvasZoommovingMouseDownPoint
                 string Data_ = "";
                 try
+                {
                     //Logger.sendReqLog("GetSymbolImageURL: ", id + "," + RadTab.SelectedIndex, 1);
                     Data_ = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolImageURL(id, RadTab.SelectedIndex);
                     if (Data_ != null || Data_ != "")
                     string FilePath = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolImageURL(id, RadTab.SelectedIndex);
                     if (!string.IsNullOrEmpty(FilePath))
+                    {
                         //Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);
+                    }
                     else
+                    {
                         //Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);
+                    }
                     //MARKUP_DATA_GROUP INSERT
                     //MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP
                     //{
                     //    SYMBOL_ID = id,//InnerItem.Symbol_ID
                     //    STATE = 0,
                     //};
                     //long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO);
                     ////Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
                         bool exists = await Commons.DoesFileExist(FilePath);
                         if (!exists)
+                        {
                             this.ParentOfType<MainWindow>().dzMainMenu.DialogMessage_Alert($"{FilePath} doesn't exist", "Warning");
                             return;
+                        }
                     if (Data_ != null)
+                    {
                         Image img = new Image();
                         //img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(Data_));
                         if (Data_.Contains(".svg"))
                         if (FilePath.Contains(".svg"))
+                        {
                             SharpVectors.Converters.SvgImageExtension svgImage = new SharpVectors.Converters.SvgImageExtension(Data_);
                             SharpVectors.Converters.SvgImageExtension svgImage = new SharpVectors.Converters.SvgImageExtension(FilePath);
                             img.Source = (DrawingImage)svgImage.ProvideValue(null);
+                        }
                         else
+                        {
                             img.Source = new BitmapImage(new Uri(Data_));
                             img.Source = new BitmapImage(new Uri(FilePath));
+                        }
                         var currentControl = new MarkupToPDF.Controls.Etc.ImgControl
+                        {
                             PointSet = new List<Point>(),
                             FilePath = Data_,
                             FilePath = FilePath,
                             ImageData = img.Source,
                             StartPoint = new Point(0, 0),
                             EndPoint = new Point(img.Source.Width, img.Source.Height),
-...
                                                 currentControl.EndPoint,
                                                 currentControl.TopRightPoint,
                                             };
                         UndoData multi_UndoData = new UndoData();
                         UndoDataGroup = new UndoDataGroup()
+                        {
                             IsUndo = false,
-...
                             EventTime = DateTime.Now,
                             MarkupDataColl = new List<UndoData>()
                         };
                         ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i =>
                         ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo).ToList().ForEach(i =>
+                        {
                             ViewerDataModel.Instance.UndoDataList.Remove(i);
                         });
                         //multi_UndoData = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         var multi_UndoData = this.ParentOfType<MainWindow>().dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         UndoDataGroup.MarkupDataColl.Add(multi_UndoData);
                         ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup);
-...
                         currentControl.ApplyTemplate();
                         currentControl.SetImage();
                         ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         ///ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo);
                         this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children.Add(final);
                         #region 마우스 위치에 배치
                         /*
                         // this.ParentOfType<MainWindow>().dzMainMenu.isLeftMouseButtonDownOnWindow = true;
                         // final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY));
-...
                         //this.ParentOfType<MainWindow>().dzMainMenu.mouseHandlingMode = MouseHandlingMode.DragSymbol;
                         ///this.ParentOfType<MainWindow>().dzMainMenu.mouseButtonDown = MouseButton.Left;
                         //this.ParentOfType<MainWindow>().dzMainMenu.symboldata(id, group_id, RadTab.SelectedIndex, Data_, img.Source);*/
                         #endregion
+                    }
+                }
                 catch(Exception ex)
-...
+                }
+            }
             public UndoData multi_UndoData;
             /// <summary>
             ///
             /// </summary>
             private void ApplyDragSelectionRect()
+            {
                 multi_UndoData = new UndoData();
                 var multi_UndoData = new UndoData();
                 UndoDataGroup = new UndoDataGroup()
+                {

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 7fa95b67