优化

Common/system/BlackboardNew.cs

@@ -333,7 +333,7 @@ namespace Common.system
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
         bool isFirst = true;
-        //public void changepages(double _x, double _y, bool _new, Color _color, int _size)
+        //public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
         //{
         //    if (_new)
         //    {
@@ -349,6 +349,15 @@ namespace Common.system
         //            stroke.DrawingAttributes = drawingAttributes;
         //            m_canvas.Strokes.Add(stroke);
         //            isFirst = true;
+
+        //            strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+        //            //int currCount = strokes_page_all[i].lines.Last().lines_curr.Count;
+        //            //if (currCount > 0)
+        //            //{
+        //            //    strokes_page_all[i].lines.Last().lines_curr[currCount - 1].add = stroke;
+        //            //}
+
+
         //        }
 
         //        stylusPoints = new StylusPointCollection();
@@ -372,12 +381,16 @@ namespace Common.system
         //        }
         //        else
         //        {
-        //            if(m_canvas.Strokes.Count)
-        //            stylusPoint.X = _x;
+        //            if (m_canvas.Strokes.Count>0)
+        //            {
+
+
+        //                stylusPoint.X = _x;
         //            stylusPoint.Y = _y;
         //            stylusPoints.Add(stylusPoint);
         //            stroke = new Stroke(stylusPoints);
         //            m_canvas.Strokes[m_canvas.Strokes.Count - 1].StylusPoints.Add(stylusPoints);
+        //            }
         //        }
         //    }
         //}
@@ -397,7 +410,7 @@ namespace Common.system
 
 
 
-        public void changepages(double _x, double _y, bool _new, Color _color, int _size,int i)
+        public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
         {
             try
             {
@@ -418,6 +431,12 @@ namespace Common.system
 
                         m_canvas.Strokes.Add(stroke);
                         strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+
+                        //int currCount= strokes_page_all[i].lines.Last().lines_curr.Count;
+                        //if (currCount > 0)
+                        //{
+                        //    strokes_page_all[i].lines.Last().lines_curr[currCount - 1] = stroke;
+                        //}
                         stroke = null;
                     }
 

XHWK.WKTool/App.cs

@@ -127,10 +127,10 @@ namespace XHWK.WKTool
         /// 打印
         /// </summary>
         public static PrintWindow W_PrintWindow = null;
-        /// <summary>
-        /// 提示窗口
-        /// </summary>
-        public static PromptWindow W_PromptWindow = null;
+        ///// <summary>
+        ///// 提示窗口
+        ///// </summary>
+        //public static PromptWindow W_PromptWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -159,10 +159,10 @@
                 <Image x:Name="imgPlayerRight" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right"  Margin="10,7,26,10" VerticalAlignment="Top" Visibility="Collapsed"/>
                 <Image x:Name="imgPlayerLeftUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Left"  Margin="10,7,10,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
                 <Image x:Name="imgPlayerRightUnder" Width="172" Height="124" Source="./Images/microLessonSystem_17.png"  HorizontalAlignment="Right" Margin="10,7,26,10" VerticalAlignment="Bottom" Visibility="Collapsed"/>
-                <Label Content="" Grid.Column="0" HorizontalAlignment="Left" Height="10" VerticalAlignment="Top" Width="10" Background="#FF0F0F0F" Margin="1,0,0,0"/>
-                <Label Content="" Grid.Column="1" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
-                <Label Content="" Grid.Column="0" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
-                <Label Content="" Grid.Column="1" Height="10" Width="10" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
+                <Label Content="" Grid.Column="0" Height="2" Width="2" HorizontalAlignment="Left"  VerticalAlignment="Top" Background="#FF0F0F0F" Margin="1,0,0,0"/>
+                <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
+                <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
+                <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
             </Grid>
            
             <Grid Grid.Row="1">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -188,7 +188,7 @@ namespace XHWK.WKTool
                         if (I > 10010)
                         {
                             long time = Timestamp();
-                        string imgPath= FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
+                            string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
                             string path = CameraHelper.CaptureImage(imgPath, time.ToString());
                             if (!string.IsNullOrWhiteSpace(path))
@@ -327,7 +327,7 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-            if(APP.fileDirectoryWindow==null)
+            if (APP.fileDirectoryWindow == null)
             {
                 APP.fileDirectoryWindow = new FileDirectoryWindow();
                 //APP.fileDirectoryWindow.Topmost = true;
@@ -692,7 +692,7 @@ namespace XHWK.WKTool
             {
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
-                    if(APP.pageData.currpage==0)
+                    if (APP.pageData.currpage == 0)
                     {
                         APP.pageData.pagenum += 1;
                         APP.pageData.currpage = APP.pageData.pagenum;
@@ -905,21 +905,21 @@ namespace XHWK.WKTool
                             string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                             string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
                             int num = 0;
-                            for (int i = 0+ APP.pageData.pagenum; i < page.Length+ APP.pageData.pagenum; i++)//给画板模型加图片路径
+                            for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                             {
-                                if (APP.PageDrawList!=null&&APP.PageDrawList.Count > i)
+                                if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
                                 {
-                                    APP.PageDrawList[i].PageImagePath = page[i- APP.pageData.pagenum]; //zxycs
-                                    APP.PageDrawList[i].PdfImagePath = page[i- APP.pageData.pagenum];
+                                    APP.PageDrawList[i].PageImagePath = page[i - APP.pageData.pagenum]; //zxycs
+                                    APP.PageDrawList[i].PdfImagePath = page[i - APP.pageData.pagenum];
                                     APP.PageDrawList[i].PageNum = i + 1;
                                     APP.PageDrawList[i].ImgDocumentation = true;
                                 }
                                 else
                                 {
-                                  
+
                                     Model_DrawData model_DrawData = new Model_DrawData();
-                                    model_DrawData.PageImagePath = page[i- APP.pageData.pagenum];
-                                    model_DrawData.PdfImagePath = page[i- APP.pageData.pagenum];
+                                    model_DrawData.PageImagePath = page[i - APP.pageData.pagenum];
+                                    model_DrawData.PdfImagePath = page[i - APP.pageData.pagenum];
                                     model_DrawData.PageNum = i + 1;
                                     model_DrawData.ImgDocumentation = true;
                                     APP.PageDrawList.Add(model_DrawData);
@@ -930,12 +930,12 @@ namespace XHWK.WKTool
                                 APP.SaveDraw();
                                 num++;
                             }
-                            if(num>0)
+                            if (num > 0)
                             {
                                 APP.pageData.currpage = APP.pageData.pagenum + 1;
                                 APP.pageData.pagenum += num;
                             }
-                            if (APP.pageData.currpage>0 && APP.pageData.currpage < APP.PageDrawList.Count)
+                            if (APP.pageData.currpage > 0 && APP.pageData.currpage < APP.PageDrawList.Count)
                             {
                                 imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));//给当前页面展示图片
                                 imgCanvas.Source = null;
@@ -1016,7 +1016,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnRecord_Click(object sender, RoutedEventArgs e)
         {
-            if(APP.pageData.currpage > 0)
+            if (APP.pageData.currpage > 0)
             {
                 blackboard_canvas.Visibility = Visibility.Visible;
             }
@@ -1251,7 +1251,7 @@ namespace XHWK.WKTool
                 ImgSetUpTwo.Visibility = Visibility.Collapsed;
                 btnSetUp.IsEnabled = true;
 
-                btnLoginType.IsEnabled = true; 
+                btnLoginType.IsEnabled = true;
                 #endregion
 
                 IsSuspendR = true;
@@ -1327,40 +1327,32 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnAdd_Click(object sender, RoutedEventArgs e)
         {
-      //      RectangleF rectangleF = new RectangleF();
-      //      rectangleF.Width = (float)APP.PageDrawList[0].ImageSizes.CenterX;
-      //      rectangleF.Height = (float)APP.PageDrawList[0].ImageSizes.CenterY;
-      //      rectangleF.X= (float)APP.PageDrawList[0].ImageLocation.X;
-      //      rectangleF.Y = (float)APP.PageDrawList[0].ImageLocation.Y;
-
-      //      //CESHI 
-      //bool isImg=    MergerImg(APP.PageDrawList[0].PageImagePath, @"G:\102H.jpg", rectangleF, out string errmsg);
-
-
-
-                if (APP.pageData.currpage>0)
-                {
-                    APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
-                }
-                if(IsStartCount&& blackboard_canvas.Visibility == Visibility.Collapsed)
-                {
-                    blackboard_canvas.Visibility = Visibility.Visible;
-                }
-                APP.pageData.pagenum += 1;
-                APP.pageData.currpage = APP.pageData.pagenum;
-                myblackboard.changepage(APP.pageData.currpage - 1);
-                ///清空页面图片UI
-                imgCanvas.Source = null;
+            if (APP.pageData.currpage > 0)
+            {
+                APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
+            }
+            if (IsStartCount && blackboard_canvas.Visibility == Visibility.Collapsed)
+            {
+                blackboard_canvas.Visibility = Visibility.Visible;
+            }
+            APP.pageData.pagenum += 1;
+            APP.pageData.currpage = APP.pageData.pagenum;
+            myblackboard.changepage(APP.pageData.currpage - 1);
+            ///清空页面图片UI
+            imgCanvas.Source = null;
             imgDocumentation.Source = null;
-                ///画板模型增加一页
-                Model_DrawData model_DrawData = new Model_DrawData();
-                model_DrawData.PageNum = APP.pageData.currpage;
-                APP.PageDrawList.Add(model_DrawData);
-                APP.SaveDraw();
-            ///截图可用
-            ImgScreenshot.Visibility = Visibility.Visible;
-            ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-            btnScreenshot.IsEnabled = true;
+            ///画板模型增加一页
+            Model_DrawData model_DrawData = new Model_DrawData();
+            model_DrawData.PageNum = APP.pageData.currpage;
+            APP.PageDrawList.Add(model_DrawData);
+            APP.SaveDraw();
+            if (btnImport.IsEnabled == true)
+            {
+                ///截图可用
+                ImgScreenshot.Visibility = Visibility.Visible;
+                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                btnScreenshot.IsEnabled = true;
+            }
         }
         /// <summary>
         /// 打印事件
@@ -1375,7 +1367,7 @@ namespace XHWK.WKTool
 
 
 
-                    iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
@@ -1390,7 +1382,7 @@ namespace XHWK.WKTool
                 {
                     long ii = Timestamp();
                     string directoryPath = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
-                    string filePathOutPut = Path.Combine(directoryPath, string.Format("{0}{1}.jpg", ii, i));
+                    string filePathOutPut = Path.Combine(directoryPath, string.Format("print{0}{1}.jpg", ii, i));
                     RectangleF rectangleFs = new RectangleF();
                     MergerImg("", filePathOutPut, rectangleFs, out string errmsg);
                     image = iTextSharp.text.Image.GetInstance(filePathOutPut);
@@ -1398,7 +1390,7 @@ namespace XHWK.WKTool
                     {
 
                     }
-                    else if(APP.PageDrawList[i].ImgDocumentation==true)
+                    else if (APP.PageDrawList[i].ImgDocumentation == true)
                     {
                         image = iTextSharp.text.Image.GetInstance(APP.PageDrawList[i].PageImagePath);
                     }
@@ -1413,7 +1405,7 @@ namespace XHWK.WKTool
 
                         string msg = string.Empty;
                         bool isImg = MergerImg(APP.PageDrawList[i].PageImagePath, filePathOutPut, rectangleF, out msg);
-                        if(isImg)
+                        if (isImg)
                         {
                             image = iTextSharp.text.Image.GetInstance(filePathOutPut);
                         }
@@ -1423,7 +1415,7 @@ namespace XHWK.WKTool
                         }
                     }
 
-                   
+
 
 
                     if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
@@ -1451,7 +1443,7 @@ namespace XHWK.WKTool
             }
 
 
-         
+
 
 
 
@@ -1474,9 +1466,9 @@ namespace XHWK.WKTool
                 //APP.W_PrintWindow.Topmost = true;
                 APP.W_PrintWindow.Owner = this;
             }
-            if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PdfImagePath))
+            if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PageImagePath))
             {
-                APP.W_PrintWindow.Initialize(APP.PageDrawList[0].PdfImagePath);
+                APP.W_PrintWindow.Initialize(APP.PageDrawList[0].PageImagePath);
             }
             else
             {
@@ -1509,28 +1501,15 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage > 1)
             {
-                try
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        string filePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/pdfimagetemp/");
-                        FileToolsCommon.CreateDirectory(filePath);
-                        string filePathName = filePath + APP.pageData.currpage.ToString() + ".jpg";
-                        ImageHelper.SaveUIToImage(GridMain, filePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
-                        //ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
-                        APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = filePathName;
-                    });
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(last_button_Click)生成图片错误:" + ex.Message, ex);
-                }
                 APP.pageData.currpage -= 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                ///截图可用
-                ImgScreenshot.Visibility = Visibility.Visible;
-                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                btnScreenshot.IsEnabled = true;
+                if (btnImport.IsEnabled == true)
+                {
+                    ///截图可用
+                    ImgScreenshot.Visibility = Visibility.Visible;
+                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                    btnScreenshot.IsEnabled = true;
+                }
                 if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
                     if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
@@ -1558,6 +1537,7 @@ namespace XHWK.WKTool
                             {
                                 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;
@@ -1566,9 +1546,11 @@ namespace XHWK.WKTool
                                     imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
                                     imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
                                 }
-                                //var position = e.GetPosition(img);
+                                #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;
                             }
                         }
@@ -1580,7 +1562,6 @@ namespace XHWK.WKTool
                     }
                 }
             }
-
         }
         /// <summary>
         /// 下一页
@@ -1591,38 +1572,24 @@ namespace XHWK.WKTool
         {
             if (APP.pageData.currpage < APP.pageData.pagenum)
             {
-                try
-                {
-                    Dispatcher.Invoke(() =>
-                    {
-                        string filePath = FileToolsCommon.GetFileAbsolutePath("/Data/" + APP.UserInfo.Username + "/pdfimagetemp/");
-                        FileToolsCommon.CreateDirectory(filePath);
-                        string filePathName = filePath + APP.pageData.currpage.ToString() + ".jpg";
-                        ImageHelper.SaveUIToImage(GridMain, filePathName, (int)GridMain.ActualWidth, (int)GridMain.ActualHeight);
-                        //ImgPDFPath[APP.pageData.currpage - 1] = filePathName;
-                        APP.PageDrawList[APP.pageData.currpage - 1].PdfImagePath = filePathName;
-                    });
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】(next_btn_Click)生成图片错误:" + ex.Message, ex);
-                }
                 APP.pageData.currpage += 1;
                 myblackboard.changepage(APP.pageData.currpage - 1);
-                ///截图可用
-                ImgScreenshot.Visibility = Visibility.Visible;
-                ImgScreenshotTwo.Visibility = Visibility.Collapsed;
-                btnScreenshot.IsEnabled = true;
+                if (btnImport.IsEnabled == true)
+                {
+                    ///截图可用
+                    ImgScreenshot.Visibility = Visibility.Visible;
+                    ImgScreenshotTwo.Visibility = Visibility.Collapsed;
+                    btnScreenshot.IsEnabled = true;
+                }
                 if (APP.pageData.currpage <= APP.PageDrawList.Count)
                 {
-
                     if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null)
                     {
                         APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
                     }
                     if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.PageDrawList.Count && !string.IsNullOrWhiteSpace(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath))
                     {
-                        if(APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
+                        if (APP.PageDrawList[APP.pageData.currpage - 1].ImgDocumentation)
                         {
                             imgCanvas.Source = null;
                             imgDocumentation.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
@@ -1632,14 +1599,13 @@ namespace XHWK.WKTool
                         }
                         else
                         {
-                            //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
                             imgDocumentation.Source = null;
-
                             imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
                             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;
@@ -1648,10 +1614,12 @@ namespace XHWK.WKTool
                                     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;
-                                //var position = e.GetPosition(img);
                                 transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
                                 transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
+                                #endregion
                                 mouseDown = false;
                             }
                         }
@@ -1662,10 +1630,6 @@ namespace XHWK.WKTool
                         imgDocumentation.Source = null;
                     }
                 }
-                //if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
-                //{
-                //    imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
-                //}
             }
         }
         /// <summary>
@@ -1676,45 +1640,45 @@ namespace XHWK.WKTool
         /// <param name="_rectangle">图片位置</param>
         /// <param name="errmsg">错误消息</param>
         /// <returns></returns>
-        private bool MergerImg(string _path,string _saveimg,RectangleF _rectangle, out string errmsg)
+        private bool MergerImg(string _path, string _saveimg, RectangleF _rectangle, out string errmsg)
         {
             errmsg = null;
             try
             {
                 Bitmap bitmap = null;
 
-                 //创建要显示的图片对象,根据参数的个数设置宽度
-                 Bitmap backgroudImg = new Bitmap((int)gridM.ActualWidth, (int)gridM.ActualHeight);
+                //创建要显示的图片对象,根据参数的个数设置宽度
+                Bitmap backgroudImg = new Bitmap((int)gridM.ActualWidth, (int)gridM.ActualHeight);
                 Graphics g = Graphics.FromImage(backgroudImg);
                 //清除画布,背景设置为白色
                 g.Clear(System.Drawing.Color.White);
 
-                if(!string.IsNullOrWhiteSpace(_path))
+                if (!string.IsNullOrWhiteSpace(_path))
                 {
-                     bitmap = ImageHelper.ReadBitmapFile(_path);
+                    bitmap = ImageHelper.ReadBitmapFile(_path);
                     g.DrawImage(bitmap, _rectangle);
                 }
 
 
                 backgroudImg.Save(_saveimg);
-               
+
                 g.Dispose();
                 backgroudImg.Dispose();
-                if(bitmap!=null)
+                if (bitmap != null)
                 {
                     bitmap.Dispose();
                 }
-              
+
                 GC.Collect();
                 return true;
             }
             catch (Exception ex)
             {
                 errmsg = ex.Message;
-                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message,ex);
+                LogHelper.WriteErrLog("【截图合成】（MergerImg）图片合成失败：" + ex.Message, ex);
                 return false;
             }
-        
+
         }
         /// <summary>
         /// 将Word文档转换为图片的方法（该方法基于第三方DLL），你可以像这样调用该方法： ConvertPDF2Image("F:\\PdfFile.doc", "F:\\",
@@ -2097,15 +2061,14 @@ namespace XHWK.WKTool
                 //}
                 stroke.Clear();
             }
-            if(APP.pageData.currpage>0)
+            if (APP.pageData.currpage > 0)
             {
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    //myblackboard.changepages(0, 0, true);
                     myblackboard.changepages(0, 0, true, Color, Size, APP.pageData.currpage - 1);
                 }));
             }
-         
+
 
         }
 
@@ -2238,7 +2201,7 @@ namespace XHWK.WKTool
                 double testX = (double)cx * PropW;
                 double testY = (double)cy * PropH;
                 //pageSerial //点阵IP地址  与打印的页面关联
-                if(APP.pageData.currpage>0)
+                if (APP.pageData.currpage > 0)
                 {
                     Dispatcher.Invoke(new Action(() =>
                     {
@@ -2246,7 +2209,7 @@ namespace XHWK.WKTool
                         myblackboard.changepages(testX, testY, false, Color, Size, APP.pageData.currpage - 1);
                     }));
                 }
-             
+
 
 
                 ////每3个点画一条曲线
@@ -2330,7 +2293,7 @@ namespace XHWK.WKTool
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void BtnOk_Click(object sender, RoutedEventArgs e) 
+        private void BtnOk_Click(object sender, RoutedEventArgs e)
         {
             //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = true;
             //btnOk.Visibility = Visibility.Collapsed;