Browse Source

填写签名,圆点预览填充

liyijie 1 year ago
parent
commit
11a37c51f9

+ 9 - 5
PDF Office/ViewModels/FillAndSign/PropertyPanel/ShapFillPropertyViewModel.cs

@@ -27,6 +27,7 @@ using ComPDFKitViewer.PdfViewer;
 using PDF_Master.CustomControl.CompositeControl;
 using Microsoft.Office.Interop.Word;
 using System.Diagnostics.Eventing.Reader;
+using PDF_Master.EventAggregators;
 
 namespace PDF_Master.ViewModels.FillAndSign.PropertyPanel
 {
@@ -516,7 +517,8 @@ namespace PDF_Master.ViewModels.FillAndSign.PropertyPanel
                 case "LineShape":
                     {
                         var lineShape = new PathGeometry();
-                        lineShape.AddGeometry(Geometry.Parse(" M0,10L20,10"));
+                        lineShape.AddGeometry(Geometry.Parse(" M0,10L20,10"));
+                        
                         DataPath = lineShape;
                     }
 
@@ -525,10 +527,12 @@ namespace PDF_Master.ViewModels.FillAndSign.PropertyPanel
                 case "DotShape":
                     {
                         //fillAndSignContentViewModel.LineWidthMultiple = 5;
-                        EllipseGeometry circlePath = new EllipseGeometry();
-                        circlePath.RadiusX = 2.4;
-                        circlePath.RadiusY = 2.4;
-                        circlePath.Center = new Point(2.4, 2.4);
+                        //EllipseGeometry circlePath = new EllipseGeometry();
+                        //circlePath.RadiusX = 2.4;
+                        //circlePath.RadiusY = 2.4;
+                        //circlePath.Center = new Point(2.4, 2.4);
+                        var circlePath = new PathGeometry();
+                        circlePath.AddGeometry(Geometry.Parse(" M2.4,2.4m-2.4,0a2.4,2.4,0,1,0,4.8,0a2.4,2.4,0,1,0,-4.8,0M2.4,2.4L2.4,4.8M2.4,2.4L4.8,2.4M2.4,2.4L2.4,0M2.4,2.4L0,2.4M2.4,2.4m-1.2,0a1.2,1.2,0,1,0,2.4,0a1.2,1.2,0,1,0,-2.4,0M2.4,2.4m-1.6,0a1.6,1.6,0,1,0,3.2,0a1.6,1.6,0,1,0,-3.2,0"));
                         DataPath = circlePath;
                     }