Move enum-to-text functions to enums.h to allow removal of Global digitalInputs and batteries #1790
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chriadam
reviewed
Dec 9, 2024
data/common/SystemBattery.qml
Outdated
| @@ -16,8 +16,9 @@ QtObject { | |||
| readonly property real current: _current.isValid ? _current.value : NaN | |||
| readonly property real temperature: _temperature.isValid ? _temperature.value : NaN | |||
| readonly property real timeToGo: _timeToGo.isValid ? _timeToGo.value : NaN | |||
| readonly property string icon: !!Global.batteries ? Global.batteries.batteryIcon(power) : "" | |||
| readonly property int mode: !!Global.batteries ? Global.batteries.batteryMode(power) : -1 | |||
| readonly property string icon: isNaN(power) || power === 0 ? "qrc:/images/icon_battery_24.svg" | |||
There was a problem hiding this comment.
given that you already have mode calculated below, can't you just have: icon: mode == Idle ? battery.svg : mode == Charging ? battery-charging.svg : battery-discharging.svg
There was a problem hiding this comment.
Yeah much nicer, updated.
chriadam
approved these changes
Dec 9, 2024
blammit
force-pushed
the
blam/reduce-global-models
branch
from
bc31ed1 to
c47c72a
Compare
It just provides static functions that can be moved to enums.h. Part of #1400
blammit
force-pushed
the
blam/reduce-global-models-2
branch
2 times, most recently
from
ae5bda1 to
6c2e886
Compare
blammit
force-pushed
the
blam/reduce-global-models-2
branch
from
6c2e886 to
2d66db1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.