mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 19:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove fmt::format and replace with std::format

Browse Source
This commit is contained in:
Alexander Bock
2024-03-24 20:19:14 +01:00
parent 9878bfc8f7
commit 3ba346a227
246 changed files with 1343 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/spacecraftinstruments/util/labelparser.cpp
View File

@@ -139,7 +139,7 @@ std::string LabelParser::encode(const std::string& line) const {
bool LabelParser::create() {
std::filesystem::path sequenceDir = absPath(_fileName);
if (!std::filesystem::is_directory(sequenceDir)) {
LERROR(fmt::format("Could not load label directory '{}'", sequenceDir));
LERROR(std::format("Could not load label directory '{}'", sequenceDir));
return false;
}
@@ -165,7 +165,7 @@ bool LabelParser::create() {
std::ifstream file(path);
if (!file.good()) {
LERROR(fmt::format("Failed to open label file '{}'", path));
LERROR(std::format("Failed to open label file '{}'", path));
return false;
}
@@ -195,21 +195,21 @@ bool LabelParser::create() {
if (read == "TARGET_NAME") {
_target = decode(line);
if (_target.empty()) {
LWARNING(fmt::format(ErrorMsg, "TARGET_NAME", line, path));
LWARNING(std::format(ErrorMsg, "TARGET_NAME", line, path));
}
count++;
}
if (read == "INSTRUMENT_HOST_NAME") {
_instrumentHostID = decode(line);
if (_instrumentHostID.empty()) {
LWARNING(fmt::format(ErrorMsg, "INSTRUMENT_HOST_NAME", line, path));
LWARNING(std::format(ErrorMsg, "INSTRUMENT_HOST_NAME", line, path));
}
count++;
}
if (read == "INSTRUMENT_ID") {
_instrumentID = decode(line);
if (_instrumentID.empty()) {
LWARNING(fmt::format(ErrorMsg, "INSTRUMENT_ID", line, path));
LWARNING(std::format(ErrorMsg, "INSTRUMENT_ID", line, path));
}
lblName = encode(line);
count++;
@@ -217,7 +217,7 @@ bool LabelParser::create() {
if (read == "DETECTOR_TYPE") {
_detectorType = decode(line);
if (_detectorType.empty()) {
LWARNING(fmt::format(ErrorMsg, "DETECTOR_TYPE", line, path));
LWARNING(std::format(ErrorMsg, "DETECTOR_TYPE", line, path));
}
count++;
}
@@ -248,7 +248,7 @@ bool LabelParser::create() {
count++;
}
else{
LERROR(fmt::format(
LERROR(std::format(
"Label file '{}' deviates from generic standard", path
));
LINFO(