Merge pull request #13 from soapgu/master

fix some svg can not parse bug
dotnetprojects · Mar 14, 2019 · 513d493 · 513d493
2 parents 0723c6d + 0a32d24
commit 513d493
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/SVGImage/Example/Example.csproj b/SVGImage/Example/Example.csproj
@@ -213,6 +213,9 @@
   <ItemGroup>
     <Resource Include="Images\acid1.css" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\error.svg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/SVGImage/Example/Images/error.svg b/SVGImage/Example/Images/error.svg
diff --git a/SVGImage/Example/MainWindow.xaml b/SVGImage/Example/MainWindow.xaml
@@ -25,6 +25,6 @@
         <svg1:SVGImage Source="/Example;component/Images/5.svg" Margin="0,400,0,0" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Width="260" Height="100" VerticalAlignment="Top" />
         <svg1:SVGImage Source="/Example;component/Images/6.svg" Margin="0,500,0,0" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Width="260" Height="100" VerticalAlignment="Top" />
         <svg1:SVGImage Source="/Example;component/Images/acid1.svg" Margin="0,600,0,0" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Width="260" Height="180" VerticalAlignment="Top" />
-
+        <svg1:SVGImage Source="/Example;component/Images/error.svg"></svg1:SVGImage>
     </Grid>
 </Window>
diff --git a/SVGImage/SVGImage/SVG/SVGRender.cs b/SVGImage/SVGImage/SVG/SVGRender.cs
@@ -395,8 +395,10 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
                     PathShape.CurveTo lastc = null;
                     PathShape.QuadraticCurveTo lastq = null;
                     Point lastcirPoint = new Point(0, 0);
+                    PathGeometry path = PathGeometry.CreateFromGeometry(PathGeometry.Parse(r.Data));
+                    //PathGeometry path = new PathGeometry();
 
-                    PathGeometry path = new PathGeometry();
+                    /*
                     foreach (PathShape.PathElement element in r.Elements)
                     {
                         bool isRelative = element.IsRelative;
@@ -546,6 +548,7 @@ internal DrawingGroup LoadGroup(IList<Shape> elements, Rect? viewBox, bool isSwi
                             continue;
                         }
                     }
+                    */
                     /*
                     if (r.Transform != null)
                         path.Transform = r.Transform;

diff --git a/SVGImage/SVGImage/SVG/Shapes/PathShape.cs b/SVGImage/SVGImage/SVG/Shapes/PathShape.cs
@@ -192,6 +192,9 @@ public IList<PathElement> Elements
         }
 
         public bool ClosePath { get; private set; }
+
+        public string Data { get; private set; }
+
         // http://apike.ca/prog_svg_paths.html
         public PathShape(SVG svg, XmlNode node, Shape parent) : base(svg, node, parent)
         {
@@ -203,6 +206,8 @@ public PathShape(SVG svg, XmlNode node, Shape parent) : base(svg, node, parent)
 
             this.ClosePath = false;
             string path = XmlUtil.AttrValue(node, "d", string.Empty);
+            this.Data = path;
+            /*
             CommandSplitter cmd = new CommandSplitter(path);
             string commandstring;
             char command;
@@ -272,6 +277,7 @@ public PathShape(SVG svg, XmlNode node, Shape parent) : base(svg, node, parent)
 
                 System.Diagnostics.Debug.Assert(false, string.Format("type '{0}' not supported", commandstring));
             }
+            */
         }
     }
 }