From ab67a38ca5bc015d151ed16fab6adfcea7f3da1b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sun, 1 Nov 2020 01:41:53 -0800 Subject: [PATCH] Remove rounding from waypoint timing in the UI. This is behaving strangely on some machines. Stop hiding the details in the UI while we debug. --- qt_ui/widgets/ato.py | 7 ++----- qt_ui/widgets/map/QLiberationMap.py | 1 - qt_ui/windows/mission/QFlightItem.py | 3 +-- .../mission/flight/settings/QFlightDepartureDisplay.py | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qt_ui/widgets/ato.py b/qt_ui/widgets/ato.py index 897a1cec..44199d9b 100644 --- a/qt_ui/widgets/ato.py +++ b/qt_ui/widgets/ato.py @@ -64,8 +64,7 @@ class FlightDelegate(QStyledItemDelegate): count = flight.count name = db.unit_type_name(flight.unit_type) estimator = TotEstimator(self.package) - delay = datetime.timedelta( - seconds=int(estimator.mission_start_time(flight).total_seconds())) + delay = estimator.mission_start_time(flight) return f"[{task}] {count} x {name} in {delay}" def second_row_text(self, index: QModelIndex) -> str: @@ -329,9 +328,7 @@ class PackageDelegate(QStyledItemDelegate): def right_text(self, index: QModelIndex) -> str: package = self.package(index) - delay = datetime.timedelta( - seconds=int(package.time_over_target.total_seconds())) - return f"TOT T+{delay}" + return f"TOT T+{package.time_over_target}" def paint(self, painter: QPainter, option: QStyleOptionViewItem, index: QModelIndex) -> None: diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py index 1017619b..621e5970 100644 --- a/qt_ui/widgets/map/QLiberationMap.py +++ b/qt_ui/widgets/map/QLiberationMap.py @@ -349,7 +349,6 @@ class QLiberationMap(QGraphicsView): if time is None: tot = "" else: - time = datetime.timedelta(seconds=int(time.total_seconds())) tot = f"{prefix} T+{time}" pen = QPen(QColor("black"), 0.3) diff --git a/qt_ui/windows/mission/QFlightItem.py b/qt_ui/windows/mission/QFlightItem.py index 586ffea2..78966dbf 100644 --- a/qt_ui/windows/mission/QFlightItem.py +++ b/qt_ui/windows/mission/QFlightItem.py @@ -22,8 +22,7 @@ class QFlightItem(QStandardItem): self.setIcon(icon) self.setEditable(False) estimator = TotEstimator(self.package) - delay = datetime.timedelta( - seconds=int(estimator.mission_start_time(flight).total_seconds())) + delay = estimator.mission_start_time(flight) self.setText("["+str(self.flight.flight_type.name[:6])+"] " + str(self.flight.count) + " x " + db.unit_type_name(self.flight.unit_type) + " in " + str(delay)) diff --git a/qt_ui/windows/mission/flight/settings/QFlightDepartureDisplay.py b/qt_ui/windows/mission/flight/settings/QFlightDepartureDisplay.py index 982a1fbb..6d789585 100644 --- a/qt_ui/windows/mission/flight/settings/QFlightDepartureDisplay.py +++ b/qt_ui/windows/mission/flight/settings/QFlightDepartureDisplay.py @@ -19,8 +19,7 @@ class QFlightDepartureDisplay(QGroupBox): layout.addLayout(departure_row) estimator = TotEstimator(package) - delay = datetime.timedelta( - seconds=int(estimator.mission_start_time(flight).total_seconds())) + delay = estimator.mission_start_time(flight) departure_row.addWidget(QLabel( f"Departing from {flight.from_cp.name}"