Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

NetworkTable: Fix table and key listener behavior.

Browse Source 
The implemented behavior didn't match the old networktables implementation.
This commit is contained in:
Peter Johnson
2015-08-27 22:22:51 -07:00
parent 86445b6670
commit 6c8a5935c9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/networktables/NetworkTable.cpp
View File

@@ -67,10 +67,15 @@ void NetworkTable::AddTableListener(ITableListener* listener,
bool immediateNotify) {
llvm::SmallString<128> path(m_path);
path += PATH_SEPARATOR_CHAR;
std::size_t prefix_len = path.size();
unsigned int id = nt::AddEntryListener(
path,
[=](unsigned int uid, StringRef name, std::shared_ptr<nt::Value> value,
bool is_new) { listener->ValueChanged(this, name, value, is_new); },
bool is_new) {
StringRef relative_key = name.substr(prefix_len);
if (relative_key.find(PATH_SEPARATOR_CHAR) != StringRef::npos) return;
listener->ValueChanged(this, relative_key, value, is_new);
},
immediateNotify);
m_listeners.emplace_back(listener, id);
}
@@ -80,11 +85,15 @@ void NetworkTable::AddTableListener(StringRef key,
bool immediateNotify) {
llvm::SmallString<128> path(m_path);
path += PATH_SEPARATOR_CHAR;
std::size_t prefix_len = path.size();
path += key;
unsigned int id = nt::AddEntryListener(
path,
[=](unsigned int uid, StringRef name, std::shared_ptr<nt::Value> value,
bool is_new) { listener->ValueChanged(this, name, value, is_new); },
bool is_new) {
if (name != path) return;
listener->ValueChanged(this, name.substr(prefix_len), value, is_new);
},
immediateNotify);
m_listeners.emplace_back(listener, id);
}