Reversed IsEmbedded logic and wrote additional tests

Author: codebude

QRCoder/SvgQRCode.cs

@@ -187,13 +187,13 @@ public string GetGraphic(Size viewBox, string darkColorHex, string lightColorHex
             //Render logo, if set
             if (logo != null)
             {                   
-                if (logo.GetMediaType() == SvgLogo.MediaType.PNG || logo.IsEmbedded())
+                if (!logo.IsEmbedded())
                 {
                     svgFile.AppendLine($@"<svg width=""100%"" height=""100%"" version=""1.1"" xmlns = ""http://www.w3.org/2000/svg"">");
                     svgFile.AppendLine($@"<image x=""{CleanSvgVal(logoAttr.Value.X)}"" y=""{CleanSvgVal(logoAttr.Value.Y)}"" width=""{CleanSvgVal(logoAttr.Value.Width)}"" height=""{CleanSvgVal(logoAttr.Value.Height)}"" xlink:href=""{logo.GetDataUri()}"" />");
                     svgFile.AppendLine(@"</svg>");
                 }
-                else if (logo.GetMediaType() == SvgLogo.MediaType.SVG)
+                else
                 {
                     var rawLogo = (string)logo.GetRawLogo();                 
                     var svg = System.Xml.Linq.XDocument.Parse(rawLogo);
@@ -297,8 +297,8 @@ public SvgLogo(Bitmap iconRasterized, int iconSizePercent = 15, bool fillLogoBac
             /// <param name="iconVectorized">Logo to be rendered as SVG/vectorized graphic/string</param>
             /// <param name="iconSizePercent">Degree of percentage coverage of the QR code by the logo</param>
             /// <param name="fillLogoBackground">If true, the background behind the logo will be cleaned</param>
-            /// <param name="iconEmbedded">If true, the logo will be expressed as <image>-tag instead of embedding the svg</param>
-            public SvgLogo(string iconVectorized, int iconSizePercent = 15, bool fillLogoBackground = true, bool iconEmbedded = false)
+            /// <param name="iconEmbedded">If true, the logo will embedded as native svg instead of embedding it as image-tag</param>
+            public SvgLogo(string iconVectorized, int iconSizePercent = 15, bool fillLogoBackground = true, bool iconEmbedded = true)
             {
                 _iconSizePercent = iconSizePercent;
                 _logoData = Convert.ToBase64String(Encoding.UTF8.GetBytes(iconVectorized), Base64FormattingOptions.None);

QRCoderTests/SvgQRCodeRendererTests.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Security.Cryptography;
 using QRCoderTests.Helpers;
+
 #if !NETCOREAPP1_1
 using System.Drawing;
 #endif
@@ -67,6 +68,19 @@ public void can_render_svg_qrcode_viewbox_mode()
             result.ShouldBe("56719c7db39937c74377855a5dc4af0a");
         }
 
+        [Fact]
+        [Category("QRRenderer/SvgQRCode")]
+        public void can_render_svg_qrcode_viewbox_mode_viewboxattr()
+        {
+            //Create QR code
+            var gen = new QRCodeGenerator();
+            var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
+            var svg = new SvgQRCode(data).GetGraphic(new Size(128, 128), sizingMode: SvgQRCode.SizingMode.ViewBoxAttribute);
+
+            var result = HelperFunctions.StringToHash(svg);
+            result.ShouldBe("788afdb693b0b71eed344e495c180b60");
+        }
+
         [Fact]
         [Category("QRRenderer/SvgQRCode")]
         public void can_render_svg_qrcode_without_quietzones()
@@ -80,6 +94,19 @@ public void can_render_svg_qrcode_without_quietzones()
             result.ShouldBe("2a582427d86b51504c08ebcbcf0472bd");
         }
 
+        [Fact]
+        [Category("QRRenderer/SvgQRCode")]
+        public void can_render_svg_qrcode_without_quietzones_hex()
+        {
+            //Create QR code
+            var gen = new QRCodeGenerator();
+            var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
+            var svg = new SvgQRCode(data).GetGraphic(10, "#000000", "#ffffff", false);
+
+            var result = HelperFunctions.StringToHash(svg);
+            result.ShouldBe("4ab0417cc6127e347ca1b2322c49ed7d");
+        }
+
         [Fact]
         [Category("QRRenderer/SvgQRCode")]
         public void can_render_svg_qrcode_with_png_logo()
@@ -89,8 +116,9 @@ public void can_render_svg_qrcode_with_png_logo()
             var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
 
             //Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909346
-            var logoBitmap = (Bitmap)Bitmap.FromFile(GetAssemblyPath() + "\\assets\\noun_software engineer_2909346.png");
-            var logoObj = new SvgQRCode.SvgLogo(logoBitmap, 15);
+            var logoBitmap = (Bitmap)Image.FromFile(GetAssemblyPath() + "\\assets\\noun_software engineer_2909346.png");
+            var logoObj = new SvgQRCode.SvgLogo(iconRasterized: logoBitmap, 15);
+            logoObj.GetMediaType().ShouldBe<SvgQRCode.SvgLogo.MediaType>(SvgQRCode.SvgLogo.MediaType.PNG);
 
             var svg = new SvgQRCode(data).GetGraphic(10, Color.DarkGray, Color.White, logo: logoObj);
 
@@ -100,20 +128,39 @@ public void can_render_svg_qrcode_with_png_logo()
 
         [Fact]
         [Category("QRRenderer/SvgQRCode")]
-        public void can_render_svg_qrcode_with_svg_logo()
+        public void can_render_svg_qrcode_with_svg_logo_embedded()
+        {
+            //Create QR code
+            var gen = new QRCodeGenerator();
+            var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
+
+            //Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909361
+            var logoSvg = File.ReadAllText(GetAssemblyPath() + "\\assets\\noun_Scientist_2909361.svg");            
+            var logoObj = new SvgQRCode.SvgLogo(logoSvg, 20);
+            logoObj.GetMediaType().ShouldBe<SvgQRCode.SvgLogo.MediaType>(SvgQRCode.SvgLogo.MediaType.SVG);
+
+            var svg = new SvgQRCode(data).GetGraphic(10, Color.DarkGray, Color.White, logo: logoObj);
+
+            var result = HelperFunctions.StringToHash(svg);
+            result.ShouldBe("855eb988d3af035abd273ed1629aa952");            
+        }
+
+        [Fact]
+        [Category("QRRenderer/SvgQRCode")]
+        public void can_render_svg_qrcode_with_svg_logo_image_tag()
         {
             //Create QR code
             var gen = new QRCodeGenerator();
             var data = gen.CreateQrCode("This is a quick test! 123#?", QRCodeGenerator.ECCLevel.H);
 
             //Used logo is licensed under public domain. Ref.: https://thenounproject.com/Iconathon1/collection/redefining-women/?i=2909361
             var logoSvg = File.ReadAllText(GetAssemblyPath() + "\\assets\\noun_Scientist_2909361.svg");
-            var logoObj = new SvgQRCode.SvgLogo(logoSvg, 30);
+            var logoObj = new SvgQRCode.SvgLogo(logoSvg, 20, iconEmbedded: false);
 
             var svg = new SvgQRCode(data).GetGraphic(10, Color.DarkGray, Color.White, logo: logoObj);
 
             var result = HelperFunctions.StringToHash(svg);
-            result.ShouldBe("592271ef77406c0074a3005f78130906");
+            result.ShouldBe("bd442ea77d45a41a4f490b8d41591e04");
         }
 
         [Fact]