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

core: fold display.h into profile.h

Browse source 
The only things in display.h were profile related, so the
split between these two files is not comprehensible.
In fact profile.h includes display.h, because it needs the
struct defined therein. Let's just merge these two files.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-03-12 11:11:04 +01:00 • committed by Dirk Hohndel
parent 1496bbc314
commit f9b9582a64
22 changed files with 25 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/profile.h
View file

@ -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. */