diff --git a/BarcodeXlsx.sln b/BarcodeXlsx.sln
index 6b9f92b..9db1a71 100644
--- a/BarcodeXlsx.sln
+++ b/BarcodeXlsx.sln
@@ -1,15 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.202
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BarcodeXlsx", "BarcodeXlsx\BarcodeXlsx.csproj", "{0B304859-4BAD-4587-A83A-B9EC64193680}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "barcode", "barcode\barcode.csproj", "{93B3605C-AE72-4A18-80E7-9510DC99A07E}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{B551F263-1950-4082-AD39-C6581B79AD28}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "barcode3", "barcode3\barcode3.csproj", "{180FBE5B-2933-477C-88F9-574B84E5067F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "barcode3", "barcode3\barcode3.csproj", "{180FBE5B-2933-477C-88F9-574B84E5067F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,18 +31,6 @@
{0B304859-4BAD-4587-A83A-B9EC64193680}.Release|x64.Build.0 = Release|Any CPU
{0B304859-4BAD-4587-A83A-B9EC64193680}.Release|x86.ActiveCfg = Release|Any CPU
{0B304859-4BAD-4587-A83A-B9EC64193680}.Release|x86.Build.0 = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|x64.Build.0 = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Debug|x86.Build.0 = Debug|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|Any CPU.Build.0 = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|x64.ActiveCfg = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|x64.Build.0 = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|x86.ActiveCfg = Release|Any CPU
- {93B3605C-AE72-4A18-80E7-9510DC99A07E}.Release|x86.Build.0 = Release|Any CPU
{B551F263-1950-4082-AD39-C6581B79AD28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B551F263-1950-4082-AD39-C6581B79AD28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B551F263-1950-4082-AD39-C6581B79AD28}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/BarcodeXlsx/BarcodeXlsx.csproj b/BarcodeXlsx/BarcodeXlsx.csproj
index e192604..b8385a0 100644
--- a/BarcodeXlsx/BarcodeXlsx.csproj
+++ b/BarcodeXlsx/BarcodeXlsx.csproj
@@ -9,9 +9,9 @@
-
-
-
+
+
+
diff --git a/BarcodeXlsx/Program.cs b/BarcodeXlsx/Program.cs
index 7366da4..c5c9e42 100644
--- a/BarcodeXlsx/Program.cs
+++ b/BarcodeXlsx/Program.cs
@@ -55,180 +55,5 @@
Console.Error.WriteLine("{0}", exp.Message);
}
}
-
- ///
- /// Decode barcode style name to enum value
- ///
- ///
- ///
- static BarcodeLib.TYPE DecodeBarcodeStyle(string barcodeStyle)
- {
- BarcodeLib.TYPE barcodeType = BarcodeLib.TYPE.CODE128;
- switch (barcodeStyle.ToUpper())
- {
- case "UNSPECIFIED":
- barcodeType = BarcodeLib.TYPE.UNSPECIFIED;
- break;
-
- case "UPCA":
- barcodeType = BarcodeLib.TYPE.UPCA;
- break;
-
- case "UPCE":
- barcodeType = BarcodeLib.TYPE.UPCE;
- break;
-
- case "UPC_SUPPLEMENTAL_2DIGIT":
- barcodeType = BarcodeLib.TYPE.UPC_SUPPLEMENTAL_2DIGIT;
- break;
-
- case "UPC_SUPPLEMENTAL_5DIGIT":
- barcodeType = BarcodeLib.TYPE.UPC_SUPPLEMENTAL_5DIGIT;
- break;
-
- case "EAN13":
- barcodeType = BarcodeLib.TYPE.EAN13;
- break;
-
- case "EAN8":
- barcodeType = BarcodeLib.TYPE.EAN8;
- break;
-
- case "Interleaved2of5":
- barcodeType = BarcodeLib.TYPE.Interleaved2of5;
- break;
-
- case "Interleaved2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Interleaved2of5_Mod10;
- break;
-
- case "Standard2of5":
- barcodeType = BarcodeLib.TYPE.Standard2of5;
- break;
-
- case "Standard2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Standard2of5_Mod10;
- break;
-
- case "Industrial2of5":
- barcodeType = BarcodeLib.TYPE.Industrial2of5;
- break;
-
- case "Industrial2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Industrial2of5_Mod10;
- break;
-
- case "CODE39":
- barcodeType = BarcodeLib.TYPE.CODE39;
- break;
-
- case "CODE39Extended":
- barcodeType = BarcodeLib.TYPE.CODE39Extended;
- break;
-
- case "CODE39_Mod43":
- barcodeType = BarcodeLib.TYPE.CODE39_Mod43;
- break;
-
- case "Codabar":
- barcodeType = BarcodeLib.TYPE.Codabar;
- break;
-
- case "PostNet":
- barcodeType = BarcodeLib.TYPE.PostNet;
- break;
-
- case "BOOKLAND":
- barcodeType = BarcodeLib.TYPE.BOOKLAND;
- break;
-
- case "ISBN":
- barcodeType = BarcodeLib.TYPE.ISBN;
- break;
-
- case "JAN13":
- barcodeType = BarcodeLib.TYPE.JAN13;
- break;
-
- case "MSI_Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_Mod10;
- break;
-
- case "MSI_2Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_2Mod10;
- break;
-
- case "MSI_Mod11":
- barcodeType = BarcodeLib.TYPE.MSI_Mod11;
- break;
-
- case "MSI_Mod11_Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_Mod11_Mod10;
- break;
-
- case "Modified_Plessey":
- barcodeType = BarcodeLib.TYPE.Modified_Plessey;
- break;
-
- case "CODE11":
- barcodeType = BarcodeLib.TYPE.CODE11;
- break;
-
- case "USD8":
- barcodeType = BarcodeLib.TYPE.USD8;
- break;
-
- case "UCC12":
- barcodeType = BarcodeLib.TYPE.UCC12;
- break;
-
- case "UCC13":
- barcodeType = BarcodeLib.TYPE.UCC13;
- break;
-
- case "LOGMARS":
- barcodeType = BarcodeLib.TYPE.LOGMARS;
- break;
-
- case "CODE128":
- barcodeType = BarcodeLib.TYPE.CODE128;
- break;
-
- case "CODE128A":
- barcodeType = BarcodeLib.TYPE.CODE128A;
- break;
-
- case "CODE128B":
- barcodeType = BarcodeLib.TYPE.CODE128B;
- break;
-
- case "CODE128C":
- barcodeType = BarcodeLib.TYPE.CODE128C;
- break;
-
- case "ITF14":
- barcodeType = BarcodeLib.TYPE.ITF14;
- break;
-
- case "CODE93":
- barcodeType = BarcodeLib.TYPE.CODE93;
- break;
-
- case "TELEPEN":
- barcodeType = BarcodeLib.TYPE.TELEPEN;
- break;
-
- case "FIM":
- barcodeType = BarcodeLib.TYPE.FIM;
- break;
-
- case "PHARMACODE":
- barcodeType = BarcodeLib.TYPE.PHARMACODE;
- break;
-
- }
-
- return barcodeType;
- }
}
}
diff --git a/Common/BarcodeXlsxImporter.cs b/Common/BarcodeXlsxImporter.cs
index 9916abb..c4964ed 100644
--- a/Common/BarcodeXlsxImporter.cs
+++ b/Common/BarcodeXlsxImporter.cs
@@ -10,6 +10,9 @@
using ImageMagick;
+using BarcodeStandard;
+using SkiaSharp;
+
namespace Common
{
public class BarcodeXlsxImporter
@@ -31,21 +34,21 @@
}
public void Convert(string sourceFileName)
{
- XLWorkbook book = new XLWorkbook(sourceFileName);
+ XLWorkbook book = new (sourceFileName);
Convert(book);
book.Save();
}
public void Convert(string sourceFileName, string destFileName)
{
- XLWorkbook book = new XLWorkbook(sourceFileName);
+ XLWorkbook book = new (sourceFileName);
Convert(book);
book.SaveAs(destFileName);
}
public void Convert(Stream inputStream, Stream outputStream)
{
- XLWorkbook book = new XLWorkbook(inputStream);
+ XLWorkbook book = new (inputStream);
Convert(book);
book.SaveAs(outputStream);
}
@@ -59,7 +62,7 @@
string cellValue = cell.GetString();
if (cellValue.Length > preChars.Length + postChars.Length)
{
- string preChars = cellValue.Substring(0, this.preChars.Length);
+ string preChars = cellValue[0..this.preChars.Length];
string postChears = cellValue.Substring(cellValue.Length - this.postChars.Length);
if (preChars == this.preChars && postChears == this.postChars)
@@ -73,19 +76,19 @@
try
{
- BarcodeLib.Barcode barcode = new BarcodeLib.Barcode();
+
+ BarcodeStandard.Barcode barcode = new BarcodeStandard.Barcode();
barcode.Height = imageHeight - marginHeight * 2;
barcode.Width = imageWidth - marginWidth * 2;
- barcode.Alignment = BarcodeLib.AlignmentPositions.CENTER;
+ barcode.Alignment = BarcodeStandard.AlignmentPositions.Center;
barcode.IncludeLabel = enabledLabel;
- barcode.LabelPosition = BarcodeLib.LabelPositions.BOTTOMCENTER;
- barcode.LabelFont = new Font(FontFamily.GenericSansSerif, 8);
- barcode.BackColor = Color.White;
- barcode.ImageFormat = ImageFormat.Bmp;
+ barcode.LabelFont = new SKFont(SKTypeface.Default, 8);
+ barcode.BackColor = SKColors.White;
+ barcode.ImageFormat = SKEncodedImageFormat.Bmp;
barcode.Encode(DecodeBarcodeStyle(barcodeType), barcodeValue);
MemoryStream tempStream1 = new MemoryStream();
- barcode.EncodedImage.Save(tempStream1, ImageFormat.Png);
+ barcode.SaveImage(tempStream1, SaveTypes.Png);
tempStream1.Position = 0;
MagickImage image = new MagickImage(tempStream1);
@@ -122,169 +125,169 @@
///
///
///
- public BarcodeLib.TYPE DecodeBarcodeStyle(string barcodeStyle)
+ public BarcodeStandard.Type DecodeBarcodeStyle(string barcodeStyle)
{
- BarcodeLib.TYPE barcodeType = BarcodeLib.TYPE.CODE128;
+ BarcodeStandard.Type barcodeType = BarcodeStandard.Type.Code128;
switch (barcodeStyle.ToUpper())
{
case "UNSPECIFIED":
- barcodeType = BarcodeLib.TYPE.UNSPECIFIED;
+ barcodeType = BarcodeStandard.Type.Unspecified;
break;
case "UPCA":
- barcodeType = BarcodeLib.TYPE.UPCA;
+ barcodeType = BarcodeStandard.Type.UpcA;
break;
case "UPCE":
- barcodeType = BarcodeLib.TYPE.UPCE;
+ barcodeType = BarcodeStandard.Type.UpcE;
break;
case "UPC_SUPPLEMENTAL_2DIGIT":
- barcodeType = BarcodeLib.TYPE.UPC_SUPPLEMENTAL_2DIGIT;
+ barcodeType = BarcodeStandard.Type.UpcSupplemental2Digit;
break;
case "UPC_SUPPLEMENTAL_5DIGIT":
- barcodeType = BarcodeLib.TYPE.UPC_SUPPLEMENTAL_5DIGIT;
+ barcodeType = BarcodeStandard.Type.UpcSupplemental5Digit;
break;
case "EAN13":
- barcodeType = BarcodeLib.TYPE.EAN13;
+ barcodeType = BarcodeStandard.Type.Ean13;
break;
case "EAN8":
- barcodeType = BarcodeLib.TYPE.EAN8;
+ barcodeType = BarcodeStandard.Type.Ean8;
break;
case "Interleaved2of5":
- barcodeType = BarcodeLib.TYPE.Interleaved2of5;
+ barcodeType = BarcodeStandard.Type.Interleaved2Of5;
break;
case "Interleaved2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Interleaved2of5_Mod10;
+ barcodeType = BarcodeStandard.Type.Interleaved2Of5Mod10;
break;
case "Standard2of5":
- barcodeType = BarcodeLib.TYPE.Standard2of5;
+ barcodeType = BarcodeStandard.Type.Standard2Of5;
break;
case "Standard2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Standard2of5_Mod10;
+ barcodeType = BarcodeStandard.Type.Standard2Of5Mod10;
break;
case "Industrial2of5":
- barcodeType = BarcodeLib.TYPE.Industrial2of5;
+ barcodeType = BarcodeStandard.Type.Industrial2Of5;
break;
case "Industrial2of5_Mod10":
- barcodeType = BarcodeLib.TYPE.Industrial2of5_Mod10;
+ barcodeType = BarcodeStandard.Type.Industrial2Of5Mod10;
break;
case "CODE39":
- barcodeType = BarcodeLib.TYPE.CODE39;
+ barcodeType = BarcodeStandard.Type.Code39;
break;
case "CODE39Extended":
- barcodeType = BarcodeLib.TYPE.CODE39Extended;
+ barcodeType = BarcodeStandard.Type.Code39Extended;
break;
case "CODE39_Mod43":
- barcodeType = BarcodeLib.TYPE.CODE39_Mod43;
+ barcodeType = BarcodeStandard.Type.Code39Mod43;
break;
case "Codabar":
- barcodeType = BarcodeLib.TYPE.Codabar;
+ barcodeType = BarcodeStandard.Type.Codabar;
break;
case "PostNet":
- barcodeType = BarcodeLib.TYPE.PostNet;
+ barcodeType = BarcodeStandard.Type.PostNet;
break;
case "BOOKLAND":
- barcodeType = BarcodeLib.TYPE.BOOKLAND;
+ barcodeType = BarcodeStandard.Type.Bookland;
break;
case "ISBN":
- barcodeType = BarcodeLib.TYPE.ISBN;
+ barcodeType = BarcodeStandard.Type.Isbn;
break;
case "JAN13":
- barcodeType = BarcodeLib.TYPE.JAN13;
+ barcodeType = BarcodeStandard.Type.Jan13;
break;
case "MSI_Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_Mod10;
+ barcodeType = BarcodeStandard.Type.MsiMod10;
break;
case "MSI_2Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_2Mod10;
+ barcodeType = BarcodeStandard.Type.Msi2Mod10;
break;
case "MSI_Mod11":
- barcodeType = BarcodeLib.TYPE.MSI_Mod11;
+ barcodeType = BarcodeStandard.Type.MsiMod11;
break;
case "MSI_Mod11_Mod10":
- barcodeType = BarcodeLib.TYPE.MSI_Mod11_Mod10;
+ barcodeType = BarcodeStandard.Type.MsiMod11Mod10;
break;
case "Modified_Plessey":
- barcodeType = BarcodeLib.TYPE.Modified_Plessey;
+ barcodeType = BarcodeStandard.Type.ModifiedPlessey;
break;
case "CODE11":
- barcodeType = BarcodeLib.TYPE.CODE11;
+ barcodeType = BarcodeStandard.Type.Code11;
break;
case "USD8":
- barcodeType = BarcodeLib.TYPE.USD8;
+ barcodeType = BarcodeStandard.Type.Usd8;
break;
case "UCC12":
- barcodeType = BarcodeLib.TYPE.UCC12;
+ barcodeType = BarcodeStandard.Type.Ucc12;
break;
case "UCC13":
- barcodeType = BarcodeLib.TYPE.UCC13;
+ barcodeType = BarcodeStandard.Type.Ucc13;
break;
case "LOGMARS":
- barcodeType = BarcodeLib.TYPE.LOGMARS;
+ barcodeType = BarcodeStandard.Type.Logmars;
break;
case "CODE128":
- barcodeType = BarcodeLib.TYPE.CODE128;
+ barcodeType = BarcodeStandard.Type.Code128;
break;
case "CODE128A":
- barcodeType = BarcodeLib.TYPE.CODE128A;
+ barcodeType = BarcodeStandard.Type.Code128A;
break;
case "CODE128B":
- barcodeType = BarcodeLib.TYPE.CODE128B;
+ barcodeType = BarcodeStandard.Type.Code128B;
break;
case "CODE128C":
- barcodeType = BarcodeLib.TYPE.CODE128C;
+ barcodeType = BarcodeStandard.Type.Code128C;
break;
case "ITF14":
- barcodeType = BarcodeLib.TYPE.ITF14;
+ barcodeType = BarcodeStandard.Type.Itf14;
break;
case "CODE93":
- barcodeType = BarcodeLib.TYPE.CODE93;
+ barcodeType = BarcodeStandard.Type.Code93;
break;
case "TELEPEN":
- barcodeType = BarcodeLib.TYPE.TELEPEN;
+ barcodeType = BarcodeStandard.Type.Telepen;
break;
case "FIM":
- barcodeType = BarcodeLib.TYPE.FIM;
+ barcodeType = BarcodeStandard.Type.Fim;
break;
case "PHARMACODE":
- barcodeType = BarcodeLib.TYPE.PHARMACODE;
+ barcodeType = BarcodeStandard.Type.Pharmacode;
break;
}
diff --git a/Common/Common.csproj b/Common/Common.csproj
index 150d6a1..202cca2 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -5,9 +5,9 @@
-
-
-
+
+
+
diff --git a/barcode/barcode.csproj b/barcode/barcode.csproj
index b5f2efd..8ca7b37 100644
--- a/barcode/barcode.csproj
+++ b/barcode/barcode.csproj
@@ -9,13 +9,13 @@
-
-
-
+
+
+
-
-
+
+