注释 - 手绘预览虚实线

PDF Office/ViewModels/PropertyPanel/AnnotPanel/FreehandAnnotPropertyViewModel.cs

@@ -68,6 +68,13 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             set => SetProperty(ref _erasethicknessLine, value);
         }
 
+        private DoubleCollection _strokeDashArray = new DoubleCollection();
+        public DoubleCollection StrokeDashArray
+        {
+            get { return _strokeDashArray; }
+            set => SetProperty(ref _strokeDashArray, value);
+        }
+
         #endregion 属性
 
         public AnnotAttribEvent AnnotEvent { get; set; }
@@ -187,13 +194,16 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
             {
                 var tag = ((string)obj);
                 DashStyle newDash = new DashStyle();
+                StrokeDashArray = new DoubleCollection();
                 switch (tag)
                 {
                     case "Dashed":
                         newDash.Dashes.Add(2);
                         newDash.Dashes.Add(2);
                         PropertyPanel.UpdateAnnotAAttrib(AnnotAttrib.LineStyle, newDash);
-                        
+
+                        StrokeDashArray.Add(1);
+                        StrokeDashArray.Add(1);
                         break;
 
                     case "Solid":
@@ -201,7 +211,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                         break;
 
                 }
-               
+                
                 AnnotEvent?.UpdateAnnot();
             }
         }
@@ -375,6 +385,7 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                 else
                 {
                     BasicVm.SetStrDashStyle("None");
+
                 }
             }
         }
@@ -412,6 +423,12 @@ namespace PDF_Office.ViewModels.PropertyPanel.AnnotPanel
                     var isSolid = isSolidStyle(annot);
                     BasicVm.SetStrDashStyle(isSolid ? "Solid" : "Dash");
                     IsPen = true;
+                    StrokeDashArray = new DoubleCollection();
+                    if (isSolid == false)
+                    {
+                        StrokeDashArray.Add(1);
+                        StrokeDashArray.Add(1);
+                    }
                 }
             }
 

PDF Office/Views/PropertyPanel/AnnotPanel/FreehandAnnotProperty.xaml

@@ -118,30 +118,12 @@
             <Border Width="228" Height="100" BorderThickness="1" CornerRadius="2" BorderBrush="#DDDDDD" Background="White" Margin="0,8,0,0"
                     Visibility="{Binding  BasicVm.IsMultiSelected,Converter={StaticResource InvertBoolToVisibleConvert}}"
                     >
-                <Grid>
-                    <Path Name="FreehandPath" Fill="{Binding BasicVm.FontColor}" Stroke="{Binding BasicVm.FontColor}" StrokeThickness="{Binding BasicVm.AnnotThickness}" Visibility="{Binding IsPen,Converter={StaticResource BoolToVisible}}"
-                  Data="M89.6572823,33.0006836 C92.423623,33.0142613 94.9660238,33.2143167 97.6072943,33.6499257 L98.4450428,33.7953737 C99.2868308,33.9487663 100.141867,
-                  34.1261641 101.020317,34.3291126 L101.906948,34.5406353 L102.811448,34.7695353 L103.736075,35.016156 C103.891982,35.0587552 104.048822,35.1021072 104.206642,
-                  35.1462189 L105.165696,35.4200646 L106.150524,35.7124896 L107.163387,36.0238374 L108.206543,36.3544513 L109.833019,36.8872476 L110.961791,37.2675295 L112.128763,
-                  37.6682797 L113.955787,38.3085341 L117.402465,39.5399202 L119.211464,40.1769086 L120.364856,40.5761585 L122.021403,41.1378013 L123.079875,41.487923 L124.104139,
-                  41.8190107 L125.096343,42.1314171 C125.259158,42.1819476 125.420727,42.2317145 125.581094,42.280725 L126.529238,42.5657708 L127.450693,42.833017 L128.347609,
-                  43.0828164 L129.222133,43.3155218 L130.076415,43.5314857 L130.912603,43.7310609 C131.050579,43.7629773 131.187891,43.7942255 131.324583,43.8248129 L132.137658,
-                  44.0004665 L132.938011,44.160613 L133.727789,44.3056054 L134.509141,44.4357963 C134.638784,44.4562809 134.768165,44.4761635 134.897329,44.4954514 L135.670072,
-                  44.6041013 C136.183976,44.6718555 136.695845,44.7303299 137.208542,44.7799948 L137.978566,44.8479436 C138.492808,44.8889165 139.00931,44.921315 139.530938,
-                  44.9456093 L140.317582,44.9760315 C140.976918,44.9964163 141.646502,45.0045057 142.331927,45.0012184 C154.775594,44.9415382 164.257125,42.4510186 170.805372,
-                  37.5853682 L171.166146,37.3126111 L173,39.6890769 C165.853529,45.1864148 155.625487,47.9374967 142.34636,48.0011838 L141.913337,48.0018385 L141.058707,
-                  47.9944256 C140.63492,47.9877681 140.216149,47.9766406 139.801147,47.960847 L138.975797,47.9229799 C137.333671,47.8345703 135.738542,47.6694101 134.110611,
-                  47.4149484 L133.293542,47.2802176 C133.020028,47.232788 132.745234,47.1828197 132.46879,47.1302546 L131.634137,46.9647107 C130.793795,46.7912602 129.935277,
-                  46.5939154 129.048609,46.3711075 L128.152187,46.1397538 C128.001097,46.0997609 127.849132,46.0590461 127.696246,46.0176023 L126.767518,45.7601317 C126.610766,
-                  45.7157424 126.453,45.6706095 126.294176,45.6247256 L125.328153,45.3403539 L124.334496,45.0376121 L123.310988,44.7161518 L122.255414,44.3756242 L121.165555,
-                  44.0156808 L120.039195,43.6359728 L118.874118,43.2361517 L117.668107,42.8158688 L116.418945,42.3747755 L112.974241,41.1440673 L111.779131,
-                  40.7235819 L110.063231,40.1313765 L108.432894,39.5843521 L107.389894,39.2441882 L106.379456,38.9232327 L105.399396,38.6211366 L104.447526,38.3375511 C104.291109,
-                  38.29181 104.135775,38.2468257 103.981479,38.2025908 L103.067797,37.9461172 C102.917471,37.9048512 102.768092,37.8643201 102.619615,37.8245166 L101.739201,
-                  37.5943699 L100.878235,37.3813385 C99.6002783,37.0744533 98.3805774,36.8241548 97.1859334,36.6251448 L96.3928518,36.5000117 C95.6027538,36.3823605 94.8205132,
-                  36.2869811 94.0362933,36.2123035 L93.2510493,36.1444683 L92.4622998,36.0900856 C91.9348126,36.0582371 91.4035311,36.0351242 90.8655406,36.020282 L90.053159,
-                  36.0041634 C89.916802,36.0024914 89.7799346,36.0013218 89.6425113,36.0006473 C77.496861,35.941034 68.0266419,38.4266795 61.1957691,43.4127083 L60.8119345,
-                  43.6976064 L59,41.3044387 C66.3048995,35.7911443 76.3008484,33.037972 88.9517247,33 L89.6572823,33.0006836 Z" >
-                    </Path>
+                <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <Path Name="FreehandPath" StrokeDashArray="{Binding StrokeDashArray}"
+                          Stroke="{Binding BasicVm.FontColor}" StrokeThickness="{Binding BasicVm.AnnotThickness}" 
+                          Visibility="{Binding IsPen,Converter={StaticResource BoolToVisible}}"
+                  Data="M1 25C5.12875 18.3502 10.3975 12.6666 16.9494 8.65676C22.3906 5.32666 29.6822 4.41812 35.8348 5.34323C50.1181 7.49086 60.8395 19.2854 74.6384 22.835C80.312 24.2945 86.1855 25.2489 91.8692 23.3366C96.737 21.6988 101.081 18.9771 104.932 15.4686C109.678 11.1449 114.025 6.91941 117 1"/>
+                    
                     <Ellipse Name="ErasePath" Fill="#1A000000"
                              Width="{Binding EraseThicknessLine,Converter={StaticResource EraseThicknessConverter}}" 
                              Height="{Binding EraseThicknessLine,Converter={StaticResource EraseThicknessConverter}}"