点阵比

Common/system/BlackboardNew.cs

@@ -397,38 +397,48 @@ 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)
                 {
-                    drawingAttributes = new DrawingAttributes();
-                    //m_canvas.DefaultDrawingAttributes = drawingAttributes;
-                    drawingAttributes.Color = _color;
-                    drawingAttributes.Width = _size * 5;
-                    drawingAttributes.Height = _size * 5;
-                    drawingAttributes.FitToCurve = true;
-                    drawingAttributes.IgnorePressure = false;
-
-                    stroke.DrawingAttributes = drawingAttributes;
-                    //m_canvas.DefaultDrawingAttributes= drawingAttributes;
-                    m_canvas.Strokes.Add(stroke);
-                }
+                    if (stroke != null && stroke.StylusPoints.Count > 1)
+                    {
+                        drawingAttributes = new DrawingAttributes();
+                        //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+                        drawingAttributes.Color = _color;
+                        drawingAttributes.Width = _size * 5;
+                        drawingAttributes.Height = _size * 5;
+                        drawingAttributes.FitToCurve = true;
+                        drawingAttributes.IgnorePressure = false;
+
+                        stroke.DrawingAttributes = drawingAttributes;
+                        //m_canvas.DefaultDrawingAttributes= drawingAttributes;
+
+                        m_canvas.Strokes.Add(stroke);
+                        strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+                        stroke = null;
+                    }
 
-                stylusPoints = new StylusPointCollection();
-                stylusPoint = new StylusPoint();
-                //stroke = new Stroke(stylusPoints);
-                //stroke = null;
+                    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);
+                }
             }
-            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/XHMicroLessonSystemWindow.xaml.cs

@@ -2097,11 +2097,15 @@ 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);
+                    myblackboard.changepages(0, 0, true, Color, Size, APP.pageData.currpage - 1);
+                }));
+            }
+         
 
         }
 
@@ -2234,12 +2238,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个点画一条曲线