feat: Connect from an oleobject using COM connection (VB 6, Powerbuil…

…der) To connect from an oleobject from VB 6 or Powerbuilder, we need a constructor without parameters since it is not possible to parameterize it. In addition, COM connections are not compatible with generic collections, throws an exception "function name not found". This can be solved by eliminating the generic collections, since it would not affect the current functionality, and creating a constructor without parameters. Subsequently, the QRCodeData object that is currently assigned in the constructor with parameters, would be added manually with SetQRCodeData function Resolves: #108
codebude · Mar 7, 2018 · 3c91f57 · 3c91f57
1 parent b643a1f
commit 3c91f57
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 52 deletions.
diff --git a/QRCoder/ASCIIQRCode.cs b/QRCoder/ASCIIQRCode.cs
@@ -4,16 +4,21 @@
 
 namespace QRCoder
 {
-    public class AsciiQRCode : AbstractQRCode<string>, IDisposable
+    public class AsciiQRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public AsciiQRCode() { }
+
         public AsciiQRCode(QRCodeData data) : base(data) { }
 
         /// <summary>
         /// Returns a strings that contains the resulting QR code as ASCII chars.
         /// </summary>
         /// <param name="repeatPerModule">Number of repeated darkColorString/whiteSpaceString per module.</param>
         /// <returns></returns>
-        public override string GetGraphic(int repeatPerModule)
+        public string GetGraphic(int repeatPerModule)
         {
             return string.Join("\n", GetLineByLineGraphic(repeatPerModule));
         }
@@ -86,9 +91,5 @@ public string[] GetLineByLineGraphic(int repeatPerModule, string darkColorString
             }
             return qrCode.ToArray();
         }
-        public void Dispose()
-        {
-            this.QrCodeData = null;
-        }
     }
 }
diff --git a/QRCoder/AbstractQRCode.cs b/QRCoder/AbstractQRCode.cs
@@ -1,13 +1,27 @@
 namespace QRCoder
 {
-    public abstract class AbstractQRCode<T>
+    public abstract class AbstractQRCode
     {
         protected QRCodeData QrCodeData { get; set; }
 
+        protected AbstractQRCode() {
+        }
+
         protected AbstractQRCode(QRCodeData data) {
             this.QrCodeData = data;
         }
-
-        public abstract T GetGraphic(int pixelsPerModule);
+
+        /// <summary>
+        /// Set a QRCodeData object that will be used to generate QR code. Used in COM Objects connections
+        /// </summary>
+        /// <param name="data">Need a QRCodeData object generated by QRCodeGenerator.CreateQrCode()</param>
+        virtual public void SetQRCodeData(QRCodeData data) {
+            this.QrCodeData = data;
+        }
+
+        public void Dispose()
+        {
+            this.QrCodeData = null;
+        }
     }
 }
diff --git a/QRCoder/Base64QRCode.cs b/QRCoder/Base64QRCode.cs
@@ -9,15 +9,26 @@
 
 namespace QRCoder
 {
-    public class Base64QRCode : AbstractQRCode<string>, IDisposable
+    public class Base64QRCode : AbstractQRCode, IDisposable
     {
         private QRCode qr;
 
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public Base64QRCode() {
+            qr = new QRCode();
+        }
+
         public Base64QRCode(QRCodeData data) : base(data) {
             qr = new QRCode(data);
         }
+
+        public override void SetQRCodeData(QRCodeData data) {
+            this.qr.SetQRCodeData(data);
+        }
 
-        public override string GetGraphic(int pixelsPerModule)
+        public string GetGraphic(int pixelsPerModule)
         {
             return this.GetGraphic(pixelsPerModule, Color.Black, Color.White, true);
         }

diff --git a/QRCoder/BitmapByteQRCode.cs b/QRCoder/BitmapByteQRCode.cs
@@ -7,11 +7,16 @@ namespace QRCoder
 {
 
     // ReSharper disable once InconsistentNaming
-    public class BitmapByteQRCode : AbstractQRCode<byte[]>, IDisposable
+    public class BitmapByteQRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public BitmapByteQRCode() { }
+
         public BitmapByteQRCode(QRCodeData data) : base(data) { }
 
-        public override byte[] GetGraphic(int pixelsPerModule)
+        public byte[] GetGraphic(int pixelsPerModule)
         {
             return GetGraphic(pixelsPerModule, new byte[] { 0x00, 0x00, 0x00 }, new byte[] { 0xFF, 0xFF, 0xFF });
         }
@@ -91,10 +96,5 @@ private byte[] IntTo4Byte(int inp)
             }
             return bytes;
         }
-
-        public void Dispose()
-        {
-            this.QrCodeData = null;
-        }
     }
 }
diff --git a/QRCoder/PngByteQRCode.cs b/QRCoder/PngByteQRCode.cs
@@ -4,22 +4,22 @@
 
 namespace QRCoder
 {
-    public sealed class PngByteQRCode : AbstractQRCode<byte[]>, IDisposable
+    public sealed class PngByteQRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public PngByteQRCode() { }
+
         public PngByteQRCode(QRCodeData data) : base(data)
         {
         }
 
-        public void Dispose()
-        {
-            this.QrCodeData?.Dispose();
-            this.QrCodeData = null;
-        }
 
         /// <summary>
         /// Creates a black &amp; white PNG of the QR code, using 1-bit grayscale.
         /// </summary>
-        public override byte[] GetGraphic(int pixelsPerModule)
+        public byte[] GetGraphic(int pixelsPerModule)
         {
             using (var png = new PngBuilder())
             {

diff --git a/QRCoder/Properties/AssemblyInfo.cs b/QRCoder/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
 // für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
 // COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(true)]
 
 // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
 [assembly: Guid("e668b98b-83bb-4e60-b33c-4fd5ed9c0156")]

diff --git a/QRCoder/QRCode.cs b/QRCoder/QRCode.cs
@@ -6,11 +6,16 @@ namespace QRCoder
 {
     using System;
 
-    public class QRCode : AbstractQRCode<Bitmap>, IDisposable
+    public class QRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public QRCode() { }
+
         public QRCode(QRCodeData data) : base(data) {}
 
-        public override Bitmap GetGraphic(int pixelsPerModule)
+        public Bitmap GetGraphic(int pixelsPerModule)
         {
             return this.GetGraphic(pixelsPerModule, Color.Black, Color.White, true);
         }
@@ -130,10 +135,5 @@ internal GraphicsPath CreateRoundedRectanglePath(RectangleF rect, int cornerRadi
             roundedRect.CloseFigure();
             return roundedRect;
         }
-
-        public void Dispose()
-        {
-            this.QrCodeData = null;
-        }
     }
 }
diff --git a/QRCoder/SvgQRCode.cs b/QRCoder/SvgQRCode.cs
@@ -4,12 +4,15 @@
 
 namespace QRCoder
 {
-    public class SvgQRCode : AbstractQRCode<string>, IDisposable
+    public class SvgQRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public SvgQRCode() { }
         public SvgQRCode(QRCodeData data) : base(data) { }
-
-
-        public override string GetGraphic(int pixelsPerModule)
+
+        public string GetGraphic(int pixelsPerModule)
         {
             var viewBox = new Size(pixelsPerModule*this.QrCodeData.ModuleMatrix.Count, pixelsPerModule * this.QrCodeData.ModuleMatrix.Count);
             return this.GetGraphic(viewBox, Color.Black, Color.White);
@@ -71,10 +74,5 @@ private string CleanSvgVal(double input)
             //Clean double values for international use/formats
             return input.ToString(System.Globalization.CultureInfo.InvariantCulture);
         }
-
-        public void Dispose()
-        {
-            this.QrCodeData = null;
-        }
     }
 }
diff --git a/QRCoder/UnityQRCode.cs b/QRCoder/UnityQRCode.cs
@@ -3,11 +3,15 @@
 
 namespace QRCoder
 {
-    public class UnityQRCode : AbstractQRCode<Texture2D>
+    public class UnityQRCode : AbstractQRCode
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public UnityQRCode() { }
         public UnityQRCode(QRCodeData data) : base(data) {}
-
-        public override Texture2D GetGraphic(int pixelsPerModule)
+        
+        public Texture2D GetGraphic(int pixelsPerModule)
         {
             return this.GetGraphic(pixelsPerModule, Color.black, Color.white);
         }

diff --git a/QRCoder/XamlQRCode.cs b/QRCoder/XamlQRCode.cs
@@ -4,11 +4,16 @@
 
 namespace QRCoder
 {
-    public class XamlQRCode : AbstractQRCode<DrawingImage>, IDisposable
+    public class XamlQRCode : AbstractQRCode, IDisposable
     {
+        /// <summary>
+        /// Constructor without params to be used in COM Objects connections
+        /// </summary>
+        public XamlQRCode() { }
+
         public XamlQRCode(QRCodeData data) : base(data) { }
 
-        public override DrawingImage GetGraphic(int pixelsPerModule)
+        public DrawingImage GetGraphic(int pixelsPerModule)
         {
             return this.GetGraphic(pixelsPerModule, true);
         }
@@ -61,10 +66,5 @@ public DrawingImage GetGraphic(Size viewBox, Brush darkBrush, Brush lightBrush,
 
             return new DrawingImage(drawing);
         }
-
-        public void Dispose()
-        {
-            this.QrCodeData = null;
-        }
     }
 }