Merge remote-tracking branch 'origin/zxy' into zyy

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -30,6 +30,10 @@ namespace XHWK.WKTool
         /// 0 画笔 1 矩形 2 圆形 
         /// </summary>
         private int flg = 0;
+        /// <summary>
+        /// 
+        /// </summary>
+        Color Colour=Colors.Black;
         public PracticeWindow()
         {
             InitializeComponent();
@@ -46,18 +50,7 @@ namespace XHWK.WKTool
             }
 
 
-            drawingAttributes = new DrawingAttributes
-            {
-                Color = Colors.Red,
-                Width = 2,
-                Height = 2,
-                StylusTip = StylusTip.Rectangle,
-                //FitToCurve = true,
-                IsHighlighter = false,
-                IgnorePressure = true,
-
-            };
-            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
+        
 
 
 
@@ -89,9 +82,6 @@ namespace XHWK.WKTool
 
             DataContext = viewModel;
         }
-
-
-
         /// <summary>
         /// 画笔颜色事件 白色
         /// </summary>
@@ -210,14 +200,24 @@ namespace XHWK.WKTool
         
             blackboard_canvas.Cursor = Cursors.Pen;
         }
-        private bool IsRound = false;
-        StrokeCollection StrokeCollectionRound; 
         /// <summary>
         /// 圆
         /// </summary>
         public void Round()
         {
             flg = 2;
+            drawingAttributes = new DrawingAttributes
+            {
+                Color = Colors.Red,
+                Width = 2,
+                Height = 2,
+                StylusTip = StylusTip.Rectangle,
+                //FitToCurve = true,
+                IsHighlighter = false,
+                IgnorePressure = true,
+
+            };
+            blackboard_canvas.DefaultDrawingAttributes = drawingAttributes;
             blackboard_canvas.EditingMode = InkCanvasEditingMode.None;
         }
         /// <summary>
@@ -305,11 +305,6 @@ namespace XHWK.WKTool
             }
             return pointList;
         }
-
-        private void blackboard_canvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-
-        }
         /// <summary>
         /// 鼠标松开时
         /// </summary>