From e7acd0dec79ece94a1544ce9a3ab79c03be05450 Mon Sep 17 00:00:00 2001 From: Lukas Wagner Date: Sun, 3 Jun 2018 17:37:15 +0200 Subject: [PATCH] refs #25: moved mosaic function to algorithms dir --- CMakeLists.txt | 4 ++-- src/{mosaic.cpp => algorithms/floyd-steinberg.cpp} | 4 ++-- src/{mosaic.hpp => algorithms/floyd-steinberg.hpp} | 2 +- src/main.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/{mosaic.cpp => algorithms/floyd-steinberg.cpp} (97%) rename src/{mosaic.hpp => algorithms/floyd-steinberg.hpp} (84%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d78cbae..aaeab6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ set(source_dir src) set(sources ${source_dir}/main.cpp - ${source_dir}/mosaic.cpp - ${source_dir}/mosaic.hpp + ${source_dir}/algorithms/floyd-steinberg.cpp + ${source_dir}/algorithms/floyd-steinberg.hpp ${source_dir}/mollusc.cpp ${source_dir}/mollusc.hpp ${source_dir}/mainwindow.cpp diff --git a/src/mosaic.cpp b/src/algorithms/floyd-steinberg.cpp similarity index 97% rename from src/mosaic.cpp rename to src/algorithms/floyd-steinberg.cpp index c1d6a37..4497502 100644 --- a/src/mosaic.cpp +++ b/src/algorithms/floyd-steinberg.cpp @@ -7,8 +7,8 @@ #include #include -#include "mosaic.hpp" -#include "mollusc.hpp" +#include "floyd-steinberg.hpp" +#include "../mollusc.hpp" QVector3D toVec3(const QColor& color) { diff --git a/src/mosaic.hpp b/src/algorithms/floyd-steinberg.hpp similarity index 84% rename from src/mosaic.hpp rename to src/algorithms/floyd-steinberg.hpp index 373b6a6..728ed0a 100644 --- a/src/mosaic.hpp +++ b/src/algorithms/floyd-steinberg.hpp @@ -2,6 +2,6 @@ #include #include -#include "mollusc.hpp" +#include "../mollusc.hpp" QImage* createMosaic(const QImage& input, const std::vector& molluscs, int scale); diff --git a/src/main.cpp b/src/main.cpp index 52ec89c..db3878f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,7 +10,7 @@ #include #include "mainwindow.hpp" -#include "mosaic.hpp" +#include "algorithms/floyd-steinberg.hpp" #include "mollusc.hpp"