mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 21:20:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/core/string-format.h

36 lines
1.1 KiB
C
Raw Normal View History

core: create string-format.cpp source file The mobile version of the list used string formatting functions defined in DiveObjectHelper and declared in mobilelistmodels.h. Very confusing. Move them to a separate source file where - in the long run - all the string-formatting functions, which are scattered all over the place, can be collected. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-14 21:42:07 +00:00
// SPDX-License-Identifier: GPL-2.0
// Various functions that format data into QStrings or QStringLists
#ifndef STRING_FORMAT_H
#define STRING_FORMAT_H
#include <QStringList>
struct dive;
formatting: move get_trip_title to string-format.h and split it To enable grouping by trip in the statistics module, split the get_trip_title() function in a version that appends a "(n dive(s)" string an one that doesn't. The statistics module doesn't want that added string, since it displays the number of dives in a different way. Also, move the functions to string-format.h, where these are collected. And rename them to camelCase. Yes, it's ugly, but consistent with most other C++ code in the code base. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-12-16 22:09:39 +00:00
struct dive_trip;
core: create string-format.cpp source file The mobile version of the list used string formatting functions defined in DiveObjectHelper and declared in mobilelistmodels.h. Very confusing. Move them to a separate source file where - in the long run - all the string-formatting functions, which are scattered all over the place, can be collected. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-14 21:42:07 +00:00
QString formatSac(const dive *d);
QString formatNotes(const dive *d);
QString format_gps_decimal(const dive *d);
QStringList formatGetCylinder(const dive *d);
QStringList formatStartPressure(const dive *d);
QStringList formatEndPressure(const dive *d);
QStringList formatFirstGas(const dive *d);
printing: remove DiveObjectHelper from printing code At this point (post grantlee), DiveObjectHelper is just pointless glue code. Let's remove it from the printing code and call the formatting functions directly. If necessary, move these functions to core/string-format.cpp. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-15 14:33:39 +00:00
QString formatGas(const dive *d);
core: create string-format.cpp source file The mobile version of the list used string formatting functions defined in DiveObjectHelper and declared in mobilelistmodels.h. Very confusing. Move them to a separate source file where - in the long run - all the string-formatting functions, which are scattered all over the place, can be collected. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-14 21:42:07 +00:00
QStringList formatFullCylinderList();
printing: remove DiveObjectHelperGrantlee This was a weird helper object, needed for grantlee. Instead of storing this object, loop over cylinders and dives directly. The actual accessor function is unchanged and now generates a DiveObjectHelper or DiveCylinderHelper for every variable access. Obviously, this is very inefficient. However, this will be replaced in future commits by direct calls to formatting functions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-14 22:21:58 +00:00
QStringList formatCylinders(const dive *d);
printing: remove DiveObjectHelper from printing code At this point (post grantlee), DiveObjectHelper is just pointless glue code. Let's remove it from the printing code and call the formatting functions directly. If necessary, move these functions to core/string-format.cpp. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-15 14:33:39 +00:00
QString formatSumWeight(const dive *d);
QString formatWeightList(const dive *d);
QStringList formatWeights(const dive *d);
QString formatDiveDuration(const dive *d);
QString formatDiveGPS(const dive *d);
QString formatDiveDate(const dive *d);
QString formatDiveTime(const dive *d);
mobile: remove DiveObjectHelper code When editing a dive, a DiveObjectHelper of the unmodified dive was created to compare the edited with the old values. Since the DiveObjectHelper is used here only as a pointless wrapper around the formatting functions, call these functions directly. However, note that the code is in principle wrong since the change to the mobile-models, which do not use the DiveObjectHelper. The real fix would be to reload the data from the model to prevent going out-of-sync with respect to the formatting routines! Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-15 15:10:08 +00:00
QString formatDiveDateTime(const dive *d);
cleanup: move formatting of gas type to string-format.cpp Since the only caller was C++ code, this can be done in C++ code, which removes memory-management headaches. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2023-03-17 07:21:47 +00:00
QString formatDiveGasString(const dive *d);
core: move formatting of day-of-week to string-format.cpp This was only used by the filter, but will also be used by the statistics module. To avoid duplicate translation strings, move to a common place. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-01 11:49:50 +00:00
QString formatDayOfWeek(int day);
cleanup: move minute formating to format-string.cpp The get_minutes() function formats a time as m:ss and returns a static C-string. Since all callers are C++ anyway and transform directly into QString, let us move this to the other string formatting function. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-09-03 08:37:58 +00:00
QString formatMinutes(int seconds);
formatting: move get_trip_title to string-format.h and split it To enable grouping by trip in the statistics module, split the get_trip_title() function in a version that appends a "(n dive(s)" string an one that doesn't. The statistics module doesn't want that added string, since it displays the number of dives in a different way. Also, move the functions to string-format.h, where these are collected. And rename them to camelCase. Yes, it's ugly, but consistent with most other C++ code in the code base. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-12-16 22:09:39 +00:00
QString formatTripTitle(const dive_trip *trip);
QString formatTripTitleWithDives(const dive_trip *trip);
core: create string-format.cpp source file The mobile version of the list used string formatting functions defined in DiveObjectHelper and declared in mobilelistmodels.h. Very confusing. Move them to a separate source file where - in the long run - all the string-formatting functions, which are scattered all over the place, can be collected. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-14 21:42:07 +00:00
#endif
Reference in a new issue Copy permalink