From 0c7c830d5ba5bc47e3d221dbd9a7920ef5d0f878 Mon Sep 17 00:00:00 2001
From: Michael Ochmann <michael.ochmann@propeller.de>
Date: Thu, 23 Feb 2023 10:00:38 +0100
Subject: [PATCH] minor cleanup

---
 src/QR.cpp                              | 22 +++++++++++-----------
 src/QR.hpp                              |  1 +
 src/{ => renderers}/ConsoleRenderer.hpp |  0
 src/{ => renderers}/PNGRenderer.hpp     |  0
 src/{ => renderers}/PixelRenderer.hpp   |  0
 src/{ => renderers}/SVGRenderer.hpp     |  0
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename src/{ => renderers}/ConsoleRenderer.hpp (100%)
 rename src/{ => renderers}/PNGRenderer.hpp (100%)
 rename src/{ => renderers}/PixelRenderer.hpp (100%)
 rename src/{ => renderers}/SVGRenderer.hpp (100%)

diff --git a/src/QR.cpp b/src/QR.cpp
index cee692b..d41483d 100644
--- a/src/QR.cpp
+++ b/src/QR.cpp
@@ -1,11 +1,11 @@
-
 #include <iostream>
 #include <vector>
-#include "qrcodegen.hpp"
+
 #include "QR.hpp"
-#include "ConsoleRenderer.hpp"
-#include "PNGRenderer.hpp"
-#include "SVGRenderer.hpp"
+#include "qrcodegen.hpp"
+#include "renderers/ConsoleRenderer.hpp"
+#include "renderers/PNGRenderer.hpp"
+#include "renderers/SVGRenderer.hpp"
 
 namespace massivedynamic {
 
@@ -29,14 +29,14 @@ QR::QR(const std::string& data, std::string outputFile, size_t size, Type type,
 	qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(data.c_str(), errorCorrectionLevel);
 	
 	this->renderers.insert({Format::CONSOLE, std::make_unique<ConsoleRenderer>(this->pixels, qr.getSize(), size)});
-	this->renderers.insert({Format::PNG, std::make_unique<PNGRenderer>(this->pixels, qr.getSize(), size)});
-	this->renderers.insert({Format::SVG, std::make_unique<SVGRenderer>(this->pixels, qr.getSize(), size)});
+	this->renderers.insert({Format::PNG,     std::make_unique<PNGRenderer>(this->pixels, qr.getSize(), size)});
+	this->renderers.insert({Format::SVG,     std::make_unique<SVGRenderer>(this->pixels, qr.getSize(), size)});
 
+	// this is inherently stupid, but "qrcodegen" does not give access to the
+	// `segments` vector
 	for (int y = 0; y < qr.getSize(); y++) {
-		for (int x = 0; x < qr.getSize(); x++) {
-			bool isFilled = qr.getModule(x, y);
-			this->pixels.push_back(isFilled ? true : false);
-		}
+		for (int x = 0; x < qr.getSize(); x++)
+			this->pixels.push_back(qr.getModule(x, y));
 	}
 
 	this->renderers.at(format)->render(this->outputFile);
diff --git a/src/QR.hpp b/src/QR.hpp
index 98cb31a..ca8694a 100644
--- a/src/QR.hpp
+++ b/src/QR.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <memory>
 #include <unordered_map>
+
 #include "qrcodegen.hpp"
 #include "Renderer.hpp"
 
diff --git a/src/ConsoleRenderer.hpp b/src/renderers/ConsoleRenderer.hpp
similarity index 100%
rename from src/ConsoleRenderer.hpp
rename to src/renderers/ConsoleRenderer.hpp
diff --git a/src/PNGRenderer.hpp b/src/renderers/PNGRenderer.hpp
similarity index 100%
rename from src/PNGRenderer.hpp
rename to src/renderers/PNGRenderer.hpp
diff --git a/src/PixelRenderer.hpp b/src/renderers/PixelRenderer.hpp
similarity index 100%
rename from src/PixelRenderer.hpp
rename to src/renderers/PixelRenderer.hpp
diff --git a/src/SVGRenderer.hpp b/src/renderers/SVGRenderer.hpp
similarity index 100%
rename from src/SVGRenderer.hpp
rename to src/renderers/SVGRenderer.hpp