Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SendableChooser generic value (#433)

Browse Source 
* Java SendableChooser now decorates with type (non-breaking change)

* C++ SendableChooser now is templated on the type instead of using void* and stores values (breaking change)

* C++ SendableChooser now uses llvm::StringMap instead of std::map
This commit is contained in:
Austin Shalit
2017-01-03 14:40:31 -08:00
committed by Peter Johnson
parent 25ae7b2c2b
commit 5aa5e3e09e
5 changed files with 106 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wpilibc/shared/include/SmartDashboard/SendableChooser.h
View File

@@ -7,11 +7,12 @@
#pragma once
#include <map>
#include <memory>
#include <string>
#include "SmartDashboard/Sendable.h"
#include "SmartDashboard/SendableChooserBase.h"
#include "llvm/StringMap.h"
#include "llvm/StringRef.h"
#include "tables/ITable.h"
namespace frc {
@@ -27,24 +28,24 @@ namespace frc {
* laptop. Once autonomous starts, simply ask the {@link SendableChooser} what
* the selected value is.</p>
*
* @tparam T The type of values to be stored
* @see SmartDashboard
*/
class SendableChooser : public Sendable {
template <class T>
class SendableChooser : public SendableChooserBase {
public:
virtual ~SendableChooser() = default;
void AddObject(const std::string& name, void* object);
void AddDefault(const std::string& name, void* object);
void* GetSelected();
void AddObject(llvm::StringRef name, const T& object);
void AddDefault(llvm::StringRef name, const T& object);
T GetSelected();
void InitTable(std::shared_ptr<ITable> subtable) override;
std::shared_ptr<ITable> GetTable() const override;
std::string GetSmartDashboardType() const override;
private:
std::string m_defaultChoice;
std::map<std::string, void*> m_choices;
std::shared_ptr<ITable> m_table;
llvm::StringMap<T> m_choices;
};
} // namespace frc
#include "SendableChooser.inc"