mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
34e169aace
The SSRF_INFO() macro is widely used, and there's a lot of confusion about whether the newline at the end should be done by the SSRF_INFO or be in the format string passed to it. End result: we end up doing both, and there are empty lines in the output as a result. Clean this up by just using our existing 'strip_mb()' to strip any whitespace at the end of the generated string, and then adding one final newline when logging it. Also, make sure to log our 'report_error()' messages, which apparently only used to be showin in the red error bar on the display. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
187 lines
6.9 KiB
C++
187 lines
6.9 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef QTHELPER_H
|
|
#define QTHELPER_H
|
|
|
|
#include <libxslt/transform.h>
|
|
#include <libxslt/xsltutils.h>
|
|
#include "core/pref.h"
|
|
#include "subsurface-time.h"
|
|
|
|
struct picture;
|
|
struct dive_trip;
|
|
struct xml_params;
|
|
|
|
// 1) Types
|
|
|
|
enum watertypes {FRESHWATER, BRACKISHWATER, EN13319WATER, SALTWATER, DC_WATERTYPE};
|
|
|
|
// 2) Functions visible only to C++ parts
|
|
|
|
#ifdef __cplusplus
|
|
|
|
#include <QString>
|
|
#include "core/gettextfromc.h"
|
|
class QImage;
|
|
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
|
#define SKIP_EMPTY Qt::SkipEmptyParts
|
|
#else
|
|
#define SKIP_EMPTY QString::SkipEmptyParts
|
|
#endif
|
|
|
|
QString weight_string(int weight_in_grams);
|
|
QString distance_string(int distanceInMeters);
|
|
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);
|
|
QString get_gas_string(struct gasmix gas);
|
|
QStringList get_dive_gas_list(const struct dive *d);
|
|
QString get_taglist_string(struct tag_entry *tag_list);
|
|
QStringList stringToList(const QString &s);
|
|
void read_hashes();
|
|
void write_hashes();
|
|
QString thumbnailFileName(const QString &filename);
|
|
void learnPictureFilename(const QString &originalName, const QString &localName);
|
|
QString localFilePath(const QString &originalFilename);
|
|
int getCloudURL(QString &filename);
|
|
bool parseGpsText(const QString &gps_text, double *latitude, double *longitude);
|
|
void init_proxy();
|
|
QString getUUID();
|
|
QStringList getWaterTypesAsString();
|
|
extern const QStringList videoExtensionsList;
|
|
QStringList mediaExtensionFilters();
|
|
QStringList imageExtensionFilters();
|
|
QStringList videoExtensionFilters();
|
|
char *copy_qstring(const QString &);
|
|
QString get_depth_string(depth_t depth, bool showunit = false, bool showdecimal = true);
|
|
QString get_depth_string(int mm, bool showunit = false, bool showdecimal = true);
|
|
QString get_depth_unit(bool metric);
|
|
QString get_depth_unit(); // use preferences unit
|
|
QString get_weight_string(weight_t weight, bool showunit = false);
|
|
QString get_weight_unit(bool metric);
|
|
QString get_weight_unit(); // use preferences unit
|
|
QString get_temperature_string(temperature_t temp, bool showunit = false);
|
|
QString get_temp_unit(bool metric);
|
|
QString get_temp_unit(); // use preferences unit
|
|
QString get_volume_string(volume_t volume, bool showunit = false);
|
|
QString get_volume_string(int mliter, bool showunit = false);
|
|
QString get_volume_unit(bool metric);
|
|
QString get_volume_unit(); // use preferences unit
|
|
QString get_pressure_string(pressure_t pressure, bool showunit = false);
|
|
QString get_salinity_string(int salinity);
|
|
QString get_water_type_string(int salinity);
|
|
QString getSubsurfaceDataPath(QString folderToFind);
|
|
QString getPrintingTemplatePathUser();
|
|
QString getPrintingTemplatePathBundle();
|
|
int gettimezoneoffset();
|
|
QDateTime timestampToDateTime(timestamp_t when);
|
|
timestamp_t dateTimeToTimestamp(const QDateTime &t);
|
|
int parseDurationToSeconds(const QString &text);
|
|
int parseLengthToMm(const QString &text);
|
|
int parseTemperatureToMkelvin(const QString &text);
|
|
int parseWeightToGrams(const QString &text);
|
|
int parsePressureToMbar(const QString &text);
|
|
int parseGasMixO2(const QString &text);
|
|
int parseGasMixHE(const QString &text);
|
|
QString render_seconds_to_string(int seconds);
|
|
QString get_dive_duration_string(timestamp_t when, QString hoursText, QString minutesText, QString secondsText = gettextFromC::tr("sec"), QString separator = ":", bool isFreeDive = false);
|
|
QString get_dive_surfint_string(timestamp_t when, QString daysText, QString hoursText, QString minutesText, QString separator = " ", int maxdays = 4);
|
|
QString get_dive_date_string(timestamp_t when);
|
|
QString get_first_dive_date_string();
|
|
QString get_last_dive_date_string();
|
|
QString get_short_dive_date_string(timestamp_t when);
|
|
QString getUiLanguage();
|
|
void initUiLanguage();
|
|
QLocale getLocale();
|
|
QVector<QPair<QString, int>> selectedDivesGasUsed();
|
|
QString getUserAgent();
|
|
QString printGPSCoords(const location_t *loc);
|
|
std::vector<int> get_cylinder_map_for_remove(int count, int n);
|
|
std::vector<int> get_cylinder_map_for_add(int count, int n);
|
|
QImage renderSVGIcon(const char *id, int size, bool transparent);
|
|
QImage renderSVGIconWidth(const char *id, int size);
|
|
|
|
extern QString (*changesCallback)();
|
|
void uiNotification(const QString &msg);
|
|
|
|
#if defined __APPLE__
|
|
#define TITLE_OR_TEXT(_t, _m) "", _t + "\n" + _m
|
|
#else
|
|
#define TITLE_OR_TEXT(_t, _m) _t, _m
|
|
#endif
|
|
|
|
// Move a range in a vector to a different position.
|
|
// The parameters are given according to the usual STL-semantics:
|
|
// v: a container with STL-like random access iterator via std::begin(...)
|
|
// rangeBegin: index of first element
|
|
// rangeEnd: index one *past* last element
|
|
// destination: index to element before which the range will be moved
|
|
// Owing to std::begin() magic, this function works with STL-like containers:
|
|
// QVector<int> v{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
|
// moveInVector(v, 1, 4, 6);
|
|
// as well as with C-style arrays:
|
|
// int array[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
|
// moveInVector(array, 1, 4, 6);
|
|
// Both calls will have the following effect:
|
|
// Before: 0 1 2 3 4 5 6 7 8 9
|
|
// After: 0 4 5 1 2 3 6 7 8 9
|
|
// No sanitizing of the input arguments is performed.
|
|
template <typename Vector>
|
|
void moveInVector(Vector &v, int rangeBegin, int rangeEnd, int destination)
|
|
{
|
|
auto it = std::begin(v);
|
|
if (destination > rangeEnd)
|
|
std::rotate(it + rangeBegin, it + rangeEnd, it + destination);
|
|
else if (destination < rangeBegin)
|
|
std::rotate(it + destination, it + rangeBegin, it + rangeEnd);
|
|
}
|
|
#endif
|
|
|
|
// 3) Functions visible to C and C++
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct git_info;
|
|
|
|
char *printGPSCoordsC(const location_t *loc);
|
|
bool getProxyString(char **buffer);
|
|
bool canReachCloudServer(struct git_info *);
|
|
void updateWindowTitle();
|
|
void subsurface_mkdir(const char *dir);
|
|
char *get_file_name(const char *fileName);
|
|
void set_filename(const char *filename);
|
|
void copy_image_and_overwrite(const char *cfileName, const char *path, const char *cnewName);
|
|
char *move_away(const char *path);
|
|
const char *local_file_path(struct picture *picture);
|
|
char *cloud_url();
|
|
const char *normalize_cloud_name(const char *remote_in);
|
|
char *hashfile_name_string();
|
|
char *picturedir_string();
|
|
const char *subsurface_user_agent();
|
|
enum deco_mode decoMode(bool in_planner);
|
|
void parse_seabear_header(const char *filename, struct xml_params *params);
|
|
char *get_current_date();
|
|
time_t get_dive_datetime_from_isostring(char *when);
|
|
void print_qt_versions();
|
|
void lock_planner();
|
|
void unlock_planner();
|
|
xsltStylesheetPtr get_stylesheet(const char *name);
|
|
weight_t string_to_weight(const char *str);
|
|
depth_t string_to_depth(const char *str);
|
|
pressure_t string_to_pressure(const char *str);
|
|
volume_t string_to_volume(const char *str, pressure_t workp);
|
|
fraction_t string_to_fraction(const char *str);
|
|
char *get_changes_made();
|
|
void emit_reset_signal();
|
|
|
|
extern void report_info(const char *fmt, ...);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
// 4) SSRF_INFO macro to replace fprintf calls in our code
|
|
// (originally based on logging bits from libdivecomputer)
|
|
#define SSRF_INFO(fmt, ...) report_info(fmt, ##__VA_ARGS__)
|
|
|
|
#endif // QTHELPER_H
|