Show Waypoint Type in WaypointInfoWidget #1104
Draft
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
Contributor
lordfolken
commented
Jan 29, 2023
lordfolken
commented
|
Two questions:
|
|
Converting to draft. Windows doesn't compile. I have a proper implementation for that, but it ends up with an assertion: |
lordfolken
force-pushed
the
waypointtype
branch
from
6b975a1
to
4f21f65
Compare
|
I saw that there was another similar construct in dlgWaypointEdit.cpp will try to refactor. |
The Engine (and any low-level code) should not have anything UI or language related. |
| @@ -44,3 +45,26 @@ Waypoint::Project(const FlatProjection &projection) noexcept | |||
| flat_location_initialised = true; | |||
| #endif | |||
| } | |||
|
|
|||
| std::map<Waypoint::Type, tstring> Waypoint::TypeMap = { | |||
There was a problem hiding this comment.
What could be a simple plain array, initialised at compile-time into .rodata, is now a runtime-initialised std::map with lots of heap allocations, with a complicated lookup procedure.
| @@ -108,6 +108,8 @@ WaypointInfoWidget::Prepare(ContainerWindow &parent, | |||
| if (!waypoint->comment.empty()) | |||
| AddMultiLine(waypoint->comment.c_str()); | |||
|
|
|||
| AddReadOnly(_("Waypoint type"), nullptr, Waypoint::TypeMap[waypoint->type].c_str()); | |||
There was a problem hiding this comment.
This will crash if the type happens not to be in that std::map.
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.