mirror of
https://github.com/lostjared/Acid.Cam.v2.Qt.git
synced 2025-12-05 14:30:03 +01:00
fixed favorites
This commit is contained in:
@@ -151,6 +151,11 @@ void Playback::setVector(std::vector<FilterValue> v) {
|
|||||||
mutex.unlock();
|
mutex.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Playback::setFilterMapEx(std::unordered_map<std::string, FilterValue> f) {
|
||||||
|
filter_map_ex_set = f;
|
||||||
|
setFilterMap = true;
|
||||||
|
}
|
||||||
|
|
||||||
unsigned long Playback::calcMem() {
|
unsigned long Playback::calcMem() {
|
||||||
mutex.lock();
|
mutex.lock();
|
||||||
unsigned long calc = ac::calculateMemory();
|
unsigned long calc = ac::calculateMemory();
|
||||||
@@ -413,6 +418,11 @@ void Playback::run() {
|
|||||||
color_replace_image = chroma_image.clone();
|
color_replace_image = chroma_image.clone();
|
||||||
chroma_image_set = false;
|
chroma_image_set = false;
|
||||||
}
|
}
|
||||||
|
if(setFilterMap) {
|
||||||
|
filter_map_ex = filter_map_ex_set;
|
||||||
|
setFilterMap = false;
|
||||||
|
}
|
||||||
|
|
||||||
mutex.unlock();
|
mutex.unlock();
|
||||||
|
|
||||||
cv::Mat temp_frame;
|
cv::Mat temp_frame;
|
||||||
|
|||||||
@@ -57,6 +57,8 @@ private:
|
|||||||
std::atomic<int> fps_delay;
|
std::atomic<int> fps_delay;
|
||||||
std::vector<std::string> draw_strings;
|
std::vector<std::string> draw_strings;
|
||||||
std::unordered_map<std::string, FilterValue> filter_map_ex;
|
std::unordered_map<std::string, FilterValue> filter_map_ex;
|
||||||
|
bool setFilterMap = false;
|
||||||
|
std::unordered_map<std::string, FilterValue> filter_map_ex_set;
|
||||||
public:
|
public:
|
||||||
Playback(QObject *parent = 0);
|
Playback(QObject *parent = 0);
|
||||||
~Playback();
|
~Playback();
|
||||||
@@ -76,6 +78,7 @@ public:
|
|||||||
void setColorMap(int c);
|
void setColorMap(int c);
|
||||||
void setPngPath(std::string path);
|
void setPngPath(std::string path);
|
||||||
void clearImage();
|
void clearImage();
|
||||||
|
void setFilterMapEx(std::unordered_map<std::string, FilterValue> f);
|
||||||
void Play();
|
void Play();
|
||||||
void Stop();
|
void Stop();
|
||||||
void Release();
|
void Release();
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ void DefineWindow::setFilterName() {
|
|||||||
filter_map[fn].index = 0;
|
filter_map[fn].index = 0;
|
||||||
filter_map[fn].filter = filter_map[ft].filter;
|
filter_map[fn].filter = filter_map[ft].filter;
|
||||||
filter_map[fn].subfilter = -1;
|
filter_map[fn].subfilter = -1;
|
||||||
|
main_window->playback->setFilterMapEx(filter_map);
|
||||||
main_window->resetMenu();
|
main_window->resetMenu();
|
||||||
def_list->addItem(real_final_name.c_str());
|
def_list->addItem(real_final_name.c_str());
|
||||||
def_newname->setText("");
|
def_newname->setText("");
|
||||||
|
|||||||
Reference in New Issue
Block a user