diff options
| author |  Jan Schubert <Jan.Schubert@GMX.li> | 2013-01-15 18:39:28 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-01-15 10:13:33 -0800 |
| commit | 322410a8455fd63e02d9d495cfc8cc3240fc7225 (patch) | |
| tree | 2755972cdc3e67ff77c8df6fb2e7e077a0762482 | |
| parent | 3b7d68c091ae45b5de0aa2293afa92381111a76b (diff) | |
| download | subsurface-322410a8455fd63e02d9d495cfc8cc3240fc7225.tar.gz | |
Trivial pressure related fixes
This patch removes the need for the "string" pressurebuf in planner.c.
It also adds a unit to the partial pressures displayed in the mouse
overlay which are always displayed in bar.
BTW: Has anyone seen a pO2 shown in PSI?
Signed-off-by: Jan Schubert <Jan.Schubert@GMX.li>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | planner.c | 3 | ||||
| -rw-r--r-- | profile.c | 6 |
2 files changed, 4 insertions, 5 deletions
@@ -921,7 +921,6 @@ void input_plan() { GtkWidget *planner, *content, *vbox, *hbox, *outervbox, *add_row, *deltat, *label, *surfpres; char starttimebuf[64] = "+60:00"; - char pressurebuf[64] = SURFACE_PRESSURE_STRING; if (diveplan.dp) free_dps(diveplan.dp); @@ -958,7 +957,7 @@ void input_plan() g_signal_connect(deltat, "focus-out-event", G_CALLBACK(starttime_focus_out_cb), NULL); surfpres = add_entry_to_box(hbox, _("Surface Pressure (mbar)")); gtk_entry_set_max_length(GTK_ENTRY(surfpres), 12); - gtk_entry_set_text(GTK_ENTRY(surfpres), pressurebuf); + gtk_entry_set_text(GTK_ENTRY(surfpres), SURFACE_PRESSURE_STRING); gtk_widget_add_events(surfpres, GDK_FOCUS_CHANGE_MASK); g_signal_connect(surfpres, "focus-out-event", G_CALLBACK(surfpres_focus_out_cb), NULL); diveplan.when = current_time_notz() + 3600; @@ -2149,15 +2149,15 @@ static void plot_string(struct plot_data *entry, char *buf, size_t bufsize, } if (prefs.pp_graphs.po2) { memcpy(buf2, buf, bufsize); - snprintf(buf, bufsize, "%s\npO" UTF8_SUBSCRIPT_2 ":%.2f", buf2, entry->po2); + snprintf(buf, bufsize, "%s\npO" UTF8_SUBSCRIPT_2 ":%.2fbar", buf2, entry->po2); } if (prefs.pp_graphs.pn2) { memcpy(buf2, buf, bufsize); - snprintf(buf, bufsize, "%s\npN" UTF8_SUBSCRIPT_2 ":%.2f", buf2, entry->pn2); + snprintf(buf, bufsize, "%s\npN" UTF8_SUBSCRIPT_2 ":%.2fbar", buf2, entry->pn2); } if (prefs.pp_graphs.phe) { memcpy(buf2, buf, bufsize); - snprintf(buf, bufsize, "%s\npHe:%.2f", buf2, entry->phe); + snprintf(buf, bufsize, "%s\npHe:%.2fbar", buf2, entry->phe); } if (prefs.mod) { mod = (int)get_depth_units(entry->mod, NULL, &depth_unit); |