Remove o2/he from plot_data and fix gas plot text

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>

3 files changed, 2 insertions, 10 deletions

diff --git a/profile.c b/profile.c
index 693b24697..a5c5d1120 100644
--- a/profile.c
+++ b/profile.c
@@ -840,8 +840,6 @@ static struct plot_data *populate_plot_entries(struct dive *dive, struct divecom
 		entry->po2 = sample->po2 / 1000.0;
 		/* FIXME! sensor index -> cylinder index translation! */
 		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;
 		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;
 	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;
 }
 
diff --git a/profile.h b/profile.h
index 0c5fd7d79..45e5a11fa 100644
--- a/profile.h
+++ b/profile.h
@@ -15,7 +15,6 @@ struct plot_info;
 struct plot_data {
 	unsigned int in_deco:1;
 	int cylinderindex;
-	int o2, he;
 	int sec;
 	/* pressure[0] is sensor pressure
 	 * pressure[1] is interpolated pressure */
diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index fe5d79b4e..07326f475 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -519,7 +519,8 @@ void ProfileGraphicsView::plot_cylinder_pressure_text()
 			if (!seen_cyl[cyl]) {
 				plot_pressure_value(mbar, entry->sec, LEFT, BOTTOM);
 				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;
 			}
 		}