Reduced redundancy in C++ demo programs with 'using' directives.

pull/11/head
Project Nayuki 8 years ago
parent cc2a5d4ce9
commit dafd93dbdf

@ -32,12 +32,15 @@
#include <vector> #include <vector>
#include "QrCode.hpp" #include "QrCode.hpp"
using qrcodegen::QrCode;
using qrcodegen::QrSegment;
// Function prototypes // Function prototypes
static void doBasicDemo(); static void doBasicDemo();
static void doVarietyDemo(); static void doVarietyDemo();
static void doSegmentDemo(); static void doSegmentDemo();
static void printQr(const qrcodegen::QrCode &qr); static void printQr(const QrCode &qr);
@ -53,10 +56,10 @@ int main() {
// Creates a single QR Code, then prints it to the console. // Creates a single QR Code, then prints it to the console.
static void doBasicDemo() { static void doBasicDemo() {
const char *text = "Hello, world!"; // User-supplied text const char *text = "Hello, world!"; // User-supplied text
const qrcodegen::QrCode::Ecc &errCorLvl = qrcodegen::QrCode::Ecc::LOW; // Error correction level const QrCode::Ecc &errCorLvl = QrCode::Ecc::LOW; // Error correction level
// Make and print the QR Code symbol // Make and print the QR Code symbol
const qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(text, errCorLvl); const QrCode qr = QrCode::encodeText(text, errCorLvl);
std::cout << qr.toSvgString(4) << std::endl; std::cout << qr.toSvgString(4) << std::endl;
printQr(qr); printQr(qr);
} }
@ -65,33 +68,33 @@ static void doBasicDemo() {
// Creates a variety of QR Codes that exercise different features of the library, and prints each one to the console. // Creates a variety of QR Codes that exercise different features of the library, and prints each one to the console.
static void doVarietyDemo() { static void doVarietyDemo() {
// Project Nayuki URL // Project Nayuki URL
const qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText("https://www.nayuki.io/", qrcodegen::QrCode::Ecc::HIGH); const QrCode qr0 = QrCode::encodeText("https://www.nayuki.io/", QrCode::Ecc::HIGH);
printQr(qrcodegen::QrCode(qr0, 3)); // Change mask, forcing to mask #3 printQr(QrCode(qr0, 3)); // Change mask, forcing to mask #3
// Numeric mode encoding (3.33 bits per digit) // Numeric mode encoding (3.33 bits per digit)
const qrcodegen::QrCode qr1 = qrcodegen::QrCode::encodeText("314159265358979323846264338327950288419716939937510", qrcodegen::QrCode::Ecc::MEDIUM); const QrCode qr1 = QrCode::encodeText("314159265358979323846264338327950288419716939937510", QrCode::Ecc::MEDIUM);
printQr(qr1); printQr(qr1);
// Alphanumeric mode encoding (5.5 bits per character) // Alphanumeric mode encoding (5.5 bits per character)
const qrcodegen::QrCode qr2 = qrcodegen::QrCode::encodeText("DOLLAR-AMOUNT:$39.87 PERCENTAGE:100.00% OPERATIONS:+-*/", qrcodegen::QrCode::Ecc::HIGH); const QrCode qr2 = QrCode::encodeText("DOLLAR-AMOUNT:$39.87 PERCENTAGE:100.00% OPERATIONS:+-*/", QrCode::Ecc::HIGH);
printQr(qr2); printQr(qr2);
// Unicode text as UTF-8, and different masks // Unicode text as UTF-8, and different masks
const qrcodegen::QrCode qr3 = qrcodegen::QrCode::encodeText("\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1wa\xE3\x80\x81\xE4\xB8\x96\xE7\x95\x8C\xEF\xBC\x81\x20\xCE\xB1\xCE\xB2\xCE\xB3\xCE\xB4", qrcodegen::QrCode::Ecc::QUARTILE); const QrCode qr3 = QrCode::encodeText("\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1wa\xE3\x80\x81\xE4\xB8\x96\xE7\x95\x8C\xEF\xBC\x81\x20\xCE\xB1\xCE\xB2\xCE\xB3\xCE\xB4", QrCode::Ecc::QUARTILE);
printQr(qrcodegen::QrCode(qr3, 0)); printQr(QrCode(qr3, 0));
printQr(qrcodegen::QrCode(qr3, 1)); printQr(QrCode(qr3, 1));
printQr(qrcodegen::QrCode(qr3, 5)); printQr(QrCode(qr3, 5));
printQr(qrcodegen::QrCode(qr3, 7)); printQr(QrCode(qr3, 7));
// Moderately large QR Code using longer text (from Lewis Carroll's Alice in Wonderland) // Moderately large QR Code using longer text (from Lewis Carroll's Alice in Wonderland)
const qrcodegen::QrCode qr4 = qrcodegen::QrCode::encodeText( const QrCode qr4 = QrCode::encodeText(
"Alice was beginning to get very tired of sitting by her sister on the bank, " "Alice was beginning to get very tired of sitting by her sister on the bank, "
"and of having nothing to do: once or twice she had peeped into the book her sister was reading, " "and of having nothing to do: once or twice she had peeped into the book her sister was reading, "
"but it had no pictures or conversations in it, 'and what is the use of a book,' thought Alice " "but it had no pictures or conversations in it, 'and what is the use of a book,' thought Alice "
"'without pictures or conversations?' So she was considering in her own mind (as well as she could, " "'without pictures or conversations?' So she was considering in her own mind (as well as she could, "
"for the hot day made her feel very sleepy and stupid), whether the pleasure of making a " "for the hot day made her feel very sleepy and stupid), whether the pleasure of making a "
"daisy-chain would be worth the trouble of getting up and picking the daisies, when suddenly " "daisy-chain would be worth the trouble of getting up and picking the daisies, when suddenly "
"a White Rabbit with pink eyes ran close by her.", qrcodegen::QrCode::Ecc::HIGH); "a White Rabbit with pink eyes ran close by her.", QrCode::Ecc::HIGH);
printQr(qr4); printQr(qr4);
} }
@ -101,40 +104,40 @@ static void doSegmentDemo() {
// Illustration "silver" // Illustration "silver"
const char *silver0 = "THE SQUARE ROOT OF 2 IS 1."; const char *silver0 = "THE SQUARE ROOT OF 2 IS 1.";
const char *silver1 = "41421356237309504880168872420969807856967187537694807317667973799"; const char *silver1 = "41421356237309504880168872420969807856967187537694807317667973799";
const qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText( const QrCode qr0 = QrCode::encodeText(
(std::string(silver0) + silver1).c_str(), (std::string(silver0) + silver1).c_str(),
qrcodegen::QrCode::Ecc::LOW); QrCode::Ecc::LOW);
printQr(qr0); printQr(qr0);
std::vector<qrcodegen::QrSegment> segs; std::vector<QrSegment> segs;
segs.push_back(qrcodegen::QrSegment::makeAlphanumeric(silver0)); segs.push_back(QrSegment::makeAlphanumeric(silver0));
segs.push_back(qrcodegen::QrSegment::makeNumeric(silver1)); segs.push_back(QrSegment::makeNumeric(silver1));
const qrcodegen::QrCode qr1 = qrcodegen::QrCode::encodeSegments(segs, qrcodegen::QrCode::Ecc::LOW); const QrCode qr1 = QrCode::encodeSegments(segs, QrCode::Ecc::LOW);
printQr(qr1); printQr(qr1);
// Illustration "golden" // Illustration "golden"
const char *golden0 = "Golden ratio \xCF\x86 = 1."; const char *golden0 = "Golden ratio \xCF\x86 = 1.";
const char *golden1 = "6180339887498948482045868343656381177203091798057628621354486227052604628189024497072072041893911374"; const char *golden1 = "6180339887498948482045868343656381177203091798057628621354486227052604628189024497072072041893911374";
const char *golden2 = "......"; const char *golden2 = "......";
const qrcodegen::QrCode qr2 = qrcodegen::QrCode::encodeText( const QrCode qr2 = QrCode::encodeText(
(std::string(golden0) + golden1 + golden2).c_str(), (std::string(golden0) + golden1 + golden2).c_str(),
qrcodegen::QrCode::Ecc::LOW); QrCode::Ecc::LOW);
printQr(qr2); printQr(qr2);
segs.clear(); segs.clear();
std::vector<uint8_t> bytes; std::vector<uint8_t> bytes;
for (const char *temp = golden0; *temp != '\0'; temp++) for (const char *temp = golden0; *temp != '\0'; temp++)
bytes.push_back(static_cast<uint8_t>(*temp)); bytes.push_back(static_cast<uint8_t>(*temp));
segs.push_back(qrcodegen::QrSegment::makeBytes(bytes)); segs.push_back(QrSegment::makeBytes(bytes));
segs.push_back(qrcodegen::QrSegment::makeNumeric(golden1)); segs.push_back(QrSegment::makeNumeric(golden1));
segs.push_back(qrcodegen::QrSegment::makeAlphanumeric(golden2)); segs.push_back(QrSegment::makeAlphanumeric(golden2));
const qrcodegen::QrCode qr3 = qrcodegen::QrCode::encodeSegments(segs, qrcodegen::QrCode::Ecc::LOW); const QrCode qr3 = QrCode::encodeSegments(segs, QrCode::Ecc::LOW);
printQr(qr3); printQr(qr3);
} }
// Prints the given QR Code to the console. // Prints the given QR Code to the console.
static void printQr(const qrcodegen::QrCode &qr) { static void printQr(const QrCode &qr) {
int border = 4; int border = 4;
for (int y = -border; y < qr.size + border; y++) { for (int y = -border; y < qr.size + border; y++) {
for (int x = -border; x < qr.size + border; x++) { for (int x = -border; x < qr.size + border; x++) {

@ -34,12 +34,15 @@
#include <vector> #include <vector>
#include "QrCode.hpp" #include "QrCode.hpp"
using qrcodegen::QrCode;
using qrcodegen::QrSegment;
static const qrcodegen::QrCode::Ecc *(ECC_LEVELS[]) = {
&qrcodegen::QrCode::Ecc::LOW, static const QrCode::Ecc *(ECC_LEVELS[]) = {
&qrcodegen::QrCode::Ecc::MEDIUM, &QrCode::Ecc::LOW,
&qrcodegen::QrCode::Ecc::QUARTILE, &QrCode::Ecc::MEDIUM,
&qrcodegen::QrCode::Ecc::HIGH, &QrCode::Ecc::QUARTILE,
&QrCode::Ecc::HIGH,
}; };
@ -71,19 +74,19 @@ int main() {
std::cin >> boostEcl; std::cin >> boostEcl;
// Make list of segments // Make list of segments
std::vector<qrcodegen::QrSegment> segs; std::vector<QrSegment> segs;
if (isAscii) { if (isAscii) {
std::vector<char> text; std::vector<char> text;
for (std::vector<uint8_t>::iterator it = data.begin(); it != data.end(); ++it) for (std::vector<uint8_t>::iterator it = data.begin(); it != data.end(); ++it)
text.push_back((char)*it); text.push_back((char)*it);
text.push_back('\0'); text.push_back('\0');
segs = qrcodegen::QrSegment::makeSegments(text.data()); segs = QrSegment::makeSegments(text.data());
} else } else
segs.push_back(qrcodegen::QrSegment::makeBytes(data)); segs.push_back(QrSegment::makeBytes(data));
// Try to make QR Code symbol // Try to make QR Code symbol
try { try {
const qrcodegen::QrCode qr = qrcodegen::QrCode::encodeSegments(segs, const QrCode qr = QrCode::encodeSegments(segs,
*ECC_LEVELS[errCorLvl], minVersion, maxVersion, mask, boostEcl == 1); *ECC_LEVELS[errCorLvl], minVersion, maxVersion, mask, boostEcl == 1);
// Print grid of modules // Print grid of modules

Loading…
Cancel
Save