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

[wpilibc] Make ShuffleboardValue non-copyable (#3430)

Browse Source 
This avoids the possibility of it being accidentally sliced by users.
This commit is contained in:
Peter Johnson
2021-06-11 20:16:35 -07:00
committed by GitHub
parent 4d9ff76433
commit cfa1ca96f2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardInstance.cpp
View File

@@ -15,7 +15,7 @@
using namespace frc::detail;
struct ShuffleboardInstance::Impl {
wpi::StringMap<ShuffleboardTab> tabs;
wpi::StringMap<std::unique_ptr<ShuffleboardTab>> tabs;
bool tabsChanged = false;
std::shared_ptr<nt::NetworkTable> rootTable;
@@ -33,23 +33,24 @@ ShuffleboardInstance::~ShuffleboardInstance() = default;
frc::ShuffleboardTab& ShuffleboardInstance::GetTab(std::string_view title) {
if (m_impl->tabs.find(title) == m_impl->tabs.end()) {
m_impl->tabs.try_emplace(title, ShuffleboardTab(*this, title));
m_impl->tabs.try_emplace(title,
std::make_unique<ShuffleboardTab>(*this, title));
m_impl->tabsChanged = true;
}
return m_impl->tabs.find(title)->second;
return *m_impl->tabs.find(title)->second;
}
void ShuffleboardInstance::Update() {
if (m_impl->tabsChanged) {
wpi::SmallVector<std::string, 16> tabTitles;
for (auto& entry : m_impl->tabs) {
tabTitles.emplace_back(entry.second.GetTitle());
tabTitles.emplace_back(entry.second->GetTitle());
}
m_impl->rootMetaTable->GetEntry("Tabs").ForceSetStringArray(tabTitles);
m_impl->tabsChanged = false;
}
for (auto& entry : m_impl->tabs) {
auto& tab = entry.second;
auto& tab = *entry.second;
tab.BuildInto(m_impl->rootTable,
m_impl->rootMetaTable->GetSubTable(tab.GetTitle()));
}
@@ -57,7 +58,7 @@ void ShuffleboardInstance::Update() {
void ShuffleboardInstance::EnableActuatorWidgets() {
for (auto& entry : m_impl->tabs) {
auto& tab = entry.second;
auto& tab = *entry.second;
for (auto& component : tab.GetComponents()) {
component->EnableIfActuator();
}
@@ -66,7 +67,7 @@ void ShuffleboardInstance::EnableActuatorWidgets() {
void ShuffleboardInstance::DisableActuatorWidgets() {
for (auto& entry : m_impl->tabs) {
auto& tab = entry.second;
auto& tab = *entry.second;
for (auto& component : tab.GetComponents()) {
component->DisableIfActuator();
}