From 16c118afa32a94cce7c41eab9c860fd5cad41320 Mon Sep 17 00:00:00 2001 From: lostjared Date: Wed, 1 Feb 2017 10:08:27 -0800 Subject: [PATCH] added C++11 flags and hashtable for filters --- src/Acid.Cam.v2.Linux.Qt.pro | 2 ++ src/main_window.cpp | 10 ++++++++-- src/main_window.h | 4 ++-- src/qtheaders.h | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Acid.Cam.v2.Linux.Qt.pro b/src/Acid.Cam.v2.Linux.Qt.pro index 6da0c7a..17b4086 100644 --- a/src/Acid.Cam.v2.Linux.Qt.pro +++ b/src/Acid.Cam.v2.Linux.Qt.pro @@ -8,6 +8,8 @@ DEPENDPATH += . INCLUDEPATH += . /usr/include/ LIBS += /usr/lib/x86_64-linux-gnu/libopencv_calib3d.so -lopencv_calib3d /usr/lib/x86_64-linux-gnu/libopencv_contrib.so -lopencv_contrib /usr/lib/x86_64-linux-gnu/libopencv_core.so -lopencv_core /usr/lib/x86_64-linux-gnu/libopencv_features2d.so -lopencv_features2d /usr/lib/x86_64-linux-gnu/libopencv_flann.so -lopencv_flann /usr/lib/x86_64-linux-gnu/libopencv_gpu.so -lopencv_gpu /usr/lib/x86_64-linux-gnu/libopencv_highgui.so -lopencv_highgui /usr/lib/x86_64-linux-gnu/libopencv_imgproc.so -lopencv_imgproc /usr/lib/x86_64-linux-gnu/libopencv_legacy.so -lopencv_legacy /usr/lib/x86_64-linux-gnu/libopencv_ml.so -lopencv_ml /usr/lib/x86_64-linux-gnu/libopencv_objdetect.so -lopencv_objdetect /usr/lib/x86_64-linux-gnu/libopencv_ocl.so -lopencv_ocl /usr/lib/x86_64-linux-gnu/libopencv_photo.so -lopencv_photo /usr/lib/x86_64-linux-gnu/libopencv_stitching.so -lopencv_stitching /usr/lib/x86_64-linux-gnu/libopencv_superres.so -lopencv_superres /usr/lib/x86_64-linux-gnu/libopencv_ts.so -lopencv_ts /usr/lib/x86_64-linux-gnu/libopencv_video.so -lopencv_video /usr/lib/x86_64-linux-gnu/libopencv_videostab.so -lopencv_videostab +QMAKE_CXXFLAGS += -std=c++11 + # Input HEADERS += main_window.h new_dialog.h plugin.h qtheaders.h select_image.h ac.h fractal.h SOURCES += main.cpp main_window.cpp new_dialog.cpp plugin.cpp select_image.cpp ac.cpp fractal.cpp diff --git a/src/main_window.cpp b/src/main_window.cpp index ad0d312..37ed621 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -1,14 +1,20 @@ #include "main_window.h" +std::unordered_map filter_map; + +void generate_map() { + for(unsigned int i = 0; i < ac::draw_max; ++i ) + filter_map[ac::draw_strings[i]] = i; +} + void custom_filter(cv::Mat &frame) { } AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) { - + generate_map(); setGeometry(0, 0, 800, 600); setWindowTitle("Acid Cam v2 - Qt"); - createControls(); createMenu(); } diff --git a/src/main_window.h b/src/main_window.h index f1e5010..f16e93d 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -3,7 +3,6 @@ #include "qtheaders.h" - class AC_MainWindow : public QMainWindow { Q_OBJECT public: @@ -28,6 +27,7 @@ private: }; - +extern std::unordered_map filter_map; +void generate_map(); #endif diff --git a/src/qtheaders.h b/src/qtheaders.h index fb3fe11..72c8f7c 100644 --- a/src/qtheaders.h +++ b/src/qtheaders.h @@ -10,8 +10,7 @@ #include #include"ac.h" #include"fractal.h" - - +#include #endif