diff --git a/src/chroma_window.cpp b/src/chroma_window.cpp index cdc1fa4..3738805 100644 --- a/src/chroma_window.cpp +++ b/src/chroma_window.cpp @@ -3,9 +3,19 @@ ChromaWindow::ChromaWindow(QWidget *parent) : QDialog(parent) { + setFixedSize(800, 600); + setWindowTitle(tr("Chroma Key")); + setWindowIcon(QPixmap(":/images/icon.png")); createControls(); + color_dialog = new QColorDialog(this); } void ChromaWindow::createControls() { + button_select = new QPushButton("Select Color", this); + connect(button_select, SIGNAL(clicked()), this, SLOT(openColorSelect())); +} + + +void ChromaWindow::openColorSelect() { } diff --git a/src/chroma_window.h b/src/chroma_window.h index b11ec7d..90ccdd6 100644 --- a/src/chroma_window.h +++ b/src/chroma_window.h @@ -9,8 +9,13 @@ class ChromaWindow : public QDialog { public: ChromaWindow(QWidget *parent); +public slots: + void openColorSelect(); + private: void createControls(); + QColorDialog *color_dialog; + QPushButton *button_select; }; diff --git a/src/main_window.cpp b/src/main_window.cpp index f31214b..835d1aa 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -95,6 +95,8 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) { int cindex = filters->findText("Self AlphaBlend"); filters->setCurrentIndex(cindex); + chroma_window = new ChromaWindow(this); + chroma_window->hide(); } void AC_MainWindow::createControls() { @@ -406,6 +408,9 @@ void AC_MainWindow::createMenu() { open_search = new QAction(tr("Search Filters"), this); open_search->setShortcut(tr("Ctrl+S")); controls_menu->addAction(open_search); + select_key = new QAction(tr("Set Chroma Key"), this); + controls_menu->addAction(select_key); + connect(select_key, SIGNAL(triggered()), this, SLOT(openColorWindow())); connect(open_search,SIGNAL(triggered()), this, SLOT(openSearch())); connect(controls_snapshot, SIGNAL(triggered()), this, SLOT(controls_Snap())); connect(controls_pause, SIGNAL(triggered()), this, SLOT(controls_Pause())); @@ -1225,3 +1230,7 @@ void AC_MainWindow::help_About() { void AC_MainWindow::openSearch() { search_box->show(); } + +void AC_MainWindow::openColorWindow() { + chroma_window->show(); +} diff --git a/src/main_window.h b/src/main_window.h index f7899d8..1b0d785 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -14,6 +14,7 @@ #include "playback_thread.h" #include "search_box.h" #include "goto_window.h" +#include "chroma_window.h" class SearchWindow; @@ -48,6 +49,7 @@ public: QAction *clear_image; QAction *repeat_v; QAction *fade_on; + QAction *select_key; double speed_actions[7]; QRadioButton *filter_single, *filter_custom; void updateList(); @@ -102,6 +104,7 @@ public slots: void clear_img(); void repeat_vid(); void setFade(); + void openColorWindow(); private: void createControls(); void createMenu(); @@ -109,6 +112,7 @@ private: CaptureCamera *cap_camera; CaptureVideo *cap_video; SearchWindow *search_box; + ChromaWindow *chroma_window; GotoWindow *goto_window; cv::VideoCapture capture_camera, capture_video; cv::VideoWriter writer; diff --git a/src/qtheaders.h b/src/qtheaders.h index b047a5c..866a710 100644 --- a/src/qtheaders.h +++ b/src/qtheaders.h @@ -37,6 +37,7 @@ #include #include #include +#include #include"ac.h" #include"fractal.h" #include