refs #25: added MosaicGenerator, made Floyd-Steinberg subclass MG

CMakeLists.txt

@@ -24,6 +24,7 @@ set(source_dir src)
 
 set(sources
     ${source_dir}/main.cpp
+	${source_dir}/mosaic.hpp
 	${source_dir}/algorithms/floyd-steinberg.cpp
 	${source_dir}/algorithms/floyd-steinberg.hpp
 	${source_dir}/mollusc.cpp

src/algorithms/floyd-steinberg.cpp

@@ -33,7 +33,7 @@ const Mollusc& getClosestColor(const std::vector<Mollusc>& molluscs, const QVect
     return molluscs[closestIndex];
 }
 
-QImage* createMosaic(const QImage& input, const std::vector<Mollusc>& molluscs, int scale)
+QImage* FloydSteinberg::createMosaic(const QImage& input, int scale)
 {
     auto scaled = input.scaledToWidth(input.width() / scale, Qt::SmoothTransformation);
 
@@ -53,7 +53,7 @@ QImage* createMosaic(const QImage& input, const std::vector<Mollusc>& molluscs,
             auto oldColor = QColor(scaled.pixel(x, y));
             auto oldVector = toVec3(oldColor) + errorStorage[x + 1 + y * width];
 
-            const Mollusc& mollusc = getClosestColor(molluscs, oldVector);
+            const Mollusc& mollusc = getClosestColor(m_molluscs, oldVector);
             auto newVector = toVec3(mollusc.m_color);
 
             if (mollusc.m_imageName.compare("NONE") != 0)

src/algorithms/floyd-steinberg.hpp

@@ -3,5 +3,12 @@
 #include <vector>
 #include <QImage>
 #include "../mollusc.hpp"
+#include "../mosaic.hpp"
 
-QImage* createMosaic(const QImage& input, const std::vector<Mollusc>& molluscs, int scale);
+class FloydSteinberg : MosaicGenerator
+{
+public:
+    FloydSteinberg(const std::vector<Mollusc>& molluscs) : MosaicGenerator(molluscs) { };
+
+    QImage * createMosaic(const QImage& input, int scale);
+};

src/main.cpp

@@ -102,7 +102,8 @@ int main(int argc, char *argv[])
     // white mollusc for background
     molluscs.push_back(Mollusc("NONE;#FFFFFF;0.0;1.0;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE;NONE"));
 
-    QImage* result = createMosaic(image, molluscs, scale);
+    auto mosaic = FloydSteinberg(molluscs);
+    auto result = mosaic.createMosaic(image, scale);
 
     result->save(output);
 

src/mosaic.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <vector>
+#include <QImage>
+#include "mollusc.hpp"
+
+class MosaicGenerator
+{
+public:
+    MosaicGenerator(const std::vector<Mollusc>& molluscs) : m_molluscs{ molluscs } { };
+
+    virtual QImage * createMosaic(const QImage& input, int scale) = 0;
+
+protected:
+    const std::vector<Mollusc>& m_molluscs;
+};