mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -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

28
modules/space/kepler.cpp
View File

@@ -212,7 +212,7 @@ namespace {
// https://github.com/eliaskosunen/scnlib/issues/104 is fixed
auto res = scn::scan<int, double>(e, "{:2d}{}");
if (!res) {
throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
}
auto [year, daysInYear] = res->values();
year += year > 57 ? 1900 : 2000;
@@ -269,7 +269,7 @@ namespace {
const std::string format = (nDashes == 2) ? "{:4}-{:2}-{:2}{}" : "{:4}{:2}{:2}{}";
auto res = scn::scan<int, int, int, double>(e, scn::runtime_format(format));
if (!res) {
throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
}
auto [year, monthNum, dayOfMonthNum, fractionOfDay] = res->values();
const int daysSince2000 = countDays(year);
@@ -338,7 +338,7 @@ namespace {
epoch, "{:4d}-{:2d}-{:2d}T{:2d}:{:2d}:{}"
);
if (!res) {
throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
}
std::tie(date.year, month, days, date.hours, date.minutes, date.seconds) =
res->values();
@@ -354,13 +354,13 @@ namespace {
//date.year, date.nDays, date.hours, date.minutes, date.seconds
);
if (!res) {
throw ghoul::RuntimeError(fmt::format("Error parsing epoch '{}'", epoch));
throw ghoul::RuntimeError(std::format("Error parsing epoch '{}'", epoch));
}
std::tie(date.year, date.nDays, date.hours, date.minutes, date.seconds) =
res->values();
}
else {
throw ghoul::RuntimeError(fmt::format("Malformed epoch string '{}'", epoch));
throw ghoul::RuntimeError(std::format("Malformed epoch string '{}'", epoch));
}
const int daysSince2000 = countDays(date.year);
@@ -430,7 +430,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
std::string firstLine;
std::getline(f, firstLine);
if (f.bad() || firstLine[0] != '1') {
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Malformed TLE file '{}' at line {}", file, lineNum + 1
));
}
@@ -442,7 +442,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
const int year = std::atoi(y.c_str());
return year >= 57 ? "19" : "20";
}();
p.id = fmt::format("{}{}-{}", prefix, id.substr(0, 2), id.substr(3));
p.id = std::format("{}{}-{}", prefix, id.substr(0, 2), id.substr(3));
}
p.epoch = epochFromSubstring(firstLine.substr(18, 14)); // should be 13?
@@ -462,7 +462,7 @@ std::vector<Parameters> readTleFile(const std::filesystem::path& file) {
std::string secondLine;
std::getline(f, secondLine);
if (f.bad() || secondLine[0] != '2') {
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Malformed TLE file '{}' at line {}", file, lineNum + 1
));
}
@@ -534,7 +534,7 @@ std::vector<Parameters> readOmmFile(const std::filesystem::path& file) {
}
if (parts.size() != 2) {
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Malformed line '{}' at {}", line, lineNum
));
}
@@ -543,7 +543,7 @@ std::vector<Parameters> readOmmFile(const std::filesystem::path& file) {
if (parts[1] != "2.0") {
LWARNINGC(
"OMM",
fmt::format(
std::format(
"Only version 2.0 is currently supported but found {}. "
"Parsing might fail",
parts[1]
@@ -617,7 +617,7 @@ std::vector<Parameters> readSbdbFile(const std::filesystem::path& file) {
// Newer versions downloaded from the JPL SBDB website have " around variables
line.erase(remove(line.begin(), line.end(), '\"'), line.end());
if (line != ExpectedHeader) {
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Expected JPL SBDB file to start with '{}' but found '{}' instead",
ExpectedHeader, line.substr(0, 100)
));
@@ -629,7 +629,7 @@ std::vector<Parameters> readSbdbFile(const std::filesystem::path& file) {
std::vector<std::string> parts = ghoul::tokenizeString(line, ',');
if (parts.size() != NDataFields) {
throw ghoul::RuntimeError(fmt::format(
throw ghoul::RuntimeError(std::format(
"Malformed line {}, expected 8 data fields, got {}", line, parts.size()
));
}
@@ -742,7 +742,7 @@ std::optional<std::vector<Parameters>> loadCache(const std::filesystem::path& fi
std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
std::filesystem::path cachedFile = FileSys.cacheManager()->cachedFilename(file);
if (std::filesystem::is_regular_file(cachedFile)) {
LINFO(fmt::format(
LINFO(std::format(
"Cached file '{}' used for Kepler file '{}'", cachedFile, file
));
@@ -767,7 +767,7 @@ std::vector<Parameters> readFile(std::filesystem::path file, Format format) {
break;
}
LINFO(fmt::format("Saving cache '{}' for Kepler file '{}'", cachedFile, file));
LINFO(std::format("Saving cache '{}' for Kepler file '{}'", cachedFile, file));
saveCache(res, cachedFile);
return res;
}