From 12a13d722a914240bb553e0dad3e182ae371a45a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 8 Jun 2019 13:38:31 +0200 Subject: Undo: sort dives by dive_less_than() in signals In signals dives were sorted by date. This criterion is not be unique. Therefore sort by the dive_less_than() function of the core to avoid any inconsistencies between the Qt-models and the core data. Signed-off-by: Berthold Stoeger --- desktop-widgets/command_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'desktop-widgets/command_private.h') diff --git a/desktop-widgets/command_private.h b/desktop-widgets/command_private.h index a75ff9bba..1207e326f 100644 --- a/desktop-widgets/command_private.h +++ b/desktop-widgets/command_private.h @@ -15,6 +15,7 @@ namespace Command { // Generally, signals are sent in batches per trip. To avoid writing the same loop // again and again, this template takes a vector of trip / dive pairs, sorts it // by trip and then calls a function-object with trip and a QVector of dives in that trip. +// The dives are sorted by the dive_less_than() function defined in the core. // Input parameters: // - dives: a vector of trip,dive pairs, which will be sorted and processed in batches by trip. // - action: a function object, taking a trip-pointer and a QVector of dives, which will be called for each batch. @@ -24,7 +25,7 @@ void processByTrip(std::vector> &dives, Function // Use std::tie for lexicographical sorting of trip, then start-time std::sort(dives.begin(), dives.end(), [](const std::pair &e1, const std::pair &e2) - { return std::tie(e1.first, e1.second->when) < std::tie(e2.first, e2.second->when); }); + { return e1.first == e2.first ? dive_less_than(e1.second, e2.second) : e1.first < e2.first; }); // Then, process the dives in batches by trip size_t i, j; // Begin and end of batch -- cgit v1.2.3-70-g09d2