/ - Diff - MARKUS - 일정관리

IKCOM/obj/Release/IKCOM.csproj.CoreCompileInputs.cache
1		333d5c25ca1359fafe4dea812620b03cf1834e02

     F:\Project_NEW\KCOM\IKCOM\bin\Release\IKCOM.dll
     F:\Project_NEW\KCOM\IKCOM\bin\Release\IKCOM.pdb
     F:\Project_NEW\KCOM\IKCOM\bin\Release\KCOMDataModel.dll
     F:\Project_NEW\KCOM\IKCOM\bin\Release\KCOMDataModel.pdb
     F:\Project_NEW\KCOM\IKCOM\bin\Release\KCOMDataModel.dll.config
     F:\Project_NEW\KCOM\IKCOM\obj\Release\IKCOM.csprojResolveAssemblyReference.cache
     F:\Project_NEW\KCOM\IKCOM\obj\Release\IKCOM.csproj.CoreCompileInputs.cache
     F:\Project_NEW\KCOM\IKCOM\obj\Release\IKCOM.dll
     F:\Project_NEW\KCOM\IKCOM\obj\Release\IKCOM.pdb
     C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\IKCOM\obj\Release\IKCOM.csprojResolveAssemblyReference.cache
     C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\IKCOM\obj\Release\IKCOM.csproj.CoreCompileInputs.cache
     C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\IKCOM\obj\Release\IKCOM.dll
     C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\IKCOM\obj\Release\IKCOM.pdb

                 AdornerBorder.MinWidth = 10;
                 AdornerBorder.MinHeight = 10;
                 double minX = 10000;
                 double minY = 10000;
                 double maxX = 0;
                 double maxY = 0;
                 double minX = double.MaxValue;
                 double minY = double.MaxValue;
                 double maxX = double.MinValue;
                 double maxY = double.MinValue;
                 if (MemberSet.Count == 1)
+                {
-...
                 //    }
                 //}
+            }
             /// <summary>
             /// 회전
             /// </summary>
-...
             /// <param name="e"></param>
             public void rotate_DragDelta(object sender, DragDeltaEventArgs e)
+            {
                 //DragThumb.Cursor = Cursors.SizeAll;
                 //System.Windows.Resources.StreamResourceInfo info = Application.GetResourceStream(new Uri("/KCOM;component/Resources/Images/AdornerImage/sync.cur", UriKind.Relative));
                 //rotateTop.Cursor = new System.Windows.Input.Cursor(info.Stream);
                 //rotateTop.Cursor = new System.Windows.Input.Cursor("../sync.cur");
                 //if(e.VerticalChange > 10)
                 //{
                 //    System.Diagnostics.Debug.WriteLine("Width" + ((e.Source as Thumb).Parent as Grid).Width);
                 //    System.Diagnostics.Debug.WriteLine("e.HorizontalChange : " + e.HorizontalChange);
                 //}
                 MoveRotate(e);
+            }
-...
                 #endregion
                 //강인구 수정
                 AngleValue = AngleValue + dDeltaAngle;
                 //AngleValue = AngleValue + dDeltaAngle;
                 #endregion
                 #region 센터 포인트 구하기 (그룹핑)
-...
+                {
                     if (item.DrawingData.GetType().Name == "TextControl")
+                    {
                         //double X = Canvas.GetLeft((item.DrawingData as TextControl));
                         //double Y = Canvas.GetTop((item.DrawingData as TextControl));
                         //AllPointSet.Add(new Point(X, Y));
                         AllPointSet.Add((item.DrawingData as TextControl).StartPoint);
+                    }
                     else
+                    {
-...
                 CenterPoint = MathSet.FindCentroid(AllPointSet);
                 Point pt = Mouse.GetPosition(this);
                 if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name != "TextControl")
                 //if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name != "TextControl")
+                {
                     Point vec1 = new Point(this.rotatePoint.X - CenterPoint.X, this.rotatePoint.Y - CenterPoint.Y);
                     Point vec2 = new Point(pt.X - CenterPoint.X, pt.Y - CenterPoint.Y);
                     dDeltaAngle = (MathSet.getAngleBetweenVectors(vec1, vec2));
+                }
                 else
+                {
                     if (IsTextAngle || RotateFlag)
+                    {
                         AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle + 5;
+                    }
                     else
+                    {
                         AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle - 5;
+                    }
+                }
                 //else
                 //{
                 //    //if (IsTextAngle || RotateFlag)
                 //    //{
                 //    //    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle + 5;
                 //    //}
                 //    //else
                 //    //{
                 //    //    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle - 5;
                 //    //}
                 //}
                 AngleValue += dDeltaAngle;
                 if (AngleValue > 360) AngleValue -= 360;
-...
                             Canvas.SetLeft(thumb, value.X);
                             Canvas.SetTop(thumb, value.Y);
                             /*
                             if (item.DrawingData.GetType().Name == "ArrowTextControl" && thumb == item.ThumbList.Last())
+                            {
                                 Canvas.SetLeft(thumb, Canvas.GetLeft((item.DrawingData as ArrowTextControl).Base_TextBox));
-...
                                     //Canvas.SetTop((MemberSet.First() as AdornerMember).ThumbList[1], tempP.Y);
+                                }
+                            }
                             */
+                        }
                         for (int i = 0; i < (item.DrawingData as IPath).PointSet.Count(); i++)
-...
                             (item.DrawingData as IPath).PointSet[i] = MathSet.RotateAbout(CenterPoint, (item.DrawingData as IPath).PointSet[i], dDeltaAngle);
+                        }
+                    }
                     #region 컨트롤 업데이트
                     #region 보더 업데이트
                     foreach (var item in MemberSet)
+                    {
                         switch (item.Drawingtype)
+                        {
                             case ControlType.TextControl:
                                 ((TextControl)item.DrawingData).Angle = AngleValue;
                                 //trRotate.Angle = AngleValue;
                                 RectangleGeometry Data = new RectangleGeometry
+                                {
-...
                 BorderUpdate();
+            }
             /// <summary>
             /// starting rotate
             /// </summary>
             /// <param name="sender"></param>
             /// <param name="e"></param>
             private void rotate_DragStarted(object sender, DragStartedEventArgs e)
+            {
                 //System.Windows.Forms.Cursor.Position = new System.Drawing.Point(System.Windows.Forms.Cursor.Position.X - 150, System.Windows.Forms.Cursor.Position.Y - 150);
                 this.rotatePoint = Mouse.GetPosition(this); /// 2018.05.09 added by humkyung
                 rotateTop.Cursor = Cursors.SizeAll;
                 //CustomCursor.SetCursorTemplate(rotateTop, this.Resources["AnimatedCursor"] as DataTemplate);
                 //rotateTop.Cursor = Cursors.None;
                 /// get angle from text controls' angle if only text control exists - 2018.05.10 added by humkyung
                 if ((1 == MemberSet.Count) && (MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "TextControl")
+                {
                     this.AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle;
+                }
                 /// up to here
                 //if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().PointSet != null)
                 //{
                 //    return;
                 //}
                 if (ViewerDataModel.Instance.UndoDataList == null)
+                {
                     return;

                 getCurrentPoint = e.GetPosition(drawingRotateCanvas);
                 if (mouseButtonDown == MouseButton.Middle)
                 if ((mouseButtonDown == MouseButton.Middle) || (mouseButtonDown == MouseButton.Right))
+                {
                     SetCursor();
                     Point currentCanvasDrawingMouseMovePoint = e.GetPosition(drawingRotateCanvas);
-...
                     Vector dragOffset = currentCanvasZoomPanningMouseMovePoint - canvasZoommovingMouseDownPoint;
                     zoomAndPanControl.ContentOffsetX -= dragOffset.X;
                     zoomAndPanControl.ContentOffsetY -= dragOffset.Y;
                     //SetCursor();
                     //Point currentCanvasDrawingMouseMovePoint = e.GetPosition(drawingRotateCanvas);
                     //Point currentCanvasZoomPanningMouseMovePoint = e.GetPosition(zoomAndPanCanvas);
                     //Vector dragOffset = currentCanvasZoomPanningMouseMovePoint - canvasZoommovingMouseDownPoint;
                     //zoomAndPanControl.ContentOffsetX += 1;
                     //zoomAndPanControl.ContentOffsetY += 1;
                     //zoomAndPanControl.ContentOffsetX += dragOffset.X;
                     //zoomAndPanControl.ContentOffsetY += dragOffset.Y;
+                }
                 if (mouseButtonDown == MouseButton.Right)
+                {
                     SetCursor();
                     Point currentCanvasDrawingMouseMovePoint = e.GetPosition(drawingRotateCanvas);
                     Point currentCanvasZoomPanningMouseMovePoint = e.GetPosition(zoomAndPanCanvas);
                     Vector dragOffset = currentCanvasZoomPanningMouseMovePoint - canvasZoommovingMouseDownPoint;
                     zoomAndPanControl.ContentOffsetX -= dragOffset.X;
                     zoomAndPanControl.ContentOffsetY -= dragOffset.Y;
+                }
                 //else if (currentControl != null && mouseHandlingMode == MouseHandlingMode.Drawing && mouseButtonDown == MouseButton.Left)
                 else if (mouseHandlingMode == MouseHandlingMode.Drawing && mouseButtonDown == MouseButton.Left)
                 if (mouseHandlingMode == MouseHandlingMode.Drawing && mouseButtonDown == MouseButton.Left)
+                {
                     Point currentCanvasDrawingMouseMovePoint = e.GetPosition(drawingRotateCanvas);
                     Point currentCanvasZoomPanningMouseMovePoint = e.GetPosition(zoomAndPanCanvas);
-...
                                             control.Paint = ViewerDataModel.Instance.paintSet;
                                             control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
                                             if (ViewerDataModel.Instance.checkAxis)
+                                            {
                                                 Point tempPoint = control.EndPoint;
                                                 ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true);
                                                 control.EndPoint = tempPoint;
+                                            }
                                             if (ViewerDataModel.Instance.IsPressShift)
+                                            {
-...
             /// <param name="StartP"></param>
             /// <param name="EndP"></param>
             /// <returns></returns>
             private List<Point> GetRegularTrianglePoints(Point StartP, Point EndP)
             /// <history>humkyung 2018.05.11 apply axis lock</history>
             private List<Point> GetRegularTrianglePoints(Point StartP, Point EndP, bool bCheckAxis=false)
+            {
                 List<Point> res = new List<Point>();
-...
                 return res;
+            }
+        }
+    }
+    }

KCOM_Helper/obj/Release/KCOM_Helper.csproj.CoreCompileInputs.cache
1		d83d49db6e4b7ef064d062a85365cbc282b8c2ff

     MarkupToPDF
     library
     C#
     .cs
     C:\Users\강인구님\Downloads\장원이소스\KCOM 2018-04-02\MarkUS\MarkupToPDF\obj\x64\Debug\
     MarkupToPDF
     none
     false
     DEBUG;TRACE
 -843150639
     611084986827
 -464729454
     Controls\Custom\CustomText.xaml;Themes\generic.xaml;
     False

ID	5a6a5dd16606eea61d85d0fb0517fe5aa77e5192
상위	a69467b1
하위	5a9353a9

프로젝트

일반

사용자정보

MARKUS

개정판 5a6a5dd1