eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-18 12:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

now works with reset filters

Browse Source
This commit is contained in:
lostjared
2018-06-29 08:21:32 -07:00
parent db11b292c8
commit 8b3d298f0f
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main_window.cpp
View File

@@ -313,6 +313,10 @@ void AC_MainWindow::createMenu() {
controls_showvideo->setShortcut(tr("Ctrl+V"));
controls_menu->addAction(controls_showvideo);
reset_filters = new QAction(tr("Reset Filters"), this);
reset_filters->setShortcut(tr("Ctrl+R"));
controls_menu->addAction(reset_filters);
controls_showvideo->setEnabled(false);
controls_showvideo->setCheckable(true);
@@ -323,6 +327,7 @@ void AC_MainWindow::createMenu() {
connect(controls_setimage, SIGNAL(triggered()), this, SLOT(controls_SetImage()));
connect(controls_setkey, SIGNAL(triggered()), this, SLOT(controls_SetKey()));
connect(controls_showvideo, SIGNAL(triggered()), this, SLOT(controls_ShowVideo()));
connect(reset_filters, SIGNAL(triggered()), this, SLOT(controls_Reset()));
connect(clear_images, SIGNAL(triggered()), this, SLOT(controls_Clear()));
connect(combo_rgb, SIGNAL(currentIndexChanged(int)), this, SLOT(cb_SetIndex(int)));
controls_pause->setText(tr("Pause"));
@@ -674,6 +679,10 @@ void AC_MainWindow::controls_ShowVideo() {
}
}
void AC_MainWindow::controls_Reset() {
playback->reset_filters();
}
void AC_MainWindow::file_Exit() {
QApplication::exit(0);
}

3
src/main_window.h
View File

@@ -31,7 +31,7 @@ public:
QComboBox *color_maps, *filters;
QMenu *file_menu, *controls_menu, *help_menu;
QAction *file_exit, *file_new_capture, *file_new_video;
QAction *controls_snapshot, *controls_pause, *controls_step, *controls_stop, *controls_setimage,*controls_setkey,*controls_showvideo, *clear_images;
QAction *controls_snapshot, *controls_pause, *controls_step, *controls_stop, *controls_setimage,*controls_setkey,*controls_showvideo, *clear_images, *reset_filters;
QAction *help_about;
QRadioButton *filter_single, *filter_custom;
@@ -51,6 +51,7 @@ public slots:
void controls_ShowVideo();
void controls_SetKey();
void controls_Clear();
void controls_Reset();
void help_About();
void updateFrame(QImage img);
void stopRecording();

11
src/playback_thread.cpp
View File

@@ -105,6 +105,15 @@ void Playback::setOptions(bool n, int c) {
mutex.unlock();
}
void Playback::reset_filters() {
mutex.lock();
if(ac::reset_alpha == false) {
ac::reset_alpha = true;
}
ac::frames_released = true;
mutex.unlock();
}
void Playback::setColorOptions(int b, int g, int s) {
mutex.lock();
bright_ = b;
@@ -143,6 +152,8 @@ void Playback::setDisplayed(bool shown) {
void Playback::drawEffects(cv::Mat &frame) {
if(ac::set_color_map > 0) ac::ApplyColorMap(frame);
ac::frames_released = false;
ac::reset_alpha = false;
if(bright_ > 0) {
ac::setBrightness(frame, 1.0, bright_);
}

1
src/playback_thread.h
View File

@@ -62,6 +62,7 @@ public:
void drawFilter(cv::Mat &frame, std::pair<int, int> &filter);
void drawEffects(cv::Mat &frame);
void filterFade(cv::Mat &frame, std::pair<int, int> &filter1, std::pair<int, int> &filter2, double alpha);
void reset_filters();
signals:
void procImage(const QImage image);
void stopRecording();