封装简化代码

打印添加普通打印

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="99" />
-    <add key="VersionName" value="3.1.5" />
+    <add key="VersionCode" value="100" />
+    <add key="VersionName" value="3.1.6" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/Utils/ImageOperationUtil.cs

@@ -0,0 +1,425 @@
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace XHWK.WKTool.Utils
+{
+    internal class ImageOperationUtil
+    {
+        #region 图片拉伸移动
+
+        private System.Windows.Point initialPoint;
+
+        private Thumb RectLeftUp;
+        private Thumb RectRightUp;
+        private Thumb RectLeftDown;
+        private Thumb RectRightDown;
+        private System.Windows.Shapes.Rectangle RectImgBorder;
+        private System.Windows.Controls.Image imgCanvas;
+        private Grid GridM;
+        private bool mouseDown = false;
+
+        public void setMouseDown(bool mouseDown) {
+            this.mouseDown = mouseDown;
+        }
+
+        public ImageOperationUtil(
+             Thumb RectLeftUp,
+             Thumb RectRightUp,
+             Thumb RectLeftDown,
+             Thumb RectRightDown,
+             System.Windows.Shapes.Rectangle RectImgBorder,
+             System.Windows.Controls.Image imgCanvas,
+             Grid GridM
+            )
+        {
+            this.RectLeftUp = RectLeftUp;
+            this.RectRightUp = RectRightUp;
+            this.RectLeftDown = RectLeftDown;
+            this.RectRightDown = RectRightDown;
+            this.RectImgBorder = RectImgBorder;
+            this.imgCanvas = imgCanvas;
+            this.GridM = GridM;
+        }
+
+        /// <summary>
+        /// 隐藏图片四个点和线
+        /// </summary>
+        public void HideAngleBorder()
+        {
+            RectLeftUp.Visibility = Visibility.Hidden;
+            RectRightUp.Visibility = Visibility.Hidden;
+            RectLeftDown.Visibility = Visibility.Hidden;
+            RectRightDown.Visibility = Visibility.Hidden;
+            RectImgBorder.Visibility = Visibility.Hidden;
+        }
+
+        private void ShowAngleBorder()
+        {
+            PointLocation();
+            RectLeftUp.Visibility = Visibility.Visible;
+            RectRightUp.Visibility = Visibility.Visible;
+            RectLeftDown.Visibility = Visibility.Visible;
+            RectRightDown.Visibility = Visibility.Visible;
+            RectImgBorder.Visibility = Visibility.Visible;
+        }
+
+        /// <summary>
+        /// 确定四个点和边框的位置大小
+        /// </summary>
+        private void PointLocation()
+        {
+            RectImgBorder.Width = imgCanvas.ActualWidth + 10.0;
+            RectImgBorder.Height = imgCanvas.ActualHeight + 10.0;
+            RectImgBorder.Margin = new Thickness(imgCanvas.Margin.Left - 5.0, imgCanvas.Margin.Top - 5.0, 0, 0);
+
+            Canvas.SetLeft(RectLeftUp, imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(RectLeftUp, imgCanvas.Margin.Top - 10.0);
+
+            Canvas.SetLeft(RectRightUp, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(RectRightUp, imgCanvas.Margin.Top - 10.0);
+
+            Canvas.SetLeft(RectLeftDown, imgCanvas.Margin.Left - 10.0);
+            Canvas.SetTop(RectLeftDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+
+            Canvas.SetLeft(RectRightDown, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
+            Canvas.SetTop(RectRightDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+        }
+
+        public void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            System.Windows.Point point = e.GetPosition(imgCanvas);
+            initialPoint = point;
+
+            HideAngleBorder();
+        }
+
+        public void imgCanvas_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed && mouseDown)
+            {
+                System.Windows.Point point = e.GetPosition(imgCanvas);
+                imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left + (point.X - initialPoint.X), imgCanvas.Margin.Top + (point.Y - initialPoint.Y), 0, 0);
+                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
+                {
+                    X = imgCanvas.Margin.Left,
+                    Y = imgCanvas.Margin.Top
+                };
+                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
+                {
+                    CenterX = imgCanvas.ActualWidth,
+                    CenterY = imgCanvas.ActualHeight
+                };
+
+                APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
+            }
+        }
+
+        public void imgCanvas_MouseUp()
+        {
+            if (mouseDown)
+            {
+                ShowAngleBorder();
+            }
+        }
+
+        private PointF imgRightDown;
+
+        /// <summary>
+        /// 设置控件最上层
+        /// </summary>
+        /// <param name="element">
+        /// </param>
+        public void BringToFront(Thumb element)//图片置于最顶层显示
+        {
+            if (element == null)
+            {
+                return;
+            }
+
+            Canvas parent = element.Parent as Canvas;
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxZ = parent.Children.OfType<UIElement>()//linq语句，取Zindex的最大值
+              .Where(x => x != element)
+              .Select(x => Canvas.GetZIndex(x))
+              .Max();
+            Canvas.SetZIndex(element, maxZ + 1);
+        }
+
+        public void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
+        {
+            try
+            {
+                Thumb thu = (Thumb)sender;
+                BringToFront(thu);
+
+                imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
+                HideAngleBorder();
+                switch (thu.Name)
+                {
+                    case "RectLeftUp":
+                        RectLeftUp.Visibility = Visibility.Visible;
+                        break;
+
+                    case "RectRightUp":
+                        RectRightUp.Visibility = Visibility.Visible;
+                        break;
+
+                    case "RectLeftDown":
+                        RectLeftDown.Visibility = Visibility.Visible;
+                        break;
+
+                    case "RectRightDown":
+                        RectRightDown.Visibility = Visibility.Visible;
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageWindow.Show(ex.Message);
+            }
+        }
+
+        public void RectRightUp_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            try
+            {
+                if (mouseDown)
+                {
+                    Thumb thu = (Thumb)sender;
+
+                    #region 判断是否超出 暂无
+
+                    double plul = Canvas.GetLeft(RectLeftUp);
+                    double plut = Canvas.GetTop(RectLeftUp);
+                    double prdl = Canvas.GetLeft(RectRightDown);
+                    double prdt = Canvas.GetTop(RectRightDown);
+
+                    #endregion 判断是否超出 暂无
+
+                    double imgW = 0;
+                    double imgH = 0;
+                    double imgX = 0;
+                    double imgY = 0;
+                    switch (thu.Name)
+                    {
+                        case "RectLeftUp":
+
+                            #region 左上
+
+                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
+                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
+                            imgX = 0;
+                            imgY = 0;
+                            if (imgW < 50)
+                            {
+                                imgCanvas.Width = 50;
+                                imgX = imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Width = imgW;
+                                imgX = Mouse.GetPosition(GridM).X;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                            }
+                            if (imgH < 50)
+                            {
+                                imgCanvas.Height = 50;
+                                imgY = imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Height = imgH;
+                                imgY = Mouse.GetPosition(GridM).Y;
+                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                            }
+                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+
+                            #endregion 左上
+
+                            break;
+
+                        case "RectRightUp":
+
+                            #region 右上
+
+                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
+                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
+                            imgX = 0;
+                            imgY = 0;
+                            if (imgW < 50)
+                            {
+                                imgCanvas.Width = 50;
+                                imgX = imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Width = imgW;
+                                imgX = imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                            }
+                            if (imgH < 50)
+                            {
+                                imgCanvas.Height = 50;
+                                imgY = imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Height = imgH;
+                                imgY = Mouse.GetPosition(GridM).Y;
+                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                            }
+                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+
+                            #endregion 右上
+
+                            break;
+
+                        case "RectLeftDown":
+
+                            #region 左下
+
+                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
+                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
+                            imgX = 0;
+                            imgY = 0;
+                            if (imgW < 50)
+                            {
+                                imgCanvas.Width = 50;
+                                imgX = imgCanvas.Margin.Left;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Width = imgW;
+                                imgX = Mouse.GetPosition(GridM).X;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                            }
+                            if (imgH < 50)
+                            {
+                                imgCanvas.Height = 50;
+                                imgY = imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Height = imgH;
+                                imgY = imgCanvas.Margin.Top;
+                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                            }
+                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                            //imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(GridM).X);
+                            //imgCanvas.Height = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
+                            //imgCanvas.Margin = new Thickness(Mouse.GetPosition(GridM).X, imgCanvas.Margin.Top, 0, 0);
+
+                            #endregion 左下
+
+                            break;
+
+                        case "RectRightDown":
+
+                            #region 右下
+
+                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
+                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
+                            if (imgW < 50)
+                            {
+                                imgCanvas.Width = 50;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Width = imgW;
+                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                            }
+                            if (imgH < 50)
+                            {
+                                imgCanvas.Height = 50;
+                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                            }
+                            else
+                            {
+                                imgCanvas.Height = imgH;
+                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                            }
+                            //imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                            //imgCanvas.Width += e.HorizontalChange;
+                            //imgCanvas.Height += e.VerticalChange;
+
+                            #endregion 右下
+
+                            break;
+
+                        default:
+                            break;
+                    }
+                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
+                    {
+                        X = imgCanvas.Margin.Left,
+                        Y = imgCanvas.Margin.Top
+                    };
+                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
+                    {
+                        CenterX = imgCanvas.ActualWidth,
+                        CenterY = imgCanvas.ActualHeight
+                    };
+                    APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
+                }
+            }
+            catch (Exception)
+            {
+                MessageWindow.Show("图片过小！");
+            }
+        }
+
+        public void RectRightUp_DragCompleted()
+        {
+            ShowAngleBorder();
+        }
+
+        /// <summary>
+        /// 点击标题栏 隐藏截图的四个点和线
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        public void Grid_MouseDown()
+        {
+            HideAngleBorder();
+        }
+
+        /// <summary>
+        /// 鼠标左键点击事件
+        /// </summary>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        public void Window_MouseLeftButtonDown_1()
+        {
+            if (RectImgBorder.Visibility != Visibility.Hidden)
+            {
+                HideAngleBorder();
+            }
+        }
+
+        #endregion 图片拉伸移动
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -123,6 +123,7 @@ namespace XHWK.WKTool
         private static extern int SetCursorPos(int x, int y);
 
         private LuoBoPenUtil luoBoPenUtil;
+        private ImageOperationUtil imageOperationUtil;
 
         /// <summary>
         /// 主页面
@@ -174,6 +175,16 @@ namespace XHWK.WKTool
             new Aspose.Words.License().SetLicense(new MemoryStream(license));
             new Aspose.Pdf.License().SetLicense(new MemoryStream(license));
             new Aspose.Slides.License().SetLicense(new MemoryStream(license));
+
+            imageOperationUtil = new ImageOperationUtil(
+                RectLeftUp,
+               RectRightUp,
+                RectLeftDown,
+                 RectRightDown,
+                RectImgBorder,
+                imgCanvas,
+                GridM
+        );
         }
 
         /// <summary>
@@ -1281,6 +1292,7 @@ namespace XHWK.WKTool
         private void imgCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             mouseDown = true;
+            imageOperationUtil.setMouseDown(mouseDown);
         }
 
         #endregion 画笔
@@ -1415,6 +1427,7 @@ namespace XHWK.WKTool
                         imgDocumentation.Source = null;
                         BitmapImage bitImg = new BitmapImage(new Uri(APP.PageDrawList[APP.PageContextData.currpage - 1].PageImagePath));
                         mouseDown = false;
+                        imageOperationUtil.setMouseDown(mouseDown);
                         APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                         {
                             X = 0.1,
@@ -1835,6 +1848,7 @@ namespace XHWK.WKTool
                                 imgDocumentation.Source = null;
                                 BitmapImage bitImg = new BitmapImage(new Uri(APP.PageDrawList[APP.PageContextData.currpage - 1].PageImagePath));
                                 mouseDown = false;
+                                imageOperationUtil.setMouseDown(mouseDown);
                                 APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
                                 {
                                     X = 0.1,
@@ -3276,6 +3290,7 @@ namespace XHWK.WKTool
             if (APP.PageContextData.currpage > 1)
             {
                 mouseDown = false;
+                imageOperationUtil.setMouseDown(mouseDown);
                 HideAngleBorder();
 
                 APP.PageContextData.currpage -= 1;
@@ -3295,6 +3310,7 @@ namespace XHWK.WKTool
             if (APP.PageContextData.currpage < APP.PageContextData.pagenum)
             {
                 mouseDown = false;
+                imageOperationUtil.setMouseDown(mouseDown);
                 HideAngleBorder();
 
                 APP.PageContextData.currpage += 1;
@@ -3348,6 +3364,7 @@ namespace XHWK.WKTool
                         if (APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation.X > 0)
                         {
                             mouseDown = false;
+                            imageOperationUtil.setMouseDown(mouseDown);
                             ImgXY();
                         }
                     }
@@ -3385,6 +3402,7 @@ namespace XHWK.WKTool
             }
             img.CaptureMouse();
             mouseDown = true;
+            imageOperationUtil.setMouseDown(mouseDown);
             mouseXY = e.GetPosition(img);
             //Console.WriteLine("mouseXY.X = " + mouseXY.X + "; mouseXY.Y = " + mouseXY.Y);
         }
@@ -3398,6 +3416,7 @@ namespace XHWK.WKTool
             }
             img.ReleaseMouseCapture();
             mouseDown = false;
+            imageOperationUtil.setMouseDown(mouseDown);
         }
 
         private void IMG1_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
@@ -3441,7 +3460,6 @@ namespace XHWK.WKTool
                 X = transform.X,
                 Y = transform.Y
             };
-            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
         }
 
         private void IMG1_MouseWheel(object sender, MouseWheelEventArgs e)
@@ -3452,10 +3470,9 @@ namespace XHWK.WKTool
                 return;
             }
             System.Windows.Point point = e.GetPosition(img);
-            //Console.WriteLine("point.X = " + point.X + "; point.Y=" + point.Y);
+          
             System.Windows.Point PicLocate = e.GetPosition(imgCanvas);
-            //Console.WriteLine("PicEmap.X = " + PicLocate.X + "; PicEmap.Y=" + PicLocate.Y);
-
+           
             TransformGroup group = IMG.FindResource("Imageview") as TransformGroup;
             double delta = e.Delta * 0.001;
             DowheelZoom(group, point, delta);
@@ -3475,15 +3492,7 @@ namespace XHWK.WKTool
             TranslateTransform transform1 = group.Children[1] as TranslateTransform;
             transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
             transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
-            //LogHelper.WriteInfoLog("【img宽高】" + imgCanvas.ActualWidth.ToString() + ":"
-            //     + imgCanvas.ActualHeight.ToString() + "百分比:" + transform.ScaleX.ToString() + ":" + transform.ScaleY.ToString()
-            //    );
-
-            //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);
-
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize = new ScaleTransform();
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX = transform.ScaleX;
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY = transform.ScaleY;
+   
             APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
             {
                 X = transform1.X,
@@ -3695,358 +3704,43 @@ namespace XHWK.WKTool
 
         #region 图片拉伸移动
 
-        private System.Windows.Point initialPoint;
-
         /// <summary>
         /// 隐藏图片四个点和线
         /// </summary>
         private void HideAngleBorder()
         {
-            RectLeftUp.Visibility = Visibility.Hidden;
-            RectRightUp.Visibility = Visibility.Hidden;
-            RectLeftDown.Visibility = Visibility.Hidden;
-            RectRightDown.Visibility = Visibility.Hidden;
-            RectImgBorder.Visibility = Visibility.Hidden;
-        }
-
-        private void ShowAngleBorder()
-        {
-            PointLocation();
-            RectLeftUp.Visibility = Visibility.Visible;
-            RectRightUp.Visibility = Visibility.Visible;
-            RectLeftDown.Visibility = Visibility.Visible;
-            RectRightDown.Visibility = Visibility.Visible;
-            RectImgBorder.Visibility = Visibility.Visible;
-        }
-
-        /// <summary>
-        /// 确定四个点和边框的位置大小
-        /// </summary>
-        private void PointLocation()
-        {
-            RectImgBorder.Width = imgCanvas.ActualWidth + 10.0;
-            RectImgBorder.Height = imgCanvas.ActualHeight + 10.0;
-            RectImgBorder.Margin = new Thickness(imgCanvas.Margin.Left - 5.0, imgCanvas.Margin.Top - 5.0, 0, 0);
-
-            Canvas.SetLeft(RectLeftUp, imgCanvas.Margin.Left - 10.0);
-            Canvas.SetTop(RectLeftUp, imgCanvas.Margin.Top - 10.0);
-
-            Canvas.SetLeft(RectRightUp, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
-            Canvas.SetTop(RectRightUp, imgCanvas.Margin.Top - 10.0);
-
-            Canvas.SetLeft(RectLeftDown, imgCanvas.Margin.Left - 10.0);
-            Canvas.SetTop(RectLeftDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
-
-            Canvas.SetLeft(RectRightDown, imgCanvas.Margin.Left + imgCanvas.ActualWidth - 10.0);
-            Canvas.SetTop(RectRightDown, imgCanvas.Margin.Top + imgCanvas.ActualHeight - 10.0);
+            imageOperationUtil.HideAngleBorder();
         }
 
+   
         private void PicEMap_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            System.Windows.Point point = e.GetPosition(imgCanvas);
-            initialPoint = point;
-
-            HideAngleBorder();
+            imageOperationUtil.PicEMap_MouseDown(sender, e);
         }
 
         private void imgCanvas_MouseMove(object sender, MouseEventArgs e)
         {
-            if (e.LeftButton == MouseButtonState.Pressed && mouseDown)
-            {
-                System.Windows.Point point = e.GetPosition(imgCanvas);
-                imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left + (point.X - initialPoint.X), imgCanvas.Margin.Top + (point.Y - initialPoint.Y), 0, 0);
-                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
-                {
-                    X = imgCanvas.Margin.Left,
-                    Y = imgCanvas.Margin.Top
-                };
-                APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
-                {
-                    CenterX = imgCanvas.ActualWidth,
-                    CenterY = imgCanvas.ActualHeight
-                };
-
-                APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
-            }
+            imageOperationUtil.imgCanvas_MouseMove(sender,e);
         }
 
         private void imgCanvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            if (mouseDown)
-            {
-                ShowAngleBorder();
-            }
-        }
-
-        private PointF imgRightDown;
-
-        /// <summary>
-        /// 设置控件最上层
-        /// </summary>
-        /// <param name="element">
-        /// </param>
-        public void BringToFront(Thumb element)//图片置于最顶层显示
-        {
-            if (element == null)
-            {
-                return;
-            }
-
-            Canvas parent = element.Parent as Canvas;
-            if (parent == null)
-            {
-                return;
-            }
-
-            int maxZ = parent.Children.OfType<UIElement>()//linq语句，取Zindex的最大值
-              .Where(x => x != element)
-              .Select(x => Canvas.GetZIndex(x))
-              .Max();
-            Canvas.SetZIndex(element, maxZ + 1);
+            imageOperationUtil.imgCanvas_MouseUp();
         }
 
         private void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
         {
-            try
-            {
-                Thumb thu = (Thumb)sender;
-                BringToFront(thu);
-
-                imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
-                HideAngleBorder();
-                switch (thu.Name)
-                {
-                    case "RectLeftUp":
-                        RectLeftUp.Visibility = Visibility.Visible;
-                        break;
-
-                    case "RectRightUp":
-                        RectRightUp.Visibility = Visibility.Visible;
-                        break;
-
-                    case "RectLeftDown":
-                        RectLeftDown.Visibility = Visibility.Visible;
-                        break;
-
-                    case "RectRightDown":
-                        RectRightDown.Visibility = Visibility.Visible;
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageWindow.Show(ex.Message);
-            }
+            imageOperationUtil.RectRightUp_DragStarted(sender, e);
         }
 
         private void RectRightUp_DragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
         {
-            try
-            {
-                if (mouseDown)
-                {
-                    Thumb thu = (Thumb)sender;
-
-                    #region 判断是否超出 暂无
-
-                    double plul = Canvas.GetLeft(RectLeftUp);
-                    double plut = Canvas.GetTop(RectLeftUp);
-                    double prdl = Canvas.GetLeft(RectRightDown);
-                    double prdt = Canvas.GetTop(RectRightDown);
-
-                    #endregion 判断是否超出 暂无
-
-                    //Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                    //Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-                    double imgW = 0;
-                    double imgH = 0;
-                    double imgX = 0;
-                    double imgY = 0;
-                    switch (thu.Name)
-                    {
-                        case "RectLeftUp":
-
-                            #region 左上
-
-                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
-                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
-                            imgX = 0;
-                            imgY = 0;
-                            if (imgW < 50)
-                            {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Width = imgW;
-                                imgX = Mouse.GetPosition(GridM).X;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                            }
-                            if (imgH < 50)
-                            {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Height = imgH;
-                                imgY = Mouse.GetPosition(GridM).Y;
-                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-                            }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
-
-                            #endregion 左上
-
-                            break;
-
-                        case "RectRightUp":
-
-                            #region 右上
-
-                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
-                            imgH = imgRightDown.Y - (Mouse.GetPosition(GridM).Y);
-                            imgX = 0;
-                            imgY = 0;
-                            if (imgW < 50)
-                            {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Width = imgW;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                            }
-                            if (imgH < 50)
-                            {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Height = imgH;
-                                imgY = Mouse.GetPosition(GridM).Y;
-                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-                            }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
-
-                            #endregion 右上
-
-                            break;
-
-                        case "RectLeftDown":
-
-                            #region 左下
-
-                            imgW = imgRightDown.X - (Mouse.GetPosition(GridM).X);
-                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
-                            imgX = 0;
-                            imgY = 0;
-                            if (imgW < 50)
-                            {
-                                imgCanvas.Width = 50;
-                                imgX = imgCanvas.Margin.Left;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Width = imgW;
-                                imgX = Mouse.GetPosition(GridM).X;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                            }
-                            if (imgH < 50)
-                            {
-                                imgCanvas.Height = 50;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Height = imgH;
-                                imgY = imgCanvas.Margin.Top;
-                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-                            }
-                            imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
-                            //imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(GridM).X);
-                            //imgCanvas.Height = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
-                            //imgCanvas.Margin = new Thickness(Mouse.GetPosition(GridM).X, imgCanvas.Margin.Top, 0, 0);
-
-                            #endregion 左下
-
-                            break;
-
-                        case "RectRightDown":
-
-                            #region 右下
-
-                            imgW = Mouse.GetPosition(GridM).X - imgCanvas.Margin.Left;
-                            imgH = Mouse.GetPosition(GridM).Y - imgCanvas.Margin.Top;
-                            if (imgW < 50)
-                            {
-                                imgCanvas.Width = 50;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Width = imgW;
-                                Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                            }
-                            if (imgH < 50)
-                            {
-                                imgCanvas.Height = 50;
-                                Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
-                            }
-                            else
-                            {
-                                imgCanvas.Height = imgH;
-                                Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
-                            }
-                            //imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
-                            //imgCanvas.Width += e.HorizontalChange;
-                            //imgCanvas.Height += e.VerticalChange;
-
-                            #endregion 右下
-
-                            break;
-
-                        default:
-                            break;
-                    }
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageLocation = new TranslateTransform
-                    {
-                        X = imgCanvas.Margin.Left,
-                        Y = imgCanvas.Margin.Top
-                    };
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].ImageSizes = new ScaleTransform
-                    {
-                        CenterX = imgCanvas.ActualWidth,
-                        CenterY = imgCanvas.ActualHeight
-                    };
-                    APP.PageDrawList[APP.PageContextData.currpage - 1].IsImageLocation = false;
-                }
-                //lbl1.Content = imgCanvas.Margin.Left + "," + imgCanvas.Margin.Top;
-                //lbl2.Content = (imgCanvas.Margin.Left+ imgCanvas.Width) +"," + imgCanvas.Margin.Top;
-                //lbl3.Content = imgCanvas.Margin.Left + "," + (imgCanvas.Margin.Top+ imgCanvas.Height);
-                //lbl4.Content= (imgCanvas.Margin.Left + imgCanvas.Width )+ "," + (imgCanvas.Margin.Top + imgCanvas.Height);
-            }
-            catch (Exception)
-            {
-                MessageWindow.Show("图片过小！");
-            }
+            imageOperationUtil.RectRightUp_DragDelta(sender, e);
         }
 
         private void RectRightUp_DragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
         {
-            ShowAngleBorder();
+            imageOperationUtil.RectRightUp_DragCompleted();
         }
 
         /// <summary>
@@ -4058,7 +3752,7 @@ namespace XHWK.WKTool
         /// </param>
         private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            HideAngleBorder();
+            imageOperationUtil.Grid_MouseDown();
         }
 
         /// <summary>
@@ -4070,10 +3764,7 @@ namespace XHWK.WKTool
         /// </param>
         private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
         {
-            if (RectImgBorder.Visibility != Visibility.Hidden)
-            {
-                HideAngleBorder();
-            }
+            imageOperationUtil.Window_MouseLeftButtonDown_1();
         }
 
         #endregion 图片拉伸移动

XHWK.WKTool/XHWK.WKTool.csproj

@@ -316,6 +316,7 @@
     <Compile Include="system\SplashScreen.cs" />
     <Compile Include="system\XmlUtilHelper.cs" />
     <Compile Include="system\ZJClippingBorder.cs" />
+    <Compile Include="Utils\ImageOperationUtil.cs" />
     <Compile Include="Utils\pen\TQLPen\PenEvents.cs" />
     <Compile Include="Utils\pen\TQLPen\Pentiming.cs" />
     <Compile Include="UControl\UC_MultiRangeSlider.xaml.cs">

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.5"
+#define MyAppVersion "3.1.6"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"