Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Perf: Change InvertDraw to skia xor blending #193

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Perf: Change InvertDraw to skia xor blending #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 91 additions & 17 deletions src/BinaryKits.Zpl.Viewer.UnitTest/DrawerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using ZXing;
using ZXing.Datamatrix;


namespace BinaryKits.Zpl.Viewer.UnitTest
{
Expand Down Expand Up @@ -40,17 +39,7 @@ public void FontAssignment()
return SKTypeface.Default;
}
};
IPrinterStorage printerStorage = new PrinterStorage();
var drawer = new ZplElementDrawer(printerStorage, drawOptions);

var analyzer = new ZplAnalyzer(printerStorage);
var analyzeInfo = analyzer.Analyze(zplString);

foreach (var labelInfo in analyzeInfo.LabelInfos)
{
var imageData = drawer.Draw(labelInfo.ZplElements, 300, 300, 8);
File.WriteAllBytes("test.png", imageData);
}
DefaultPrint(zplString, "font-assign.png", 300, 300, 8, drawOptions);
}

[TestMethod]
Expand Down Expand Up @@ -79,16 +68,101 @@ public void FormatHandling()
^PQ1,0,1,N
^XZ
^FX";
DefaultPrint(zplString, "merge-test.png", 100, 100, 8);
}
[TestMethod]
public void InvertColor()
{
// Example in ZPL manual
string test1 = @"
^XA
^FO10,100
^GB70,70,70,,3^FS
^FO110,100
^GB70,70,70,,3^FS
^FO210,100
^GB70,70,70,,3^FS
^FO310,100
^GB70,70,70,,3^FS
^FO17,110
^CF0,70,93
^FR
^FDREVERSE^FS
^XZ
";
// from https://github.com/BinaryKits/BinaryKits.Zpl/pull/64
string test2 = @"
^XA
^FR
^FO50,50
^GB100,100,10,W,5^FS
^FR
^FO200,50
^GB100,100,10,W,5^FS
^FO100,120
^GB30,25,10,B,2^FS
^FO250,120
^GB30,25,10,B,2^FS
^FO130,180
^GB90,90,45,B,8^FS
^FR
^FO75,300
^GB30,20,10,W,0^FS
^FR
^FO265,300
^GB30,20,10,W,0^FS
^FR
^FO105,320
^GB160,20,10,W,0^FS
^FR
^FO120,310
^GB10,20,5,B,0^FS
^FR
^FO140,310
^GB10,20,5,B,0^FS
^FR
^FO160,310
^GB10,20,5,B,0^FS
^FR
^FO180,310
^GB10,20,5,B,0^FS
^FR
^FO200,310
^GB10,20,5,B,0^FS
^FR
^FO220,310
^GB10,20,5,B,0^FS
^FR
^FO240,310
^GB10,20,5,B,0^FS
^FO150,330
^GB70,90,45,B,0^FS
^XZ
";
DefaultPrint(test1, "inverted1.png", 100, 100, 8);
DefaultPrint(test2, "inverted2.png");
}

/// <summary>
/// Generic printer to test zpl -> png output
/// </summary>
/// <param name="zpl"></param>
/// <param name="outputFilename">PNG filename ex: "file.png"</param>
/// <param name="width"></param>
/// <param name="height"></param>
/// <param name="ppmm"></param>
/// <param name="options"></param>
private void DefaultPrint(string zpl, string outputFilename, double width=101.6, double height=152.4, int ppmm=8, DrawerOptions options=null) {
IPrinterStorage printerStorage = new PrinterStorage();
var drawer = new ZplElementDrawer(printerStorage);
var drawer = new ZplElementDrawer(printerStorage, options);

var analyzer = new ZplAnalyzer(printerStorage);
var analyzeInfo = analyzer.Analyze(zplString);
var analyzeInfo = analyzer.Analyze(zpl);

foreach (var labelInfo in analyzeInfo.LabelInfos)
{
var imageData = drawer.Draw(labelInfo.ZplElements, 300, 300, 8);
File.WriteAllBytes("merge-test.png", imageData);
var imageData = drawer.Draw(labelInfo.ZplElements, width, height, ppmm);
File.WriteAllBytes(outputFilename, imageData);
}
}
}
Expand Down
35 changes: 5 additions & 30 deletions src/BinaryKits.Zpl.Viewer/ZplElementDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public byte[] Draw(

drawer.Draw(element, _drawerOptions);

this.InvertDraw(skBitmap, skBitmapInvert);
this.InvertDraw(skCanvas, skBitmapInvert);
continue;
}

Expand Down Expand Up @@ -124,37 +124,12 @@ public byte[] Draw(
return data.ToArray();
}

private void InvertDraw(SKBitmap skBitmap, SKBitmap skBitmapInvert)
private void InvertDraw(SKCanvas baseCanvas, SKBitmap bmToInvert)
{
// Fast local copy
var originalBytes = skBitmap.GetPixelSpan();
var invertBytes = skBitmapInvert.GetPixelSpan();

int total = originalBytes.Length / 4;
for (int i = 0; i < total; i++)
using (SKPaint paint = new SKPaint())
{
// RGBA8888
int rLoc = (i << 2);
int gLoc = (i << 2) + 1;
int bLoc = (i << 2) + 2;
int aLoc = (i << 2) + 3;
if (invertBytes[aLoc] == 0)
{
continue;
}

// Set color
byte rByte = (byte)(originalBytes[rLoc] ^ invertBytes[rLoc]);
byte gByte = (byte)(originalBytes[gLoc] ^ invertBytes[gLoc]);
byte bByte = (byte)(originalBytes[bLoc] ^ invertBytes[bLoc]);
byte aByte = (byte)(originalBytes[aLoc] ^ invertBytes[aLoc]);

var targetColor = new SKColor(rByte, gByte, bByte, aByte);

int x, y;
y = Math.DivRem(i, skBitmapInvert.Width, out x);

skBitmap.SetPixel(x, y, targetColor);
paint.BlendMode = SKBlendMode.Xor;
baseCanvas.DrawBitmap(bmToInvert, 0, 0, paint);
}
}
}
Expand Down
Loading