mirror of
https://github.com/lostjared/Acid.Cam.v2.Qt.git
synced 2025-12-13 18:30:02 +01:00
use copy of draw_strings
This commit is contained in:
@@ -25,6 +25,7 @@ Playback::Playback(QObject *parent) : QThread(parent) {
|
|||||||
_custom_cycle = false;
|
_custom_cycle = false;
|
||||||
_custom_cycle_index = 0;
|
_custom_cycle_index = 0;
|
||||||
fps_delay = 60;
|
fps_delay = 60;
|
||||||
|
draw_strings = ac::draw_strings;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Playback::setCustomCycle(bool b) {
|
void Playback::setCustomCycle(bool b) {
|
||||||
@@ -326,15 +327,15 @@ void Playback::drawFilter(cv::Mat &frame, FilterValue &f) {
|
|||||||
if(f.index == 0) {
|
if(f.index == 0) {
|
||||||
|
|
||||||
if(single_mode == true &&
|
if(single_mode == true &&
|
||||||
ac::draw_strings[f.filter].find("SubFilter") != std::string::npos)
|
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)
|
if(single_mode == false && draw_strings[f.filter].find("SubFilter") != std::string::npos && f.subfilter == -1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("Intertwine") != std::string::npos)
|
if(ac::getMaxAllocated() < 1080 && draw_strings[f.filter].find("Intertwine") != std::string::npos)
|
||||||
return;
|
return;
|
||||||
if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("inOrder") != std::string::npos)
|
if(ac::getMaxAllocated() < 1080 && draw_strings[f.filter].find("inOrder") != std::string::npos)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ac::setSubFilter(f.subfilter);
|
ac::setSubFilter(f.subfilter);
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ private:
|
|||||||
std::atomic<bool> _custom_cycle;
|
std::atomic<bool> _custom_cycle;
|
||||||
std::atomic<int> _custom_cycle_index;
|
std::atomic<int> _custom_cycle_index;
|
||||||
std::atomic<int> fps_delay;
|
std::atomic<int> fps_delay;
|
||||||
|
std::vector<std::string> draw_strings;
|
||||||
public:
|
public:
|
||||||
Playback(QObject *parent = 0);
|
Playback(QObject *parent = 0);
|
||||||
~Playback();
|
~Playback();
|
||||||
|
|||||||
Reference in New Issue
Block a user