mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: optimize cylinderList() function

Browse source 
The cylinderList() function collects all cylinder descriptions.
Instead of adding all cylinders, then sort, then removed duplicates,
keep a sorted list and only add non-existing elements. Find
existing elements by a binary search.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-04 21:01:21 +02:00 • committed by Dirk Hohndel
parent eaf8a59edf
commit 52d8d89f73
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -213,27 +213,38 @@ QStringList getFirstGas(const dive *d)
return gas; return gas;
} }
// Add string to sorted QStringList, if it doesn't already exist and
// it isn't the empty string.
static void addStringToSortedList(QStringList &l, const char *s)
{
if (empty_string(s))
return;
// Do a binary search for the string. lower_bound() returns an iterator
// to either the searched-for element or the next higher element if it
// doesn't exist.
QString qs(s);
auto it = std::lower_bound(l.begin(), l.end(), qs); // TODO: use locale-aware sorting
if (it != l.end() && *it == s)
return;
// Add new string at sorted position
l.insert(it, s);
}
QStringList getFullCylinderList() QStringList getFullCylinderList()
{ {
QStringList cylinders; QStringList cylinders;
int i = 0;
struct dive *d; struct dive *d;
int i = 0;
for_each_dive (i, d) { for_each_dive (i, d) {
for (int j = 0; j < d->cylinders.nr; j++) { for (int j = 0; j < d->cylinders.nr; j++)
QString cyl = d->cylinders.cylinders[j].type.description; addStringToSortedList(cylinders, d->cylinders.cylinders[j].type.description);
cylinders << cyl;
}
} }
for (int ti = 0; ti < MAX_TANK_INFO && tank_info[ti].name != NULL; ti++) { for (int ti = 0; ti < MAX_TANK_INFO; ti++)
QString cyl = tank_info[ti].name; addStringToSortedList(cylinders, tank_info[ti].name);
if (cyl.isEmpty())
continue;
cylinders << cyl;
}
cylinders.removeDuplicates();
cylinders.sort();
return cylinders; return cylinders;
} }