mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05: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
modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+8 -8
View File
@@ -160,7 +160,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
RenderFont(
*_font,
penPosition,
fmt::format(
std::format(
"{:4.0f} {:s} |{:s}>{:s}| {:.1f} %",
remainingConv.first,
remainingConv.second,
@@ -180,7 +180,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
RenderFont(
*_font,
penPosition,
fmt::format("Data acquisition time: {}", str),
std::format("Data acquisition time: {}", str),
glm::vec4(_activeColor.value(), 1.f),
ghoul::fontrendering::CrDirection::Down
);
@@ -203,7 +203,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
RenderFont(
*_font,
penPosition,
fmt::format(
std::format(
"Next image: [{:02d}:{:02d}:{:02d}]", tlh.count(), tlm.count(), tls.count()
),
targetColor,
@@ -234,7 +234,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
RenderFont(*_font, penPosition, " |", glm::vec4(0.3f, 0.3f, 0.3f, 1.f));
RenderFont(*_font,
penPosition,
fmt::format(" {:5s}", m.first),
std::format(" {:5s}", m.first),
glm::vec4(_activeColor.value(), 1.f),
ghoul::fontrendering::CrDirection::Down
);
@@ -244,7 +244,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
RenderFont(
*_font,
penPosition,
fmt::format(" {:5s}", m.first),
std::format(" {:5s}", m.first),
glm::vec4(0.3f, 0.3f, 0.3f, 1.f),
ghoul::fontrendering::CrDirection::Down
);
@@ -279,13 +279,13 @@ glm::vec2 DashboardItemInstruments::size() const {
size = addToBoundingbox(
size,
_font->boundingBox(
fmt::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100.f)
std::format("{:.0f} s {:s} {:.1f} %", remaining, progress, t * 100.f)
)
);
size = addToBoundingbox(
size,
_font->boundingBox(fmt::format("Data acquisition time: {}", str))
_font->boundingBox(std::format("Data acquisition time: {}", str))
);
}
const std::pair<double, std::string> nextTarget = sequencer.nextTarget(time);
@@ -323,7 +323,7 @@ glm::vec2 DashboardItemInstruments::size() const {
size = addToBoundingbox(
size,
_font->boundingBox(
fmt::format("Data acquisition adjacency: [{}:{}:{}]", hh, mm, ss)
std::format("Data acquisition adjacency: [{}:{}:{}]", hh, mm, ss)
)
);