Skip to content

Commit

Permalink
Rec GUI: fixed blacklist/whitelist dialog
Browse files Browse the repository at this point in the history
The blacklist and whitelist dialog and the corresponding buttons are now properly updated when loading a config or creating a new one.
  • Loading branch information
FlorianReimold committed Jun 15, 2021
1 parent ee33e01 commit 32afd6a
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions app/rec/rec_gui/src/qecalrec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,12 @@ bool QEcalRec::clearConfig()

if (success)
{
topic_blacklist_.clear();
topic_whitelist_.clear();

emit topicBlacklistChangedSignal(topic_blacklist_);
emit topicWhitelistChangedSignal(topic_whitelist_);

emit enabledRecClientsChangedSignal (rec_server_->GetEnabledRecClients());
emit maxPreBufferLengthChangedSignal (rec_server_->GetMaxPreBufferLength());
emit preBufferingEnabledChangedSignal(rec_server_->GetPreBufferingEnabled());
Expand Down Expand Up @@ -889,14 +895,30 @@ bool QEcalRec::loadConfigFromFile(const std::string& path, bool omit_dialogs)
emit recordModeChangedSignal (rec_server_->GetRecordMode());

if (rec_server_->GetRecordMode() == eCAL::rec::RecordMode::Blacklist)
{
topic_blacklist_ = rec_server_->GetListedTopics();
topic_whitelist_.clear();
emit topicBlacklistChangedSignal(rec_server_->GetListedTopics());
}
else if (rec_server_->GetRecordMode() == eCAL::rec::RecordMode::Whitelist)
{
topic_blacklist_.clear();
topic_whitelist_ = rec_server_->GetListedTopics();
emit topicWhitelistChangedSignal(rec_server_->GetListedTopics());
}
else if (rec_server_->GetRecordMode() == eCAL::rec::RecordMode::All)
{
topic_blacklist_.clear();
topic_whitelist_.clear();
}
emit topicBlacklistChangedSignal(topic_blacklist_);
emit topicWhitelistChangedSignal(topic_whitelist_);

emit measRootDirChangedSignal (rec_server_->GetMeasRootDir());
emit measNameChangedSignal (rec_server_->GetMeasName());
emit maxFileSizeMibChangedSignal(rec_server_->GetMaxFileSizeMib());
emit descriptionChangedSignal (rec_server_->GetDescription());


emit usingBuiltInRecorderEnabledChangedSignal(rec_server_->IsUsingBuiltInRecorderEnabled());

Expand Down

0 comments on commit 32afd6a

Please sign in to comment.