Fix LandingComplexItems hamburger menu options #13645
Open
+15
−14
Conversation
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
Fixed an issue where the movement options in the MissionItemEditor's
hamburger menu for both fixed wing and VTOL LandingComplexItems only
moved the approach primitive instead of the entire complex item. This
happened because LandingComplexItem::setCoordinate method only
repositioned the approach item.
Modified LandingComplexItem::setCoordinate to take over the
functionality previously handled by the fixed-wing-only
moveLandingPosition method. The relevant logic has also been updated to
avoid unnecessary recalculations.
Other movement behaviors have been verified to be correct and remain
unchanged for both fixed wing and VTOL. In summary:
- FW landing patterns:
- Drag land primitive on map: Moves entire pattern (no change)
- Hamburger menu item movement options: Moves approach primitive
only (before), moves entire pattern (after)
- Landing point -> Set to vehicle location: Moves land primitive
only (no change)
- VTOL landing patterns:
- Drag land primitive on map: Moves land primitive only (no change)
- Hamburger menu item movement options: Moves approach primitive
only (before), moves entire pattern (after)
- Landing point -> Set to vehicle location: Moves land primitive
only (no change)
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where the MissionItemEditor's hamburger menu movement options for both fixed-wing and VTOL landing patterns only moved the approach primitive instead of the entire complex item. The fix consolidates movement logic by implementing setCoordinate in the base LandingComplexItem class to properly handle moving the entire pattern while preserving heading and distance.
Key changes:
- Implemented
LandingComplexItem::setCoordinateto move the entire complex item while preserving heading and distance relationships - Removed the fixed-wing-specific
moveLandingPositionmethod as its functionality is now handled bysetCoordinate - Updated FWLandingPatternMapVisual.qml to use the new
setCoordinatemethod for drag operations
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| LandingComplexItem.h | Changed setCoordinate from inline implementation to full method declaration |
| LandingComplexItem.cc | Implemented setCoordinate to preserve heading/distance while moving the landing coordinate |
| FixedWingLandingComplexItem.h | Removed Q_INVOKABLE moveLandingPosition method declaration |
| FixedWingLandingComplexItem.cc | Removed moveLandingPosition method implementation |
| FWLandingPatternMapVisual.qml | Changed land point drag handler to use setCoordinate instead of moveLandingPosition |
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.
Fix LandingComplexItems hamburger menu options
Description
Fixed an issue where the movement options in the MissionItemEditor's hamburger menu for both fixed wing and VTOL LandingComplexItems only moved the approach primitive instead of the entire complex item. This happened because LandingComplexItem::setCoordinate method only repositioned the approach item.
Modified LandingComplexItem::setCoordinate to take over the functionality previously handled by the fixed-wing-only moveLandingPosition method. The relevant logic has also been updated to avoid unnecessary recalculations.
Other movement behaviors have been verified to be correct and remain unchanged for both fixed wing and VTOL. In summary:
Checklist:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.