截图位置

Common/system/FFMpeg.cs

@@ -90,7 +90,7 @@ namespace Common.system
             myProcess.StartInfo.FileName = FileToolsCommon.GetFileAbsolutePath(@"/ffmpeg/bin/ffmpeg.exe");   //ffmpeg.exe的绝对路径
             string SpeakerStr = "";
             string MicrophoneStr = "";
-            if (/*IsRecordSpeaker*/true)
+            if (IsRecordSpeaker)
             {
                 SpeakerStr = "-f dshow -i audio=\"virtual-audio-capturer\" ";
             }

XHWK.Model/Model_DrawData.cs

@@ -16,9 +16,9 @@ namespace XHWK.Model
         private int _PageNum;
         private string _pageCode;
         private string _pageImagePath;
-        private TranslateTransform _ImageLocation;
-        private ScaleTransform _ImageSize;
-        private ScaleTransform _ImageSizes;
+        private TranslateTransform _ImageLocation=new TranslateTransform(0,0);
+        //private ScaleTransform _ImageSize = new ScaleTransform(0, 0);
+        private ScaleTransform _ImageSizes = new ScaleTransform(0, 0);
         private bool _IsImageLocation;
         //private string _PenColor;
         //private int _PenWigth;
@@ -41,10 +41,10 @@ namespace XHWK.Model
         /// 图片坐标
         /// </summary>
         public TranslateTransform ImageLocation { get => _ImageLocation; set => _ImageLocation = value; }
-        /// <summary>
-        /// 图片大小
-        /// </summary>
-        public ScaleTransform ImageSize { get => _ImageSize; set => _ImageSize = value; }
+        ///// <summary>
+        ///// 图片大小
+        ///// </summary>
+        //public ScaleTransform ImageSize { get => _ImageSize; set => _ImageSize = value; }
         /// <summary>
         /// PDF 图片路径
         /// </summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -280,7 +280,7 @@
                                         </ScrollViewer>-->
                                     <!--图片表框 -->
                                     <Rectangle x:Name="RectImgBorder" Cursor="SizeAll" Fill="#00000000" HorizontalAlignment="Left" Stroke="#2D8CF0" VerticalAlignment="Top" Width="300" Height="300" Visibility="Hidden" Margin="373,175,0,0" StrokeThickness="4" StrokeDashArray="4 4" SnapsToDevicePixels="True"/>
-                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
+                                    <Image Name="imgCanvas" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Stretch="Fill" MouseDown="PicEMap_MouseDown" RenderTransform="{StaticResource Imageview}" MouseRightButtonDown="imgCanvas_MouseRightButtonDown" MouseLeftButtonDown="imgCanvas_MouseLeftButtonDown" Focusable="True" MouseMove="imgCanvas_MouseMove" MouseUp="imgCanvas_MouseUp"/>
                                     <!--四个点 -->
                                     <Canvas>
                                         <Thumb x:Name="RectLeftUp" Cursor="SizeNWSE"  HorizontalAlignment="Left" Height="20"  VerticalAlignment="Top" Width="20" Visibility="Hidden" Canvas.Left="314" Canvas.Top="157" Background="White" BorderBrush="#2D8CF0" BorderThickness="2"  DragDelta="RectRightUp_DragDelta" DragStarted="RectRightUp_DragStarted" DragCompleted="RectRightUp_DragCompleted"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -431,9 +431,9 @@ namespace XHWK.WKTool
                 gridSetUp.Visibility = Visibility.Visible;
                 gridUpload.Visibility = Visibility.Collapsed;
                 txbStoragePath.Content = APP.WKData.WkPath;
-                ImgRecord.Visibility = Visibility.Collapsed;//设置时不可录制
-                ImgRecordTwo.Visibility = Visibility.Visible;//设置时不可录制
-                BtnRecord.IsEnabled = false;//设置时不可录制
+                //ImgRecord.Visibility = Visibility.Collapsed;//设置时不可录制
+                //ImgRecordTwo.Visibility = Visibility.Visible;//设置时不可录制
+                //BtnRecord.IsEnabled = false;//设置时不可录制
                 ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
                 if ("1".Equals(APP.CameraPosition))
                 {
@@ -809,10 +809,18 @@ namespace XHWK.WKTool
 
                         imgDocumentation.Source = null;
                         BitmapImage bitImg = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                        mouseDown = false;
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = 0.1;
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = 0.1;
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform();
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX = 475;
+                        APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY = 538;
+
+                        APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                         imgCanvas.Source = bitImg;
                         imgCanvas.Width = bitImg.Width;
                         imgCanvas.Height = bitImg.Height;
-                        APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation = false;
                         ImgPrint.Visibility = Visibility.Visible;//截图成功可打印
                         ImgPrintTwo.Visibility = Visibility.Collapsed;
                         btnPrint.IsEnabled = true;
@@ -2449,6 +2457,12 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage > 1)
             {
+                mouseDown = false;
+                HideAngleBorder();
+                //if(!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
+                //{
+                //    ImgWG();
+                //}
                 APP.pageData.currpage -= 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (btnImport.IsEnabled == true)
@@ -2483,23 +2497,9 @@ namespace XHWK.WKTool
                             APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                             if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
                             {
-                                var group = IMG.FindResource("Imageview") as TransformGroup;
-                                var transform = group.Children[1] as TranslateTransform;
-                                #region 高低 缩放比例
-                                if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                                {
-                                    var transform1 = group.Children[0] as ScaleTransform;
-                                    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                                    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                                    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
-                                    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
-                                }
-                                #endregion
-                                #region XY轴
-                                transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                                transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-                                #endregion
                                 mouseDown = false;
+                                ImgXY();
+                              
                             }
                         }
                     }
@@ -2511,6 +2511,25 @@ namespace XHWK.WKTool
                 }
             }
         }
+        private void ImgXY()
+        {
+            imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
+            imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
+
+            imgCanvas.Margin = new Thickness(APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X, APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y, 0,0);
+            //imgCanvas.Margin.Left= APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+            //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+        }
+        private void ImgWG()
+        {
+            mouseDown = false;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = imgCanvas.Margin.Left;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = imgCanvas.Margin.Top;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX = imgCanvas.ActualWidth;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY = imgCanvas.ActualHeight;
+        }
         /// <summary>
         /// 下一页
         /// </summary>
@@ -2520,6 +2539,12 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage < APP.pageData.pagenum)
             {
+                mouseDown = false;
+                HideAngleBorder();
+                //if (!APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation)
+                //{
+                //    ImgWG();
+                //}
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (btnImport.IsEnabled == true)
@@ -2552,23 +2577,25 @@ namespace XHWK.WKTool
                             APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                             if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
                             {
-                                var group = IMG.FindResource("Imageview") as TransformGroup;
-                                #region 高低 缩放比例
-                                if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                                {
-                                    var transform1 = group.Children[0] as ScaleTransform;
-                                    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                                    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                                    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
-                                    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
-                                }
-                                #endregion
-                                #region 坐标XY轴
-                                var transform = group.Children[1] as TranslateTransform;
-                                transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
-                                transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
-                                #endregion
+                                //var group = IMG.FindResource("Imageview") as TransformGroup;
+                                //#region 高低 缩放比例
+                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                                //{
+                                //    var transform1 = group.Children[0] as ScaleTransform;
+                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                                //    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
+                                //    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
+                                //}
+                                //#endregion
+                                //#region 坐标XY轴
+                                //var transform = group.Children[1] as TranslateTransform;
+                                //transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
+                                //transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+                                //#endregion
                                 mouseDown = false;
+                                ImgXY();
+                              
                             }
                         }
                     }
@@ -2806,9 +2833,9 @@ namespace XHWK.WKTool
 
             //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.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.pageData.currpage - 1].ImageLocation = new TranslateTransform();
             APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = transform1.X;
             APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = transform1.Y;
@@ -3359,22 +3386,34 @@ namespace XHWK.WKTool
         }
         private void imgCanvas_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
         {
-            if (e.LeftButton == MouseButtonState.Pressed)
+            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.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = imgCanvas.Margin.Left;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = imgCanvas.Margin.Top;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform();
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX = imgCanvas.ActualWidth;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY = imgCanvas.ActualHeight;
+        
+                APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
             }
         }
 
         private void imgCanvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
+            if(mouseDown)
+            {
             ShowAngleBorder();
+            }
         }
         System.Drawing.PointF imgRightDown;
         private void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
         {
             try
             {
+             
                 Thumb thu = (Thumb)sender;
                 imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
                 HideAngleBorder();
@@ -3405,6 +3444,8 @@ namespace XHWK.WKTool
         {
             try
             {
+                if(mouseDown)
+                { 
                 Thumb thu = (Thumb)sender;
                 #region 判断是否超出 暂无
                 double plul = Canvas.GetLeft(RectLeftUp);
@@ -3445,6 +3486,15 @@ namespace XHWK.WKTool
                     default:
                         break;
                 }
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = imgCanvas.Margin.Left;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = imgCanvas.Margin.Top;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform();
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX = imgCanvas.ActualWidth;
+                APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY = imgCanvas.ActualHeight;
+                    APP.PageDrawList[APP.pageData.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);
@@ -3485,5 +3535,10 @@ namespace XHWK.WKTool
 
         }
         #endregion
+
+        private void imgCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            mouseDown = true;
+        }
     }
 }

XHWK.WKTool/ZConfig.cs

@@ -13,9 +13,9 @@ namespace XHWK.WKTool.Config
         /// <summary>
         /// 当前版本号
         /// </summary>
-        public static int versionCode = 6;
+        public static int versionCode = 7;
 
-        public static string versionName = "1.0.5";
+        public static string versionName = "1.0.6";
 
         //接口地址
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";