msb-public
/
QR-Code-generator
mirror of https://github.com/nayuki/QR-Code-generator
4
3
Code Issues Projects Releases Wiki Activity

In Java and TypeScript versions, added parameters for custom module colors when rendering to SVG.

Browse Source
pull/118/head
Project Nayuki 3 years ago
parent d8f0074fab
commit 201993945d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File

18
java/src/main/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
Unescape View File

@ -62,9 +62,9 @@ public final class QrCodeGeneratorDemo {
File imgFile = new File("hello-world-QR.png"); // File path for output File imgFile = new File("hello-world-QR.png"); // File path for output
ImageIO.write(img, "png", imgFile); // Write image to file ImageIO.write(img, "png", imgFile); // Write image to file
String svg = toSvgString(qr, 4); // Convert to SVG XML code String svg = toSvgString(qr, 4, "#FFFFFF", "#000000"); // Convert to SVG XML code
File svgFile = new File("hello-world-QR.svg"); // File path for output File svgFile = new File("hello-world-QR.svg"); // File path for output
Files.write(svgFile.toPath(), // Write image to file Files.write(svgFile.toPath(), // Write image to file
svg.getBytes(StandardCharsets.UTF_8)); svg.getBytes(StandardCharsets.UTF_8));
} }
@ -217,12 +217,16 @@ public final class QrCodeGeneratorDemo {
* number of border modules. The string always uses Unix newlines (\n), regardless of the platform. * number of border modules. The string always uses Unix newlines (\n), regardless of the platform.
* @param qr the QR Code to render (not {@code null}) * @param qr the QR Code to render (not {@code null})
* @param border the number of border modules to add, which must be non-negative * @param border the number of border modules to add, which must be non-negative
* @param lightColor the color to use for light modules, in any format supported by CSS, not {@code null}
* @param darkColor the color to use for dark modules, in any format supported by CSS, not {@code null}
* @return a string representing the QR Code as an SVG XML document * @return a string representing the QR Code as an SVG XML document
* @throws NullPointerException if the QR Code is {@code null} * @throws NullPointerException if any object is {@code null}
* @throws IllegalArgumentException if the border is negative * @throws IllegalArgumentException if the border is negative
*/ */
private static String toSvgString(QrCode qr, int border) { private static String toSvgString(QrCode qr, int border, String lightColor, String darkColor) {
Objects.requireNonNull(qr); Objects.requireNonNull(qr);
Objects.requireNonNull(lightColor);
Objects.requireNonNull(darkColor);
if (border < 0) if (border < 0)
throw new IllegalArgumentException("Border must be non-negative"); throw new IllegalArgumentException("Border must be non-negative");
long brd = border; long brd = border;
@ -231,7 +235,7 @@ public final class QrCodeGeneratorDemo {
.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n") .append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n")
.append(String.format("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 %1$d %1$d\" stroke=\"none\">\n", .append(String.format("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 %1$d %1$d\" stroke=\"none\">\n",
qr.size + brd * 2)) qr.size + brd * 2))
.append("\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\"/>\n") .append("\t<rect width=\"100%\" height=\"100%\" fill=\"" + lightColor + "\"/>\n")
.append("\t<path d=\""); .append("\t<path d=\"");
for (int y = 0; y < qr.size; y++) { for (int y = 0; y < qr.size; y++) {
for (int x = 0; x < qr.size; x++) { for (int x = 0; x < qr.size; x++) {
@ -243,7 +247,7 @@ public final class QrCodeGeneratorDemo {
} }
} }
return sb return sb
.append("\" fill=\"#000000\"/>\n") .append("\" fill=\"" + darkColor + "\"/>\n")
.append("</svg>\n") .append("</svg>\n")
.toString(); .toString();
} }

8
typescript-javascript/qrcodegen-input-demo.ts
Unescape View File

@ -95,7 +95,7 @@ namespace app {
drawCanvas(qr, scale, border, "#FFFFFF", "#000000", canvas); drawCanvas(qr, scale, border, "#FFFFFF", "#000000", canvas);
canvas.style.removeProperty("display"); canvas.style.removeProperty("display");
} else { } else {
const code: string = toSvgString(qr, border); const code: string = toSvgString(qr, border, "#FFFFFF", "#000000");
const viewBox: string = (/ viewBox="([^"]*)"/.exec(code) as RegExpExecArray)[1]; const viewBox: string = (/ viewBox="([^"]*)"/.exec(code) as RegExpExecArray)[1];
const pathD: string = (/ d="([^"]*)"/.exec(code) as RegExpExecArray)[1]; const pathD: string = (/ d="([^"]*)"/.exec(code) as RegExpExecArray)[1];
svg.setAttribute("viewBox", viewBox); svg.setAttribute("viewBox", viewBox);
@ -170,7 +170,7 @@ namespace app {
// Returns a string of SVG code for an image depicting the given QR Code, with the given number // Returns a string of SVG code for an image depicting the given QR Code, with the given number
// of border modules. The string always uses Unix newlines (\n), regardless of the platform. // of border modules. The string always uses Unix newlines (\n), regardless of the platform.
function toSvgString(qr: qrcodegen.QrCode, border: number): string { function toSvgString(qr: qrcodegen.QrCode, border: number, lightColor: string, darkColor: string): string {
if (border < 0) if (border < 0)
throw "Border must be non-negative"; throw "Border must be non-negative";
let parts: Array<string> = []; let parts: Array<string> = [];
@ -183,8 +183,8 @@ namespace app {
return `<?xml version="1.0" encoding="UTF-8"?> return `<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 ${qr.size + border * 2} ${qr.size + border * 2}" stroke="none"> <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 ${qr.size + border * 2} ${qr.size + border * 2}" stroke="none">
<rect width="100%" height="100%" fill="#FFFFFF"/> <rect width="100%" height="100%" fill="${lightColor}"/>
<path d="${parts.join(" ")}" fill="#000000"/> <path d="${parts.join(" ")}" fill="${darkColor}"/>
</svg> </svg>
` `
} }

Write Preview
Loading…
Cancel
Save