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

Use std::string_view and fmtlib across all libraries (#3402)

Browse Source 
- Twine, StringRef, Format, and NativeFormatting have been removed
- Logging now uses fmtlib style formatting
- Nearly all uses of wpi::outs/errs have been replaced with fmt::print() or
std::puts()/std::fputs() (for unformatted strings).
- A wpi/fmt/raw_ostream.h header has been added to enable
fmt::print() with wpi::raw_ostream
This commit is contained in:
Peter Johnson
2021-06-06 16:13:58 -07:00
committed by GitHub
parent 4f1cecb8e7
commit b2c3b2dd8e
441 changed files with 5061 additions and 9749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
glass/src/app/native/cpp/main.cpp
View File

@@ -5,9 +5,9 @@
#include <memory>
#include <GLFW/glfw3.h>
#include <fmt/format.h>
#include <imgui.h>
#include <ntcore_cpp.h>
#include <wpi/SmallString.h>
#include <wpigui.h>
#include "glass/Context.h"
@@ -24,13 +24,13 @@ namespace gui = wpi::gui;
const char* GetWPILibVersion();
namespace glass {
wpi::StringRef GetResource_glass_16_png();
wpi::StringRef GetResource_glass_32_png();
wpi::StringRef GetResource_glass_48_png();
wpi::StringRef GetResource_glass_64_png();
wpi::StringRef GetResource_glass_128_png();
wpi::StringRef GetResource_glass_256_png();
wpi::StringRef GetResource_glass_512_png();
std::string_view GetResource_glass_16_png();
std::string_view GetResource_glass_32_png();
std::string_view GetResource_glass_48_png();
std::string_view GetResource_glass_64_png();
std::string_view GetResource_glass_128_png();
std::string_view GetResource_glass_256_png();
std::string_view GetResource_glass_512_png();
} // namespace glass
static std::unique_ptr<glass::PlotProvider> gPlotProvider;
@@ -56,11 +56,9 @@ static void NtInitialize() {
bool timedOut;
for (auto&& event : nt::PollConnectionListener(poller, 0, &timedOut)) {
if (event.connected) {
wpi::SmallString<64> title;
title = "Glass - Connected (";
title += event.conn.remote_ip;
title += ')';
glfwSetWindowTitle(win, title.c_str());
glfwSetWindowTitle(
win, fmt::format("Glass - Connected ({})", event.conn.remote_ip)
.c_str());
} else {
glfwSetWindowTitle(win, "Glass - DISCONNECTED");
}
@@ -81,9 +79,8 @@ static void NtInitialize() {
} else if (msg.level >= NT_LOG_WARNING) {
level = "WARNING: ";
}
gNetworkTablesLog.Append(
wpi::Twine{level} + msg.message + wpi::Twine{" ("} + msg.filename +
wpi::Twine{':'} + wpi::Twine{msg.line} + wpi::Twine{")\n"});
gNetworkTablesLog.Append(fmt::format("{}{} ({}:{})\n", level, msg.message,
msg.filename, msg.line));
}
});