diff --git a/src/chroma_window.cpp b/src/chroma_window.cpp index a6a74b7..2e80518 100644 --- a/src/chroma_window.cpp +++ b/src/chroma_window.cpp @@ -83,8 +83,8 @@ void ChromaWindow::createControls() { connect(low_b, SIGNAL(textChanged(const QString &)), this, SLOT(editSetLowB(const QString &))); connect(low_g, SIGNAL(textChanged(const QString &)), this, SLOT(editSetLowG(const QString &))); connect(low_r, SIGNAL(textChanged(const QString &)), this, SLOT(editSetLowR(const QString &))); - - + + connect(high_b, SIGNAL(textChanged(const QString &)), this, SLOT(editSetHighB(const QString &))); connect(high_g, SIGNAL(textChanged(const QString &)), this, SLOT(editSetHighG(const QString &))); connect(high_r, SIGNAL(textChanged(const QString &)), this, SLOT(editSetHighR(const QString &))); @@ -102,13 +102,13 @@ void ChromaWindow::createControls() { highButton->setGeometry(300, 90, 25, 20); select_mode = new QComboBox(this); - select_mode->setGeometry(15, 235, 290, 25); + select_mode->setGeometry(10, 235, 295, 25); select_mode->addItem("Replace with Filter"); select_mode->addItem("Replace with Image"); select_setimage = new QPushButton("Image", this); - select_setimage->setGeometry(20, 265, 60, 20); + select_setimage->setGeometry(15, 265, 60, 20); select_image_path = new QLabel("Test Path", this); select_image_path->setGeometry(85, 265, 400-85-25, 20); diff --git a/src/chroma_window.h b/src/chroma_window.h index 79c993b..b4082cd 100644 --- a/src/chroma_window.h +++ b/src/chroma_window.h @@ -12,7 +12,7 @@ public: bool checkEdit(QLineEdit *edit); void setEditFromColor(int val, QColor color); void enableKey(bool op); -public slots: + public slots: void openColorSelectRange(); void openColorSelectTolerance(); void colorAdd(); diff --git a/src/display_window.h b/src/display_window.h index 1743cdc..ace1252 100644 --- a/src/display_window.h +++ b/src/display_window.h @@ -2,7 +2,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #ifndef __DISPLAY_WINDOW_H__ diff --git a/src/goto_window.cpp b/src/goto_window.cpp index 63bbb20..101ae83 100644 --- a/src/goto_window.cpp +++ b/src/goto_window.cpp @@ -37,7 +37,7 @@ void GotoWindow::createControls() { goto_frame->setGeometry(230,30,100,20); goto_jump = new QPushButton("Go", this); goto_jump->setGeometry(340, 30, 45, 20); - + connect(goto_jump, SIGNAL(clicked()), this, SLOT(pressedGo())); connect(goto_pos, SIGNAL(valueChanged(int)), this, SLOT(slideChanged(int))); diff --git a/src/goto_window.h b/src/goto_window.h index 21e36c8..47b6bec 100644 --- a/src/goto_window.h +++ b/src/goto_window.h @@ -28,7 +28,7 @@ private: QLineEdit *goto_sec, *goto_frame; QPushButton *goto_jump; Playback *playback_thread; -public slots: + public slots: void pressedGo(); void slideChanged(int pos); diff --git a/src/main_window.h b/src/main_window.h index 1b0d785..bfa6a99 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -3,7 +3,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #ifndef __MAIN_WINDOW_H__ #define __MAIN_WINDOW_H__ @@ -55,7 +55,7 @@ public: void updateList(); void setSubFilter(const QString &num); void setFrameIndex(int i); -public slots: + public slots: void addClicked(); void rmvClicked(); void upClicked(); diff --git a/src/new_dialog.cpp b/src/new_dialog.cpp index 4064875..eae2116 100644 --- a/src/new_dialog.cpp +++ b/src/new_dialog.cpp @@ -3,7 +3,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #include "new_dialog.h" @@ -36,7 +36,7 @@ void CaptureCamera::createControls() { stream << i; combo_device->addItem(*stream.string()); } - btn_select = new QPushButton(tr("Save Directory"), this); + btn_select = new QPushButton(tr("Save Directory"), this); btn_select->setGeometry(10, 65, 100, 20); output_dir = new QLineEdit("", this); output_dir->setGeometry(110, 65, 175, 20); @@ -59,7 +59,7 @@ void CaptureCamera::setParent(AC_MainWindow *p) { } void CaptureCamera::btn_Select() { - + QString def_path = ""; #if defined(__linux__) def_path = "/home"; diff --git a/src/new_dialog.h b/src/new_dialog.h index bda9719..b6acaa9 100644 --- a/src/new_dialog.h +++ b/src/new_dialog.h @@ -3,7 +3,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #ifndef _NEW_DIALOG_H_ #define _NEW_DIALOG_H_ @@ -13,7 +13,7 @@ class AC_MainWindow; class CaptureCamera : public QDialog { - Q_OBJECT + Q_OBJECT public: CaptureCamera(QWidget *parent = 0); void createControls(); @@ -24,7 +24,7 @@ public: QCheckBox *chk_record; QPushButton *btn_start, *btn_select; QComboBox *video_type; -public slots: + public slots: void btn_Select(); void btn_Start(); @@ -44,7 +44,7 @@ public: QCheckBox *chk_record; QComboBox *video_type; -public slots: + public slots: void btn_SetSourceFile(); void btn_SetOutputDir(); void btn_Start(); diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index 6b23bc8..5203cf6 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -2,7 +2,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #include"playback_thread.h" @@ -112,7 +112,7 @@ void Playback::setOptions(bool n, int c) { void Playback::reset_filters() { mutex.lock(); if(ac::reset_alpha == false) { - ac::reset_alpha = true; + ac::reset_alpha = true; } ac::frames_released = true; mutex.unlock(); @@ -247,7 +247,7 @@ void Playback::run() { msleep(duration/2); mutex.unlock(); } else if(cur.size()>0) { - mutex.lock(); + mutex.lock(); ac::in_custom = true; for(unsigned int i = 0; i < cur.size(); ++i) { if(i == cur.size()-1) @@ -308,8 +308,8 @@ bool Playback::getFrame(QImage &img, const int &index) { mutex.lock(); cv::Mat frame; if(mode == MODE_VIDEO && capture.read(frame)) { - cv::cvtColor(frame, rgb_frame, CV_BGR2RGB); - img = QImage((const unsigned char*)(rgb_frame.data), rgb_frame.cols, rgb_frame.rows, QImage::Format_RGB888); + cv::cvtColor(frame, rgb_frame, CV_BGR2RGB); + img = QImage((const unsigned char*)(rgb_frame.data), rgb_frame.cols, rgb_frame.rows, QImage::Format_RGB888); mutex.unlock(); setFrameIndex(index); return true; diff --git a/src/playback_thread.h b/src/playback_thread.h index 3e01143..fb6c2b4 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -3,7 +3,7 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #ifndef __PLAYBACK_WINDOW_H__ #define __PLAYBACK_WINDOW_H__ diff --git a/src/plugin.cpp b/src/plugin.cpp index 3496331..b8ee5d3 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -21,7 +21,7 @@ void add_directory(QDir &cdir, std::vector &files) { #else platform = ".dll"; #endif - while(pos < list.size()) { + while(pos < list.size()) { QFileInfo info = list.at(pos); if(info.isDir() && info.fileName() != "." && info.fileName() != "..") { QDir cdir = info.dir(); @@ -45,7 +45,7 @@ void init_plugins() { for(unsigned int i = 0; i < files.size(); ++i) { Plugin *p = new Plugin(); if(p->loadPlugin(files[i])) - plugins.plugin_list.push_back(p); + plugins.plugin_list.push_back(p); } } } @@ -69,7 +69,7 @@ void draw_plugin(cv::Mat &frame, int filter) { void plugin_callback(cv::Mat &) { - + } Plugin::Plugin() { @@ -79,7 +79,7 @@ Plugin::Plugin() { Plugin::~Plugin() { if(library) delete library; } - + bool Plugin::loadPlugin(const std::string &text) { library = new QLibrary(text.c_str()); if(!library) { @@ -120,7 +120,7 @@ PluginList::PluginList() { PluginList::~PluginList() { if(plugin_list.size() == 0) return; - + for(auto i = plugin_list.begin(); i != plugin_list.end(); ++i) delete *i; } diff --git a/src/qtheaders.h b/src/qtheaders.h index 87892c1..76f3cb4 100644 --- a/src/qtheaders.h +++ b/src/qtheaders.h @@ -2,11 +2,11 @@ * Acid Cam v2 - Qt/OpenCV Edition * written by Jared Bruni ( http://lostsidedead.com ) * (C) 2017 GPL -*/ + */ #ifndef _QT_HEADERS__ #define _QT_HEADERS__ -#define ac_version "v1.20.0" +#define ac_version "v1.20.1" #include #include #include diff --git a/src/search_box.cpp b/src/search_box.cpp index 7c6400b..394bdcb 100644 --- a/src/search_box.cpp +++ b/src/search_box.cpp @@ -51,7 +51,7 @@ void SearchWindow::search_filter() { std::string search_items = lowerString(filters->itemText(i).toStdString()); for(unsigned q = 0; q < tokens.size(); ++q) { if(search_items.find(tokens[q]) != std::string::npos) { - search_list->addItem(filters->itemText(i)); + search_list->addItem(filters->itemText(i)); } } } diff --git a/src/search_box.h b/src/search_box.h index 3b0f2c4..12acfe1 100644 --- a/src/search_box.h +++ b/src/search_box.h @@ -12,7 +12,7 @@ public: SearchWindow(QWidget *parent = 0); void createControls(); void setFiltersControl(QComboBox *filter_box, QListWidget *custom); -public slots: + public slots: void search_filter(); void add_current(); void set_subf();