zhao：解决冲突

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,13 +410,13 @@ namespace Common.system
 
 
 
-        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)
+            try
             {
-                if (stroke != null && stroke.StylusPoints.Count > 1)
+                if (_new)
                 {
-                    try
+                    if (stroke != null && stroke.StylusPoints.Count > 1)
                     {
                         drawingAttributes = new DrawingAttributes();
                         //m_canvas.DefaultDrawingAttributes = drawingAttributes;
@@ -415,27 +428,35 @@ namespace Common.system
 
                         stroke.DrawingAttributes = drawingAttributes;
                         //m_canvas.DefaultDrawingAttributes= drawingAttributes;
+
                         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;
                     }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteErrLog("【点阵笔】（changepages）：" + ex.Message, ex);
-                    }
+                    stylusPoints = new StylusPointCollection();
+                    stylusPoint = new StylusPoint();
+                    //stroke = new Stroke(stylusPoints);
+                    //stroke = null;
+                }
+                else
+                {
+                    //stylusPoints = new StylusPointCollection();
+                    //stylusPoint = new StylusPoint();
+                    stylusPoint.X = _x;
+                    stylusPoint.Y = _y;
+                    stylusPoints.Add(stylusPoint);
+                    stroke = new Stroke(stylusPoints);
                 }
-
-                stylusPoints = new StylusPointCollection();
-                stylusPoint = new StylusPoint();
-                //stroke = new Stroke(stylusPoints);
-                //stroke = null;
             }
-            else
+            catch (Exception ex)
             {
-                //stylusPoints = new StylusPointCollection();
-                //stylusPoint = new StylusPoint();
-                stylusPoint.X = _x;
-                stylusPoint.Y = _y;
-                stylusPoints.Add(stylusPoint);
-                stroke = new Stroke(stylusPoints);
+                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】（changepages）点阵比书写报错：" + ex.Message, ex);
             }
         }
 

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

@@ -1409,17 +1409,6 @@ 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;
@@ -1439,10 +1428,13 @@ namespace XHWK.WKTool
             model_DrawData.PageNum = APP.pageData.currpage;
             APP.PageDrawList.Add(model_DrawData);
             APP.SaveDraw();
-            ///截图可用
-            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;
+            }
         }
         /// <summary>
         /// 打印事件
@@ -1472,7 +1464,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);
@@ -1556,9 +1548,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
             {
@@ -1591,28 +1583,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)
@@ -1640,6 +1619,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;
@@ -1648,9 +1628,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;
                             }
                         }
@@ -1662,7 +1644,6 @@ namespace XHWK.WKTool
                     }
                 }
             }
-
         }
         /// <summary>
         /// 下一页
@@ -1673,31 +1654,17 @@ 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;
@@ -1714,14 +1681,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;
@@ -1730,10 +1696,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;
                             }
                         }
@@ -1744,10 +1712,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>
@@ -2179,11 +2143,14 @@ namespace XHWK.WKTool
                 //}
                 stroke.Clear();
             }
-            Dispatcher.Invoke(new Action(() =>
+            if (APP.pageData.currpage > 0)
             {
-                //myblackboard.changepages(0, 0, true);
-                myblackboard.changepages(0, 0, true, Color, Size);
-            }));
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    myblackboard.changepages(0, 0, true, Color, Size, APP.pageData.currpage - 1);
+                }));
+            }
+
 
         }
 
@@ -2316,12 +2283,15 @@ namespace XHWK.WKTool
                 double testX = (double)cx * PropW;
                 double testY = (double)cy * PropH;
                 //pageSerial //点阵IP地址  与打印的页面关联
-
-                Dispatcher.Invoke(new Action(() =>
+                if (APP.pageData.currpage > 0)
                 {
-                    //myblackboard.changepages(testX, testY,false);
-                    myblackboard.changepages(testX, testY, false, Color, Size);
-                }));
+                    Dispatcher.Invoke(new Action(() =>
+                    {
+                        //myblackboard.changepages(testX, testY,false);
+                        myblackboard.changepages(testX, testY, false, Color, Size, APP.pageData.currpage - 1);
+                    }));
+                }
+
 
 
                 ////每3个点画一条曲线