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

Fix

Browse Source
This commit is contained in:
Jared Bruni
2021-08-26 18:00:32 -07:00
parent 8bc8271a2f
commit c1c18526c5
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main_window.cpp
View File

@@ -1367,7 +1367,13 @@ void AC_MainWindow::buildVector(std::vector<FilterValue> &v) {
if(n.find(":") == std::string::npos && n.find("SubFilter") == std::string::npos) if(n.find(":") == std::string::npos && n.find("SubFilter") == std::string::npos)
v.push_back(filter_map[name.toStdString()]); v.push_back(filter_map[name.toStdString()]);
else { else {
std::string namev = name.toStdString(); std::string namev = name.toStdString();
if(namev.find("SubFilter") != std::string::npos && namev.find(":") == std::string::npos)
continue;
std::string left_str = namev.substr(0, namev.find(":")); std::string left_str = namev.substr(0, namev.find(":"));
std::string right_str = namev.substr(namev.find(":")+1,namev.length()-left_str.length()-1); std::string right_str = namev.substr(namev.find(":")+1,namev.length()-left_str.length()-1);
int index_val = filter_map[right_str].filter; int index_val = filter_map[right_str].filter;

4
src/playback_thread.cpp
View File

@@ -255,6 +255,10 @@ void Playback::drawFilter(cv::Mat &frame, FilterValue &f) {
if(single_mode == true && if(single_mode == true &&
ac::draw_strings[f.filter].find("SubFilter") != std::string::npos) ac::draw_strings[f.filter].find("SubFilter") != std::string::npos)
return; return;
if(single_mode == false && ac::draw_strings[f.filter].find("SubFilter") != std::string::npos && f.subfilter == -1)
return;
if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("Intertwine") != std::string::npos) if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("Intertwine") != std::string::npos)
return; return;