From f9bf8db659b80e978b954e96470a44d9bb1ed55f Mon Sep 17 00:00:00 2001 From: kriastans Date: Thu, 11 Jul 2024 21:59:31 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E8=BF=98=E9=9C=80=E8=A6=81=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E5=AE=8C=E5=96=84=EF=BC=8C=E5=85=B6=E4=BB=96=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=B0=8F=E4=BF=AE=E5=A4=8D=E3=80=82=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=B8=8B=E6=AC=A1commit=E5=86=8D=E4=BA=A4?= =?UTF-8?q?=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InkCanvasForClass/MainWindow.xaml | 4880 +++++++++-------- InkCanvasForClass/MainWindow.xaml.cs | 2 +- .../MainWindow_cs/MW_FloatingBarIcons.cs | 12 +- .../MainWindow_cs/MW_Settings.cs | 261 +- .../MainWindow_cs/MW_SettingsToLoad.cs | 70 +- .../MainWindow_cs/MW_ShapeDrawing.cs | 8 - .../MainWindow_cs/MW_TouchEvents.cs | 217 +- InkCanvasForClass/Resources/Settings.cs | 12 + .../InkCanvasForClassX.csproj.user | 14 + InkCanvasForClassX/Libraries/InkCanvas.xaml | 12 + .../Libraries/InkCanvas.xaml.cs | 68 + InkCanvasForClassX/MainWindow.xaml | 3 +- InkCanvasForClassX/MainWindow.xaml.cs | 66 +- 13 files changed, 3333 insertions(+), 2292 deletions(-) create mode 100644 InkCanvasForClassX/InkCanvasForClassX.csproj.user create mode 100644 InkCanvasForClassX/Libraries/InkCanvas.xaml create mode 100644 InkCanvasForClassX/Libraries/InkCanvas.xaml.cs diff --git a/InkCanvasForClass/MainWindow.xaml b/InkCanvasForClass/MainWindow.xaml index 5c00d67..1a0799b 100644 --- a/InkCanvasForClass/MainWindow.xaml +++ b/InkCanvasForClass/MainWindow.xaml @@ -106,2138 +106,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 左下 - - - 右下 - - - 左侧 - - - 右侧 - - - - - - - - - - - - - - - - - - - - - - - - - 显示页码 - - - 半透明 - - - 黑色背景 - - - - - - 显示页码 - - - 半透明 - - - 黑色背景 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DesktopAnnotation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 左下 + + + 右下 + + + 左侧 + + + 右侧 + + + + + + + + + + + + + + + + + + + + + + + + + 显示页码 + + + 半透明 + + + 黑色背景 + + + + + + 显示页码 + + + 半透明 + + + 黑色背景 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DesktopAnnotation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/InkCanvasForClassX/MainWindow.xaml.cs b/InkCanvasForClassX/MainWindow.xaml.cs index 266215d..3c1f287 100644 --- a/InkCanvasForClassX/MainWindow.xaml.cs +++ b/InkCanvasForClassX/MainWindow.xaml.cs @@ -51,38 +51,38 @@ namespace InkCanvasForClassX { InitializeComponent(); InkC.StrokeCollected += (object sender, InkCanvasStrokeCollectedEventArgs e) => { - InkP.Strokes = InkC.Strokes; - var stylusPtsList = new List(); - foreach (var strokeStylusPoint in e.Stroke.StylusPoints) { - stylusPtsList.Add(new PerfectFreehandJint.StylusPointLite() - { - x = Math.Round(strokeStylusPoint.X,2) , - y = Math.Round(strokeStylusPoint.Y,2), - pressure = strokeStylusPoint.PressureFactor, - }); - } - var aaa = new PerfectFreehandJint(); - var ccc = aaa.GetSVGPathStroke(stylusPtsList.ToArray(), new PerfectFreehandJint.StrokeOptions() { - size = 16, - thinning = 0.5, - smoothing = 0.5, - streamline = 0.5, - simulatePressure = true, - easing = (t)=>t, - last = true, - start = new PerfectFreehandJint.StrokeCapOptions() { - cap = true, - taper = 0, - easing = (t)=>t, - }, - end = new PerfectFreehandJint.StrokeCapOptions() - { - cap = true, - taper = 0, - easing = (t) => t, - }, - }); - Trace.WriteLine(ccc); + inkCanvas.InkStrokes = InkC.Strokes; + //var stylusPtsList = new List(); + //foreach (var strokeStylusPoint in e.Stroke.StylusPoints) { + // stylusPtsList.Add(new PerfectFreehandJint.StylusPointLite() + // { + // x = Math.Round(strokeStylusPoint.X,2) , + // y = Math.Round(strokeStylusPoint.Y,2), + // pressure = strokeStylusPoint.PressureFactor, + // }); + //} + //var aaa = new PerfectFreehandJint(); + //var ccc = aaa.GetSVGPathStroke(stylusPtsList.ToArray(), new PerfectFreehandJint.StrokeOptions() { + // size = 16, + // thinning = 0.5, + // smoothing = 0.5, + // streamline = 0.5, + // simulatePressure = true, + // easing = (t)=>t, + // last = true, + // start = new PerfectFreehandJint.StrokeCapOptions() { + // cap = true, + // taper = 0, + // easing = (t)=>t, + // }, + // end = new PerfectFreehandJint.StrokeCapOptions() + // { + // cap = true, + // taper = 0, + // easing = (t) => t, + // }, + //}); + //Trace.WriteLine(ccc); }; InkC.MouseRightButtonDown += Inkcanv_MouseRightButtonDown; @@ -135,7 +135,7 @@ namespace InkCanvasForClassX { stroke.Transform(new Matrix(1, 0, 0, 1, delta.X, delta.Y), false); } - InkP.Strokes = InkC.Strokes; + inkCanvas.InkStrokes = InkC.Strokes; startPoint = currentPoint; }