diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index 512047884..e5c5d6767 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -218,7 +218,6 @@ HEADERS += \ core/configuredivecomputer.h \ core/datatrak.h \ core/deco.h \ - core/display.h \ core/divefilter.h \ core/filterconstraint.h \ core/filterpreset.h \ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 0e11d62d3..9dc2ddb8b 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -59,7 +59,6 @@ set(SUBSURFACE_CORE_LIB_SRCS device.h devicedetails.cpp devicedetails.h - display.h dive.c dive.h divecomputer.c diff --git a/core/display.h b/core/display.h deleted file mode 100644 index 989e23201..000000000 --- a/core/display.h +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef DISPLAY_H -#define DISPLAY_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* Plot info with smoothing, velocity indication - * and one-, two- and three-minute minimums and maximums */ -struct plot_info { - int nr; - int nr_cylinders; - int maxtime; - int meandepth, maxdepth; - int minpressure, maxpressure; - int minhr, maxhr; - int mintemp, maxtemp; - enum {AIR, NITROX, TRIMIX, FREEDIVING} dive_type; - double endtempcoord; - double maxpp; - bool waypoint_above_ceiling; - struct plot_data *entry; - struct plot_pressure_data *pressures; /* cylinders.nr blocks of nr entries. */ -}; - -#define AMB_PERCENTAGE 50.0 - -#ifdef __cplusplus -} -#endif - -#endif // DISPLAY_H diff --git a/core/equipment.c b/core/equipment.c index 685306981..3b6936ade 100644 --- a/core/equipment.c +++ b/core/equipment.c @@ -14,7 +14,6 @@ #include "equipment.h" #include "gettext.h" #include "dive.h" -#include "display.h" #include "divelist.h" #include "pref.h" #include "subsurface-string.h" diff --git a/core/gaspressures.c b/core/gaspressures.c index 5acbb038b..7661e40c6 100644 --- a/core/gaspressures.c +++ b/core/gaspressures.c @@ -21,7 +21,6 @@ #include "ssrf.h" #include "dive.h" #include "event.h" -#include "display.h" #include "profile.h" #include "gaspressures.h" #include "pref.h" diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index bcb88440a..281a99c3e 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -18,7 +18,6 @@ #include "subsurface-string.h" #include "device.h" #include "dive.h" -#include "display.h" #include "errorhelper.h" #include "event.h" #include "sha1.h" diff --git a/core/profile.c b/core/profile.c index 725fc3d09..49625746e 100644 --- a/core/profile.c +++ b/core/profile.c @@ -9,7 +9,6 @@ #include #include "dive.h" -#include "display.h" #include "divelist.h" #include "event.h" #include "interpolate.h" diff --git a/core/profile.h b/core/profile.h index 1bb5101a7..402b893cf 100644 --- a/core/profile.h +++ b/core/profile.h @@ -3,7 +3,6 @@ #define PROFILE_H #include "dive.h" -#include "display.h" #ifdef __cplusplus extern "C" { @@ -26,7 +25,6 @@ enum plot_pressure { struct membuffer; struct deco_state; struct divecomputer; -struct plot_info; /* * sensor data for a given cylinder @@ -78,6 +76,26 @@ struct plot_data { bool icd_warning; }; +/* Plot info with smoothing, velocity indication + * and one-, two- and three-minute minimums and maximums */ +struct plot_info { + int nr; + int nr_cylinders; + int maxtime; + int meandepth, maxdepth; + int minpressure, maxpressure; + int minhr, maxhr; + int mintemp, maxtemp; + enum {AIR, NITROX, TRIMIX, FREEDIVING} dive_type; + double endtempcoord; + double maxpp; + bool waypoint_above_ceiling; + struct plot_data *entry; + struct plot_pressure_data *pressures; /* cylinders.nr blocks of nr entries. */ +}; + +#define AMB_PERCENTAGE 50.0 + extern void compare_samples(const struct dive *d, const struct plot_info *pi, int idx1, int idx2, char *buf, int bufsize, bool sum); extern void init_plot_info(struct plot_info *pi); /* when planner_dc is non-null, this is called in planner mode. */ diff --git a/core/save-profiledata.c b/core/save-profiledata.c index 67ff8ddd7..32d534628 100644 --- a/core/save-profiledata.c +++ b/core/save-profiledata.c @@ -1,5 +1,4 @@ #include "core/profile.h" -#include "core/display.h" #include "core/errorhelper.h" #include "core/file.h" #include "core/membuffer.h" diff --git a/core/statistics.c b/core/statistics.c index eae7414d9..78e65a3eb 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -9,7 +9,6 @@ #include "statistics.h" #include "dive.h" -#include "display.h" #include "event.h" #include "gettext.h" #include "sample.h" diff --git a/core/uploadDiveLogsDE.cpp b/core/uploadDiveLogsDE.cpp index 07f799edf..c35f85061 100644 --- a/core/uploadDiveLogsDE.cpp +++ b/core/uploadDiveLogsDE.cpp @@ -5,7 +5,6 @@ #include #include #include -#include "core/display.h" #include "core/errorhelper.h" #include "core/qthelper.h" #include "core/dive.h" diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index e8af051a0..be0902fdb 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "desktop-widgets/configuredivecomputerdialog.h" -#include "core/display.h" #include "core/qthelper.h" #include "core/settings/qPrefDiveComputer.h" #include "desktop-widgets/mainwindow.h" diff --git a/desktop-widgets/divesiteimportdialog.cpp b/desktop-widgets/divesiteimportdialog.cpp index c16918809..2834eaf7e 100644 --- a/desktop-widgets/divesiteimportdialog.cpp +++ b/desktop-widgets/divesiteimportdialog.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "desktop-widgets/divesiteimportdialog.h" #include "commands/command.h" -#include "core/display.h" #include "core/qthelper.h" #include "core/metrics.h" #include "core/subsurface-string.h" diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 55ad07c3c..a123935d3 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "desktop-widgets/downloadfromdivecomputer.h" #include "commands/command.h" -#include "core/display.h" #include "core/qthelper.h" #include "core/divelist.h" #include "core/settings/qPrefDiveComputer.h" diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 84a8fee6d..7a620a4d3 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -10,7 +10,6 @@ #include "core/dive.h" #include "core/qthelper.h" #include "core/statistics.h" -#include "core/display.h" #include "core/divelist.h" #define COMBO_CHANGED 0 diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 9389e8548..43e32722a 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/divecartesianaxis.h" #include "profile-widget/divetextitem.h" +#include "core/profile.h" #include "core/qthelper.h" #include "core/subsurface-string.h" #include "profile-widget/animationfunctions.h" diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index 3a0a4de58..6696bfa17 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/divetooltipitem.h" #include "profile-widget/divecartesianaxis.h" -#include "core/profile.h" #include "core/membuffer.h" #include "core/metrics.h" #include "core/settings/qPrefDisplay.h" diff --git a/profile-widget/divetooltipitem.h b/profile-widget/divetooltipitem.h index ff6218c47..aa7155463 100644 --- a/profile-widget/divetooltipitem.h +++ b/profile-widget/divetooltipitem.h @@ -9,8 +9,9 @@ #include #include #include "backend-shared/roundrectitem.h" -#include "core/display.h" +#include "core/profile.h" +struct dive; class DiveCartesianAxis; class QGraphicsLineItem; class QGraphicsSimpleTextItem; diff --git a/profile-widget/profilescene.h b/profile-widget/profilescene.h index a222a37c8..61d97fc0d 100644 --- a/profile-widget/profilescene.h +++ b/profile-widget/profilescene.h @@ -5,7 +5,7 @@ #define PROFILESCENE_H #include "core/color.h" -#include "core/display.h" +#include "core/profile.h" #include #include diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp index e5a420d34..d3f96d488 100644 --- a/profile-widget/ruleritem.cpp +++ b/profile-widget/ruleritem.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/ruleritem.h" #include "profile-widget/profilewidget2.h" -#include "core/display.h" #include "core/settings/qPrefTechnicalDetails.h" #include diff --git a/profile-widget/ruleritem.h b/profile-widget/ruleritem.h index 182303c17..8bac82bd9 100644 --- a/profile-widget/ruleritem.h +++ b/profile-widget/ruleritem.h @@ -6,7 +6,7 @@ #include #include #include "profile-widget/divecartesianaxis.h" -#include "core/display.h" +#include "core/profile.h" struct plot_data; class RulerItem2; diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index a5fae4520..fc0ed9396 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 #include "qt-models/filtermodels.h" -#include "core/display.h" #include "core/qthelper.h" #include "core/trip.h" #include "core/subsurface-string.h"