weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with waypoint editing.

Browse Source 
fix a number of regressions in the flight waypoint list by changing the
indexing and finding a work-around to blocking of signals

This PR addresses some (but not all) recently reported issues with the
waypoints screen reported in Issue #3188 . This PR was tested by:

- Changing the waypoint altitude and confirming it shows up correctly
when reloading the waypoint list window and on the map
- Adding a waypoint and confirming that it shows up immediately and
persists on reload
- Deleting a waypoint (except the first waypoint) and confirming that it
is removed immediately and persists on reload,

Known issues: first waypoint (typically hold) cannot be deleted -- still
looking into this one.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/3188.
This commit is contained in:
zhexu14 2023-10-11 12:05:57 +11:00 committed by GitHub
parent 990f1c37b8
commit 32b3793082
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@ -43,6 +43,8 @@ Saves from 8.x are not compatible with 9.0.0.
* **[UI]** Fixed UI bug where altering an "ahead of package" TOT offset would change the offset back to a "behind pacakge" offset. * **[UI]** Fixed UI bug where altering an "ahead of package" TOT offset would change the offset back to a "behind pacakge" offset.
* **[UI]** Fixed bug where changing TOT offsets could result in flight startup times that are in the past. * **[UI]** Fixed bug where changing TOT offsets could result in flight startup times that are in the past.
* **[UI]** Fixed odd spacing of the finance window when there were not enough items to fill the page. * **[UI]** Fixed odd spacing of the finance window when there were not enough items to fill the page.
* **[UI]** Fixed regression where waypoint altitude changes in the waypoint list screen are applied to the wrong waypoint.
* **[UI]** Fixed regression where waypoint additions in custom flight plans are not reflected until the window is reloaded.
# 8.1.0 # 8.1.0

80
qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py
View File

@ -53,46 +53,40 @@ class QFlightWaypointList(QTableView):
self.setItemDelegateForColumn(1, self.altitude_editor_delegate) self.setItemDelegateForColumn(1, self.altitude_editor_delegate)
def update_list(self) -> None: def update_list(self) -> None:
# ignore signals when updating list so on_changed does not fire # We need to keep just the row and rebuild the index later because the
self.model.blockSignals(True) # QModelIndex will not be valid after the model is cleared.
try: current_index = self.currentIndex().row()
# We need to keep just the row and rebuild the index later because the self.model.clear()
# QModelIndex will not be valid after the model is cleared.
current_index = self.currentIndex().row()
self.model.clear()
self.model.setHorizontalHeaderLabels(HEADER_LABELS) self.model.setHorizontalHeaderLabels(HEADER_LABELS)
waypoints = self.flight.flight_plan.waypoints waypoints = self.flight.flight_plan.waypoints
# Why [1:]? Qt starts indexing at 1 rather than 0, whereas DCS numbers # Why [1:]? Qt starts indexing at 1 rather than 0, whereas DCS numbers
# waypoints starting with 0, and for whatever reason Qt crashes whenever I # waypoints starting with 0, and for whatever reason Qt crashes whenever I
# set the vertical labels manually. # set the vertical labels manually.
# #
# Starting with the second waypoint is a bit of a hack, but it's also the # Starting with the second waypoint is a bit of a hack, but it's also the
# historical behavior anyway. This view used to have waypoints starting at 1 # historical behavior anyway. This view used to have waypoints starting at 1
# and just didn't show the departure waypoint because the departure waypoint # and just didn't show the departure waypoint because the departure waypoint
# wasn't actually part of the flight plan tracked by Liberation. That # wasn't actually part of the flight plan tracked by Liberation. That
# changed at some point, so now we need to skip it manually to preserve that # changed at some point, so now we need to skip it manually to preserve that
# behavior. # behavior.
# #
# It really ought to show the departure waypoint and start indexing at 0, # It really ought to show the departure waypoint and start indexing at 0,
# but since this all pending a move to React anyway, it's not worth fighting # but since this all pending a move to React anyway, it's not worth fighting
# the Qt crashes for now. # the Qt crashes for now.
# #
# https://github.com/dcs-liberation/dcs_liberation/issues/3037 # https://github.com/dcs-liberation/dcs_liberation/issues/3037
for row, waypoint in enumerate(waypoints[1:]): for row, waypoint in enumerate(waypoints[1:]):
self._add_waypoint_row(row, self.flight, waypoint) self._add_waypoint_row(row, self.flight, waypoint)
self.selectionModel().setCurrentIndex( self.selectionModel().setCurrentIndex(
self.model.index(current_index, 0), QItemSelectionModel.Select self.model.index(current_index, 0), QItemSelectionModel.Select
) )
self.resizeColumnsToContents() self.resizeColumnsToContents()
total_column_width = self.verticalHeader().width() + self.lineWidth() total_column_width = self.verticalHeader().width() + self.lineWidth()
for i in range(0, self.model.columnCount()): for i in range(0, self.model.columnCount()):
total_column_width += self.columnWidth(i) + self.lineWidth() total_column_width += self.columnWidth(i) + self.lineWidth()
self.setFixedWidth(total_column_width) self.setFixedWidth(total_column_width)
finally:
# stop ignoring signals
self.model.blockSignals(False)
def _add_waypoint_row( def _add_waypoint_row(
self, row: int, flight: Flight, waypoint: FlightWaypoint self, row: int, flight: Flight, waypoint: FlightWaypoint
@ -118,9 +112,13 @@ class QFlightWaypointList(QTableView):
def on_changed(self) -> None: def on_changed(self) -> None:
for i in range(self.model.rowCount()): for i in range(self.model.rowCount()):
altitude = self.model.item(i, 1).text() if self.model.item(i, 1) is not None:
altitude_feet = float(altitude) altitude = self.model.item(i, 1).text()
self.flight.flight_plan.waypoints[i].alt = Distance.from_feet(altitude_feet) altitude_feet = float(altitude)
# update waypoint index i+1 as rows are 1-indexed
self.flight.flight_plan.waypoints[i + 1].alt = Distance.from_feet(
altitude_feet
)
def tot_text(self, flight: Flight, waypoint: FlightWaypoint) -> str: def tot_text(self, flight: Flight, waypoint: FlightWaypoint) -> str:
if waypoint.waypoint_type == FlightWaypointType.TAKEOFF: if waypoint.waypoint_type == FlightWaypointType.TAKEOFF: