jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: document template QR Code image extensions

Browse Source
This commit is contained in:
Gary Sharp
2023-10-12 15:51:33 +11:00
parent 7353405b16
commit a3fb09440d
17 changed files with 299 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Documents/AttachmentImport/ImportPage.cs
+31 -7
View File
@@ -113,18 +113,42 @@ namespace Disco.Services.Documents.AttachmentImport
{
var qrReader = new QRCodeMultiReader();
var qrReaderHints = new Dictionary<DecodeHintType, object>() {
{ DecodeHintType.TRY_HARDER, true }
};
var qrImageSource = new BitmapLuminanceSource((Bitmap)Image);
var qrBinarizer = new HybridBinarizer(qrImageSource);
var qrBinaryBitmap = new BinaryBitmap(qrBinarizer);
Result DetectDocumentUniqueIdentifier(BinaryBitmap bitmap)
{
var qrReaderHints = new Dictionary<DecodeHintType, object>() {
{ DecodeHintType.TRY_HARDER, true }
};
var qrCodeResults = qrReader.decodeMultiple(bitmap, qrReaderHints);
if (qrCodeResults != null && qrCodeResults.Length > 0)
{
if (qrCodeResults.Length > 1)
{
// multiple qr codes on page, test for byte-mark
foreach (var qr in qrCodeResults)
{
if (qr.ResultMetadata.TryGetValue(ResultMetadataType.BYTE_SEGMENTS, out var byteSegments))
{
var qrBytes = ((List<byte[]>)byteSegments)[0];
if (DocumentUniqueIdentifier.IsDocumentUniqueIdentifier(qrBytes))
return qr;
}
}
}
return qrCodeResults[0];
}
return null;
}
try
{
qrCodeResult = qrReader.decodeMultiple(qrBinaryBitmap, qrReaderHints)?.FirstOrDefault();
qrCodeResult = DetectDocumentUniqueIdentifier(qrBinaryBitmap);
qrCodeResultScale = 1F;
}
catch (ReaderException)
@@ -148,7 +172,7 @@ namespace Disco.Services.Documents.AttachmentImport
try
{
qrCodeResult = qrReader.decodeMultiple(qrBinaryBitmap, qrReaderHints)?.FirstOrDefault();
qrCodeResult = DetectDocumentUniqueIdentifier(qrBinaryBitmap);
qrCodeResultScale = 1.75F;
}
catch (ReaderException)
@@ -171,7 +195,7 @@ namespace Disco.Services.Documents.AttachmentImport
try
{
qrCodeResult = qrReader.decodeMultiple(qrBinaryBitmap, qrReaderHints)?.FirstOrDefault();
qrCodeResult = DetectDocumentUniqueIdentifier(qrBinaryBitmap);
qrCodeResultScale = 2F;
}
catch (ReaderException)
Disco.Services/Documents/QRCodeBinaryEncoder.cs
+33 -14
View File
@@ -8,8 +8,24 @@ namespace Disco.Services.Documents
{
public static class QRCodeBinaryEncoder
{
public static byte[] Encode(string content, ErrorCorrectionLevel ecLevel, out int width, out int height)
{
var code = Encoder.encode(content, ecLevel, null);
public static byte[] Encode(byte[] Content, int Width, int Height)
var array = code.Matrix.Array;
width = code.Matrix.Width;
height = code.Matrix.Height;
return scaleMatrix(code.Matrix.Array, width, height);
}
public static byte[] Encode(string content, ErrorCorrectionLevel ecLevel, int width, int height)
{
var code = Encoder.encode(content, ecLevel, null);
return scaleMatrix(code.Matrix.Array, width, height);
}
public static byte[] Encode(byte[] content, out int width, out int height)
{
var ecLevel = ErrorCorrectionLevel.L;
var bits = new BitArray();
@@ -17,7 +33,7 @@ namespace Disco.Services.Documents
var mode = Mode.BYTE;
var bitsNeeded = 4 +
mode.getCharacterCountBits(ZXing.QrCode.Internal.Version.getVersionForNumber(1)) +
(Content.Length * 8);
(content.Length * 8);
var version = ChooseVersion(bitsNeeded, out ecLevel);
var ecBlocks = version.getECBlocksForLevel(ecLevel);
@@ -28,12 +44,12 @@ namespace Disco.Services.Documents
bits.appendBits(mode.Bits, 4);
// Write the number of bytes
bits.appendBits(Content.Length, mode.getCharacterCountBits(version));
bits.appendBits(content.Length, mode.getCharacterCountBits(version));
// Write the bytes
for (int i = 0; i < Content.Length; i++)
for (int i = 0; i < content.Length; i++)
{
bits.appendBits(Content[i], 8);
bits.appendBits(content[i], 8);
}
// Terminate the bit stream
@@ -72,7 +88,10 @@ namespace Disco.Services.Documents
MatrixUtil.buildMatrix(finalBits, ecLevel, version, maskPattern, matrix);
// Render matrix to bytes
return scaleMatrix(matrix.Array, Width, Height);
width = matrix.Width;
height = matrix.Height;
return scaleMatrix(matrix.Array, width, height);
//return FlattenMatrix(matrix.Array, width, height);
}
private static ZXing.QrCode.Internal.Version ChooseVersion(int RequiredBits, out ErrorCorrectionLevel ECLevel)
@@ -242,17 +261,17 @@ namespace Disco.Services.Documents
return bestMaskPattern;
}
private static byte[] scaleMatrix(byte[][] matrix, int Width, int Height)
private static byte[] scaleMatrix(byte[][] matrix, int width, int height)
{
var matrixWidth = matrix[0].Length;
var matrixHeight = matrix.Length;
Width = Math.Max(Width, matrixWidth);
Height = Math.Max(Height, matrixHeight);
var byteColumns = (Width + 7) / 8;
var outputBytes = new byte[byteColumns * Height];
var scale = Math.Min(Width / (matrixWidth + 1), Height / (matrixHeight + 1));
var offsetX = (Width - (matrixWidth * scale)) / 2;
var offsetY = (Height - (matrixHeight * scale)) / 2;
width = Math.Max(width, matrixWidth);
height = Math.Max(height, matrixHeight);
var byteColumns = (width + 7) / 8;
var outputBytes = new byte[byteColumns * height];
var scale = Math.Max(1, Math.Min(width / (matrixWidth + 1), height / (matrixHeight + 1)));
var offsetX = (width - (matrixWidth * scale)) / 2;
var offsetY = (height - (matrixHeight * scale)) / 2;
// initialize output bytes
for (int i = 0; i < outputBytes.Length; i++)
{