mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -25,7 +25,7 @@ HALSIMGUI_DATASOURCE_DOUBLE_INDEXED(PowerDistributionVoltage,
|
||||
HALSIMGUI_DATASOURCE_DOUBLE_INDEXED2(PowerDistributionCurrent,
|
||||
"Power Distribution Current");
|
||||
|
||||
class PowerDistributionSimModel : public glass::PowerDistributionModel {
|
||||
class PowerDistributionSimModel : public wpi::glass::PowerDistributionModel {
|
||||
public:
|
||||
explicit PowerDistributionSimModel(int32_t index)
|
||||
: m_index{index}, m_temp{index}, m_voltage{index} {
|
||||
@@ -46,9 +46,9 @@ class PowerDistributionSimModel : public glass::PowerDistributionModel {
|
||||
|
||||
int GetNumChannels() const override { return m_currents.size(); }
|
||||
|
||||
glass::DoubleSource* GetTemperatureData() override { return &m_temp; }
|
||||
glass::DoubleSource* GetVoltageData() override { return &m_voltage; }
|
||||
glass::DoubleSource* GetCurrentData(int channel) override {
|
||||
wpi::glass::DoubleSource* GetTemperatureData() override { return &m_temp; }
|
||||
wpi::glass::DoubleSource* GetVoltageData() override { return &m_voltage; }
|
||||
wpi::glass::DoubleSource* GetCurrentData(int channel) override {
|
||||
return m_currents[channel].get();
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ class PowerDistributionSimModel : public glass::PowerDistributionModel {
|
||||
std::vector<std::unique_ptr<PowerDistributionCurrentSource>> m_currents;
|
||||
};
|
||||
|
||||
class PowerDistributionsSimModel : public glass::PowerDistributionsModel {
|
||||
class PowerDistributionsSimModel : public wpi::glass::PowerDistributionsModel {
|
||||
public:
|
||||
PowerDistributionsSimModel() : m_models(HAL_GetNumREVPDHModules()) {}
|
||||
|
||||
@@ -78,7 +78,7 @@ class PowerDistributionsSimModel : public glass::PowerDistributionsModel {
|
||||
bool Exists() override { return true; }
|
||||
|
||||
void ForEachPowerDistribution(
|
||||
wpi::function_ref<void(glass::PowerDistributionModel& model, int index)>
|
||||
wpi::util::function_ref<void(wpi::glass::PowerDistributionModel& model, int index)>
|
||||
func) override;
|
||||
|
||||
private:
|
||||
@@ -101,7 +101,7 @@ void PowerDistributionsSimModel::Update() {
|
||||
}
|
||||
|
||||
void PowerDistributionsSimModel::ForEachPowerDistribution(
|
||||
wpi::function_ref<void(glass::PowerDistributionModel& model, int index)>
|
||||
wpi::util::function_ref<void(wpi::glass::PowerDistributionModel& model, int index)>
|
||||
func) {
|
||||
for (int32_t i = 0, iend = static_cast<int32_t>(m_models.size()); i < iend;
|
||||
++i) {
|
||||
@@ -125,9 +125,9 @@ void PowerDistributionSimGui::Initialize() {
|
||||
HALSimGui::halProvider->Register(
|
||||
"PowerDistributions", PowerDistributionsAnyInitialized,
|
||||
[] { return std::make_unique<PowerDistributionsSimModel>(); },
|
||||
[](glass::Window* win, glass::Model* model) {
|
||||
[](wpi::glass::Window* win, wpi::glass::Model* model) {
|
||||
win->SetDefaultPos(245, 155);
|
||||
return glass::MakeFunctionView([=] {
|
||||
return wpi::glass::MakeFunctionView([=] {
|
||||
DisplayPowerDistributions(
|
||||
static_cast<PowerDistributionsSimModel*>(model));
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user