Open
Conversation
reimplements fire overlay features so far with several optimizations. Less intrusive than drone-demo
Changed unordered_set to qset to reduce lines of code. Keeping std::queue because it can hold QPair by default.
just removing unnecessary triggers
fixed display issue when markers are removed.
changed some comments and white space.
improved mapFillScan() by consolidating BFS components. Added comments for coordinatelist functions. Removed refresh, it is a remnant from a visibility implementation. Added get to return lastUpdated for future use.
differentiated mapcontroller function calls. Now more explicitly for fire overlay functionality. Made sure adding fire markers cleared out smoke markers
The overlay now loads from the db file and saves on closing.
shows last updated when mousing over fire markers
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Adds a class in coordinatelist.h/cpp, which is a combined list and hashed map as a QAbstractList. This allows us to expose it to Qt and QML for display purposes directly in QmlMap.qml. Updates in mapcontroller.h/cpp to hold two coordinate lists, one for fire, one for smoke. Add functions: roundCoordinates, to round coordinates to work in a grid-like format; addOverlayMarker and removeOverlayMarker, to add or remove to/from the lists. Adds function mapFillScan to detect sets of coordinates entirely encircled by fire and fill them in. Finally, it adds a demo with several components for testing purposes. Edits QmlMap.qml to display the new mapviewlists, one for fire and one for smoke. Edits main.qml to add a view button, which is checked in QmlMap.qml for visibility, and can easily be retooled to check booleans in other qml files.