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

Remove o2/he from plot_data and fix gas plot text

Browse source 
plot_data.o2 and plot_data.he was wrong for all dives, due to that
cylinderindex was set right first in populate_pressure_information, and
thus those two contained bogus information.
This makes the plot-text use cylinderindex-lookup as everything else.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2013-09-22 23:21:01 +02:00 • committed by Dirk Hohndel
parent dba16202c4
commit 0c9e6f9acc
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
profile.c
View file

@ -840,8 +840,6 @@ static struct plot_data *populate_plot_entries(struct dive *dive, struct divecom
entry->po2 = sample->po2 / 1000.0; entry->po2 = sample->po2 / 1000.0;
/* FIXME! sensor index -> cylinder index translation! */ /* FIXME! sensor index -> cylinder index translation! */
entry->cylinderindex = sample->sensor; entry->cylinderindex = sample->sensor;
entry->o2 = dive->cylinder[entry->cylinderindex].gasmix.o2.permille;
entry->he = dive->cylinder[entry->cylinderindex].gasmix.he.permille;
SENSOR_PRESSURE(entry) = sample->cylinderpressure.mbar; SENSOR_PRESSURE(entry) = sample->cylinderpressure.mbar;
entry->temperature = sample->temperature.mkelvin; entry->temperature = sample->temperature.mkelvin;
@ -855,12 +853,6 @@ static struct plot_data *populate_plot_entries(struct dive *dive, struct divecom
plot_data[idx++].sec = lasttime+20; plot_data[idx++].sec = lasttime+20;
pi->nr = idx; pi->nr = idx;
/* make sure the first two entries have the correct gas */
plot_data[0].o2 = plot_data[2].o2;
plot_data[0].he = plot_data[2].he;
plot_data[1].o2 = plot_data[2].o2;
plot_data[1].he = plot_data[2].he;
return plot_data; return plot_data;
} }

1
profile.h
View file

@ -15,7 +15,6 @@ struct plot_info;
struct plot_data { struct plot_data {
unsigned int in_deco:1; unsigned int in_deco:1;
int cylinderindex; int cylinderindex;
int o2, he;
int sec; int sec;
/* pressure[0] is sensor pressure /* pressure[0] is sensor pressure
* pressure[1] is interpolated pressure */ * pressure[1] is interpolated pressure */

3
qt-ui/profilegraphics.cpp
View file

@ -519,7 +519,8 @@ void ProfileGraphicsView::plot_cylinder_pressure_text()
if (!seen_cyl[cyl]) { if (!seen_cyl[cyl]) {
plot_pressure_value(mbar, entry->sec, LEFT, BOTTOM); plot_pressure_value(mbar, entry->sec, LEFT, BOTTOM);
plot_gas_value(mbar, entry->sec, LEFT, TOP, plot_gas_value(mbar, entry->sec, LEFT, TOP,
entry->o2, entry->he); get_o2(&dive->cylinder[cyl].gasmix),
get_he(&dive->cylinder[cyl].gasmix));
seen_cyl[cyl] = TRUE; seen_cyl[cyl] = TRUE;
} }
} }