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

update

Browse Source
This commit is contained in:
Jared Bruni
2021-08-28 16:03:28 -07:00
parent 7be39b9019
commit e254dd3d6a
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main_window.cpp
View File

@@ -13,6 +13,8 @@
#include <opencv2/core/ocl.hpp> #include <opencv2/core/ocl.hpp>
std::unordered_map<std::string, FilterValue> filter_map; std::unordered_map<std::string, FilterValue> filter_map;
std::unordered_map<std::string, int> filter_map_main;
std::vector<std::string> solo_filter;
void custom_filter(cv::Mat &); void custom_filter(cv::Mat &);
const char *filter_names[] = { "AC Self AlphaBlend", "Reverse Self AlphaBlend", const char *filter_names[] = { "AC Self AlphaBlend", "Reverse Self AlphaBlend",
@@ -72,6 +74,9 @@ void generate_map() {
std::string name = "plugin " + plugins.plugin_list[j]->name(); std::string name = "plugin " + plugins.plugin_list[j]->name();
filter_map[name] = FilterValue(2, j, -1); filter_map[name] = FilterValue(2, j, -1);
} }
filter_map_main = ac::filter_map;
solo_filter = ac::solo_filter;
} }
@@ -1866,9 +1871,9 @@ void AC_MainWindow::save_CustomFile() {
void AC_MainWindow::setRandomFilterValue() { void AC_MainWindow::setRandomFilterValue() {
menu_cat->setCurrentIndex(0); menu_cat->setCurrentIndex(0);
resetMenu(); resetMenu();
int index = rand()%ac::solo_filter.size(); int index = rand()%solo_filter.size();
std::string filter_name = ac::solo_filter[index]; std::string filter_name = solo_filter[index];
int filter_index = ac::filter_map[filter_name]; int filter_index = filter_map_main[filter_name];
filters->setCurrentIndex(filter_index); filters->setCurrentIndex(filter_index);
} }

6
src/options_window.cpp
View File

@@ -65,7 +65,7 @@ void OptionsWindow::setValues() {
if(delay_value > 0) if(delay_value > 0)
playback->setCustomCycleDelay(delay_value); playback->setCustomCycleDelay(delay_value);
ac::setMaxAllocated(max_frames); playback->setMaxAlloc(max_frames);
QString text; QString text;
int level_ = atoi(level->text().toStdString().c_str()); int level_ = atoi(level->text().toStdString().c_str());
@@ -75,8 +75,8 @@ void OptionsWindow::setValues() {
QMessageBox::information(this, tr("Error requires valid level/wait"), tr("Requires Level/Intensity greater than zero value")); QMessageBox::information(this, tr("Error requires valid level/wait"), tr("Requires Level/Intensity greater than zero value"));
return; return;
} }
ac::setVariableWait(wait_);
ac::setColorLevel(level_); playback->setWaitColorLevel(wait_, level_);
QTextStream stream(&text); QTextStream stream(&text);
stream << tr("Thread Count set to: ") << thread_count << tr(" and Intensity set to: ") << intensity << tr("\nMaximum Stored Frames: ") << max_frames << tr("\n") << tr("Delay: ") << delay_value << "\n" << tr("Wait: ") << wait_ << "\n" << tr("Level: ") << level_ << "\n"; stream << tr("Thread Count set to: ") << thread_count << tr(" and Intensity set to: ") << intensity << tr("\nMaximum Stored Frames: ") << max_frames << tr("\n") << tr("Delay: ") << delay_value << "\n" << tr("Wait: ") << wait_ << "\n" << tr("Level: ") << level_ << "\n";
QMessageBox::information(this, tr("Pref Value Set"), text); QMessageBox::information(this, tr("Pref Value Set"), text);

7
src/playback_thread.cpp
View File

@@ -159,6 +159,13 @@ unsigned long Playback::allocatedFrames() {
} }
void Playback::setWaitColorLevel(int w, int l) {
mutex.lock();
ac::setVariableWait(w);
ac::setColorLevel(l);
mutex.unlock();
}
void Playback::setSubFilter_(int s) { void Playback::setSubFilter_(int s) {
mutex.lock(); mutex.lock();
ac::setSubFilter(s); ac::setSubFilter(s);

1
src/playback_thread.h
View File

@@ -66,6 +66,7 @@ public:
void setMaxAlloc(int a); void setMaxAlloc(int a);
unsigned int getObjectSize(); unsigned int getObjectSize();
unsigned long allocatedFrames(); unsigned long allocatedFrames();
void setWaitColorLevel(int c, int l);
void setColorMap(int c); void setColorMap(int c);
void setPngPath(std::string path); void setPngPath(std::string path);
void Play(); void Play();