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

[wpiutil] Return wpi::expected from MemoryBuffer::GetFile (#7069)

Browse Source
This commit is contained in:
Joseph Eng
2024-09-12 23:45:35 -07:00
committed by GitHub
parent d44b651558
commit 1f3ef019ce
15 changed files with 87 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
View File

@@ -10,7 +10,6 @@
#include <fmt/format.h>
#include <units/angle.h>
#include <wpi/MathExtras.h>
#include <wpi/MemoryBuffer.h>
#include <wpi/StringExtras.h>
#include <wpi/StringMap.h>

10
sysid/src/main/native/cpp/view/LogLoader.cpp
View File

@@ -35,15 +35,15 @@ void LogLoader::Display() {
if (!m_opener->result().empty()) {
m_filename = m_opener->result()[0];
std::error_code ec;
auto buf = wpi::MemoryBuffer::GetFile(m_filename, ec);
if (ec) {
auto fileBuffer = wpi::MemoryBuffer::GetFile(m_filename);
if (!fileBuffer) {
ImGui::OpenPopup("Error");
m_error = fmt::format("Could not open file: {}", ec.message());
m_error = fmt::format("Could not open file: {}",
fileBuffer.error().message());
return;
}
wpi::log::DataLogReader reader{std::move(buf)};
wpi::log::DataLogReader reader{std::move(*fileBuffer)};
if (!reader.IsValid()) {
ImGui::OpenPopup("Error");
m_error = "Not a valid datalog file";