mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
8f0c8be245
Interpolated lines for tank pressures were presenting discontinuities (sudden drops) and stalls (horizontal lines) with certain dive profiles. The main reason seems to be that the discrete interpolation of tank pressure was adding small pressure increments that could be rounded down or up repeatedly generating cumulative rounding errors that would mean either a delay on pressure drop that would be drawn as a sudden drop or as a premature pressure drop that would result in a flat line. This patch changes the way the discrete interpolation is done, so that we don't have cumulative rounding errors distorting tank pressure lines. To calculate accumulated pressure_time values the get_pr_interpolate_data function was created. The fact that get_pr_interpolate_data transverses the beginning of the plot_info entry list for each entry that needs interpolated tank pressure isn't optimal at all. There might be a way to properly track the data necessary to interpolate tank pressures from inside the main pi->entry loop in fill_missing_tank_pressures. Unfortunately I didn't manage to do it inside fill_missing_tank_pressures so we have get_pr_interpolate_data. The SURFACE_THRESHOLD test from pressure_time function was also removed as no matter how shallow the diver is, if he is using the cylinder to breathe the cylinders tank pressure should be affected. Signed-off-by: Rodrigo Severo <rodrigo@fabricadeideias.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
120 lines
3.2 KiB
C
120 lines
3.2 KiB
C
#ifndef PROFILE_H
|
|
#define PROFILE_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t;
|
|
|
|
struct divecomputer;
|
|
struct graphics_context;
|
|
struct plot_info;
|
|
struct plot_data {
|
|
unsigned int in_deco:1;
|
|
int cylinderindex;
|
|
int sec;
|
|
/* pressure[0] is sensor pressure
|
|
* pressure[1] is interpolated pressure */
|
|
int pressure[2];
|
|
int temperature;
|
|
/* Depth info */
|
|
int depth;
|
|
int ceiling;
|
|
int ceilings[16];
|
|
int ndl;
|
|
int stoptime;
|
|
int stopdepth;
|
|
int cns;
|
|
int smoothed;
|
|
int sac;
|
|
double po2, pn2, phe;
|
|
double mod, ead, end, eadd;
|
|
velocity_t velocity;
|
|
int speed;
|
|
struct plot_data *min[3];
|
|
struct plot_data *max[3];
|
|
int avg[3];
|
|
/* values calculated by us */
|
|
unsigned int in_deco_calc:1;
|
|
int ndl_calc;
|
|
int tts_calc;
|
|
int stoptime_calc;
|
|
int stopdepth_calc;
|
|
int pressure_time;
|
|
};
|
|
|
|
void calculate_max_limits(struct dive *dive, struct divecomputer *dc, struct graphics_context *gc);
|
|
struct plot_info *create_plot_info(struct dive *dive, struct divecomputer *dc, struct graphics_context *gc, bool print_mode);
|
|
int setup_temperature_limits(struct graphics_context *gc);
|
|
int get_cylinder_pressure_range(struct graphics_context *gc);
|
|
void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum);
|
|
|
|
struct ev_select {
|
|
char *ev_name;
|
|
bool plot_ev;
|
|
};
|
|
|
|
/*
|
|
* When showing dive profiles, we scale things to the
|
|
* current dive. However, we don't scale past less than
|
|
* 30 minutes or 90 ft, just so that small dives show
|
|
* up as such unless zoom is enabled.
|
|
* We also need to add 180 seconds at the end so the min/max
|
|
* plots correctly
|
|
*/
|
|
int get_maxtime(struct plot_info *pi);
|
|
|
|
/* get the maximum depth to which we want to plot
|
|
* take into account the additional verical space needed to plot
|
|
* partial pressure graphs */
|
|
int get_maxdepth(struct plot_info *pi);
|
|
|
|
void setup_pp_limits(struct graphics_context *gc);
|
|
|
|
|
|
#define ALIGN_LEFT 1
|
|
#define ALIGN_RIGHT 2
|
|
#define INVISIBLE 4
|
|
#define UNSORTABLE 8
|
|
#define EDITABLE 16
|
|
|
|
#ifndef TEXT_SCALE
|
|
#define TEXT_SCALE 1.0
|
|
#endif
|
|
|
|
#define DEPTH_TEXT_SIZE (12 * TEXT_SCALE)
|
|
#define PRESSURE_TEXT_SIZE (12 * TEXT_SCALE)
|
|
#define DC_TEXT_SIZE (12 * TEXT_SCALE)
|
|
#define PP_TEXT_SIZE (12 * TEXT_SCALE)
|
|
#define TEMP_TEXT_SIZE (12 * TEXT_SCALE)
|
|
|
|
#define RIGHT (-1.0)
|
|
#define CENTER (-0.5)
|
|
#define LEFT (0.0)
|
|
|
|
#define LINE_DOWN (1)
|
|
#define TOP (0)
|
|
#define MIDDLE (-0.5)
|
|
#define BOTTOM (-1)
|
|
|
|
#define SCALEXGC(x) (((x) - gc.leftx) / (gc.rightx - gc.leftx) * gc.maxx)
|
|
#define SCALEYGC(y) (((y) - gc.topy) / (gc.bottomy - gc.topy) * gc.maxy)
|
|
#define SCALEGC(x,y) SCALEXGC(x),SCALEYGC(y)
|
|
|
|
#define SCALEX(gc,x) (((x)-gc->leftx)/(gc->rightx-gc->leftx)*gc->maxx)
|
|
#define SCALEY(gc,y) (((y)-gc->topy)/(gc->bottomy-gc->topy)*gc->maxy)
|
|
#define SCALE(gc,x,y) SCALEX(gc,x),SCALEY(gc,y)
|
|
|
|
#define SENSOR_PR 0
|
|
#define INTERPOLATED_PR 1
|
|
#define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]
|
|
#define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR]
|
|
#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? SENSOR_PRESSURE(_entry) : INTERPOLATED_PRESSURE(_entry))
|
|
|
|
#define SAC_WINDOW 45 /* sliding window in seconds for current SAC calculation */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|