mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-27 23:39:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code Cleanup (#2191)

Browse Source 
* constexpr const -> constexpr
* const char* -> std::string_view
This commit is contained in:
Alexander Bock
2022-07-25 15:57:45 +02:00
committed by GitHub
parent ea1f4bbf40
commit 9cc4c595a8
267 changed files with 1425 additions and 1565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/base/dashboard/dashboarditemsimulationincrement.cpp
View File

@@ -77,7 +77,9 @@ namespace {
openspace::TimeUnits.begin(),
openspace::TimeUnits.end(),
res.begin(),
[](openspace::TimeUnit unit) -> std::string { return nameForTimeUnit(unit); }
[](openspace::TimeUnit unit) -> std::string {
return std::string(nameForTimeUnit(unit));
}
);
return res;
}
@@ -131,7 +133,7 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
addProperty(_doSimplification);
for (TimeUnit u : TimeUnits) {
_requestedUnit.addOption(static_cast<int>(u), nameForTimeUnit(u));
_requestedUnit.addOption(static_cast<int>(u), std::string(nameForTimeUnit(u)));
}
_requestedUnit = static_cast<int>(TimeUnit::Second);
if (p.requestedUnit.has_value()) {
@@ -165,11 +167,17 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
const TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
const double convTarget = convertTime(targetDt, TimeUnit::Second, unit);
targetDeltaTime = { convTarget, nameForTimeUnit(unit, convTarget != 1.0) };
targetDeltaTime = {
convTarget,
std::string(nameForTimeUnit(unit, convTarget != 1.0))
};
if (targetDt != currentDt) {
const double convCurrent = convertTime(currentDt, TimeUnit::Second, unit);
currentDeltaTime = { convCurrent, nameForTimeUnit(unit, convCurrent != 1.0) };
currentDeltaTime = {
convCurrent,
std::string(nameForTimeUnit(unit, convCurrent != 1.0))
};
}
}
@@ -217,7 +225,10 @@ glm::vec2 DashboardItemSimulationIncrement::size() const {
else {
TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
double convertedT = convertTime(t, TimeUnit::Second, unit);
deltaTime = { convertedT, nameForTimeUnit(unit, convertedT != 1.0) };
deltaTime = {
convertedT,
std::string(nameForTimeUnit(unit, convertedT != 1.0))
};
}
return _font->boundingBox(