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

planner: use std::string in plannernotes.cpp

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-08 10:44:20 +01:00 • committed by bstoeger
parent 8b51ff7ded
commit 4db19d6284
5 changed files with 120 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/planner.h
View file

@ -48,7 +48,6 @@ extern int get_cylinderid_at_time(struct dive *dive, struct divecomputer *dc, du
extern bool diveplan_empty(struct diveplan *diveplan); extern bool diveplan_empty(struct diveplan *diveplan);
extern void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error); extern void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error);
extern const char *get_planner_disclaimer(); extern const char *get_planner_disclaimer();
extern char *get_planner_disclaimer_formatted();
extern void free_dps(struct diveplan *diveplan); extern void free_dps(struct diveplan *diveplan);
@ -64,6 +63,8 @@ struct decostop {
#ifdef __cplusplus #ifdef __cplusplus
} }
#include <string>
extern std::string get_planner_disclaimer_formatted();
extern bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, int timestep, struct decostop *decostoptable, deco_state_cache &cache, bool is_planner, bool show_disclaimer); extern bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, int timestep, struct decostop *decostoptable, deco_state_cache &cache, bool is_planner, bool show_disclaimer);
#endif #endif
#endif // PLANNER_H #endif // PLANNER_H

235
core/plannernotes.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* plannernotes.cpp /* plannernotes.cpp
* *
* code that allows us to plan future dives * format notes describing a dive plan
* *
* (c) Dirk Hohndel 2013 * (c) Dirk Hohndel 2013
*/ */
@ -19,8 +19,8 @@
#include "libdivecomputer/parser.h" #include "libdivecomputer/parser.h"
#include "qthelper.h" #include "qthelper.h"
#include "format.h" #include "format.h"
#include "subsurface-string.h"
#include "version.h" #include "version.h"
#include "membuffer.h"
static int diveplan_duration(struct diveplan *diveplan) static int diveplan_duration(struct diveplan *diveplan)
{ {
@ -47,21 +47,22 @@ static int diveplan_duration(struct diveplan *diveplan)
* 5) Pointers to gas mixes in the gas change: gas-from and gas-to. * 5) Pointers to gas mixes in the gas change: gas-from and gas-to.
* Returns: The size of the output buffer that has been used after the new results have been added. * Returns: The size of the output buffer that has been used after the new results have been added.
*/ */
static void add_icd_entry(struct membuffer *b, struct icd_data *icdvalues, bool printheader, int time_seconds, int ambientpressure_mbar, struct gasmix gas_from, struct gasmix gas_to) static std::string icd_entry(struct icd_data *icdvalues, bool printheader, int time_seconds, int ambientpressure_mbar, struct gasmix gas_from, struct gasmix gas_to)
{ {
std::string b;
if (printheader) { // Create a table description and a table header if no icd data have been written yet. if (printheader) { // Create a table description and a table header if no icd data have been written yet.
put_format(b, "<div>%s:", translate("gettextFromC","Isobaric counterdiffusion information")); b += format_string_std("<div>%s:", translate("gettextFromC","Isobaric counterdiffusion information"));
put_format(b, "<table><tr><td align='left'><b>%s</b></td>", translate("gettextFromC", "runtime")); b += format_string_std("<table><tr><td align='left'><b>%s</b></td>", translate("gettextFromC", "runtime"));
put_format(b, "<td align='center'><b>%s</b></td>", translate("gettextFromC", "gaschange")); b += format_string_std("<td align='center'><b>%s</b></td>", translate("gettextFromC", "gaschange"));
put_format(b, "<td style='padding-left: 15px;'><b>%s</b></td>", translate("gettextFromC", "&#916;He")); b += format_string_std("<td style='padding-left: 15px;'><b>%s</b></td>", translate("gettextFromC", "&#916;He"));
put_format(b, "<td style='padding-left: 20px;'><b>%s</b></td>", translate("gettextFromC", "&#916;N&#8322;")); b += format_string_std("<td style='padding-left: 20px;'><b>%s</b></td>", translate("gettextFromC", "&#916;N&#8322;"));
put_format(b, "<td style='padding-left: 10px;'><b>%s</b></td></tr>", translate("gettextFromC", "max &#916;N&#8322;")); b += format_string_std("<td style='padding-left: 10px;'><b>%s</b></td></tr>", translate("gettextFromC", "max &#916;N&#8322;"));
} // Add one entry to the icd table: } // Add one entry to the icd table:
put_format_loc(b, b += casprintf_loc(
"<tr><td rowspan='2' style= 'vertical-align:top;'>%3d%s</td>" "<tr><td rowspan='2' style= 'vertical-align:top;'>%3d%s</td>"
"<td rowspan=2 style= 'vertical-align:top;'>%s&#10137;", "<td rowspan=2 style= 'vertical-align:top;'>%s&#10137;",
(time_seconds + 30) / 60, translate("gettextFromC", "min"), gasname(gas_from)); (time_seconds + 30) / 60, translate("gettextFromC", "min"), gasname(gas_from));
put_format_loc(b, b += casprintf_loc(
"%s</td><td style='padding-left: 10px;'>%+5.1f%%</td>" "%s</td><td style='padding-left: 10px;'>%+5.1f%%</td>"
"<td style= 'padding-left: 15px; color:%s;'>%+5.1f%%</td>" "<td style= 'padding-left: 15px; color:%s;'>%+5.1f%%</td>"
"<td style='padding-left: 15px;'>%+5.1f%%</td></tr>" "<td style='padding-left: 15px;'>%+5.1f%%</td></tr>"
@ -73,6 +74,7 @@ static void add_icd_entry(struct membuffer *b, struct icd_data *icdvalues, bool
ambientpressure_mbar * icdvalues->dHe / 1e6f, translate("gettextFromC", "bar"), ((5 * icdvalues->dN2) > -icdvalues->dHe) ? "red" : "#383838", ambientpressure_mbar * icdvalues->dHe / 1e6f, translate("gettextFromC", "bar"), ((5 * icdvalues->dN2) > -icdvalues->dHe) ? "red" : "#383838",
ambientpressure_mbar * icdvalues->dN2 / 1e6f, translate("gettextFromC", "bar"), ambientpressure_mbar * icdvalues->dN2 / 1e6f, translate("gettextFromC", "bar"),
ambientpressure_mbar * -icdvalues->dHe / 5e6f, translate("gettextFromC", "bar")); ambientpressure_mbar * -icdvalues->dHe / 5e6f, translate("gettextFromC", "bar"));
return b;
} }
extern "C" const char *get_planner_disclaimer() extern "C" const char *get_planner_disclaimer()
@ -84,19 +86,17 @@ extern "C" const char *get_planner_disclaimer()
} }
/* Returns newly allocated buffer. Must be freed by caller */ /* Returns newly allocated buffer. Must be freed by caller */
extern "C" char *get_planner_disclaimer_formatted() extern std::string get_planner_disclaimer_formatted()
{ {
struct membuffer buf = { 0 };
const char *deco = decoMode(true) == VPMB ? translate("gettextFromC", "VPM-B") const char *deco = decoMode(true) == VPMB ? translate("gettextFromC", "VPM-B")
: translate("gettextFromC", "BUHLMANN"); : translate("gettextFromC", "BUHLMANN");
put_format(&buf, get_planner_disclaimer(), deco); return format_string_std(get_planner_disclaimer(), deco);
return detach_cstring(&buf);
} }
extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error) extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_disclaimer, int error)
{ {
struct membuffer buf = { 0 }; std::string buf;
struct membuffer icdbuf = { 0 }; std::string icdbuf;
const char *segmentsymbol; const char *segmentsymbol;
int lastdepth = 0, lasttime = 0, lastsetpoint = -1, newdepth = 0, lastprintdepth = 0, lastprintsetpoint = -1; int lastdepth = 0, lasttime = 0, lastsetpoint = -1, newdepth = 0, lastprintdepth = 0, lastprintsetpoint = -1;
struct gasmix lastprintgasmix = gasmix_invalid; struct gasmix lastprintgasmix = gasmix_invalid;
@ -115,69 +115,68 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
struct divedatapoint *nextdp = NULL; struct divedatapoint *nextdp = NULL;
struct divedatapoint *lastbottomdp = NULL; struct divedatapoint *lastbottomdp = NULL;
struct icd_data icdvalues; struct icd_data icdvalues;
char *temp;
if (!dp) if (!dp)
return; return;
if (error) { if (error) {
put_format(&buf, "<span style='color: red;'>%s </span> %s<br/>", buf += format_string_std("<span style='color: red;'>%s </span> %s<br/>",
translate("gettextFromC", "Warning:"), translate("gettextFromC", "Warning:"),
translate("gettextFromC", "Decompression calculation aborted due to excessive time")); translate("gettextFromC", "Decompression calculation aborted due to excessive time"));
goto finished; // TODO: avoid copy
free(dive->notes);
dive->notes = strdup(buf.c_str());
return;
} }
if (show_disclaimer) { if (show_disclaimer) {
char *disclaimer = get_planner_disclaimer_formatted(); buf += "<div><b>";
put_string(&buf, "<div><b>"); buf += get_planner_disclaimer_formatted();
put_string(&buf, disclaimer); buf += "</b><br/>\n</div>\n";
put_string(&buf, "</b><br/>\n</div>\n");
free(disclaimer);
} }
put_string(&buf, "<div>\n<b>"); buf += "<div>\n<b>";
if (diveplan->surface_interval < 0) { if (diveplan->surface_interval < 0) {
put_format(&buf, "%s (%s) %s", buf += format_string_std("%s (%s) %s",
translate("gettextFromC", "Subsurface"), translate("gettextFromC", "Subsurface"),
subsurface_canonical_version(), subsurface_canonical_version(),
translate("gettextFromC", "dive plan</b> (overlapping dives detected)")); translate("gettextFromC", "dive plan</b> (overlapping dives detected)"));
goto finished; // TODO: avoid copy
free(dive->notes);
dive->notes = strdup(buf.c_str());
return;
} else if (diveplan->surface_interval >= 48 * 60 *60) { } else if (diveplan->surface_interval >= 48 * 60 *60) {
char *current_date = get_current_date(); buf += format_string_std("%s (%s) %s %s",
put_format(&buf, "%s (%s) %s %s",
translate("gettextFromC", "Subsurface"), translate("gettextFromC", "Subsurface"),
subsurface_canonical_version(), subsurface_canonical_version(),
translate("gettextFromC", "dive plan</b> created on"), translate("gettextFromC", "dive plan</b> created on"),
current_date); get_current_date().c_str());
free(current_date);
} else { } else {
char *current_date = get_current_date(); buf += casprintf_loc("%s (%s) %s %d:%02d) %s %s",
put_format_loc(&buf, "%s (%s) %s %d:%02d) %s %s",
translate("gettextFromC", "Subsurface"), translate("gettextFromC", "Subsurface"),
subsurface_canonical_version(), subsurface_canonical_version(),
translate("gettextFromC", "dive plan</b> (surface interval "), translate("gettextFromC", "dive plan</b> (surface interval "),
FRACTION(diveplan->surface_interval / 60, 60), FRACTION(diveplan->surface_interval / 60, 60),
translate("gettextFromC", "created on"), translate("gettextFromC", "created on"),
current_date); get_current_date().c_str());
free(current_date);
} }
put_string(&buf, "<br/>\n"); buf += "<br/>\n";
if (prefs.display_variations && decoMode(true) != RECREATIONAL) if (prefs.display_variations && decoMode(true) != RECREATIONAL)
put_format_loc(&buf, translate("gettextFromC", "Runtime: %dmin%s"), buf += casprintf_loc(translate("gettextFromC", "Runtime: %dmin%s"),
diveplan_duration(diveplan), "VARIATIONS"); diveplan_duration(diveplan), "VARIATIONS");
else else
put_format_loc(&buf, translate("gettextFromC", "Runtime: %dmin%s"), buf += casprintf_loc(translate("gettextFromC", "Runtime: %dmin%s"),
diveplan_duration(diveplan), ""); diveplan_duration(diveplan), "");
put_string(&buf, "<br/>\n</div>\n"); buf += "<br/>\n</div>\n";
if (!plan_verbatim) { if (!plan_verbatim) {
put_format(&buf, "<table>\n<thead>\n<tr><th></th><th>%s</th>", translate("gettextFromC", "depth")); buf += format_string_std("<table>\n<thead>\n<tr><th></th><th>%s</th>", translate("gettextFromC", "depth"));
if (plan_display_duration) if (plan_display_duration)
put_format(&buf, "<th style='padding-left: 10px;'>%s</th>", translate("gettextFromC", "duration")); buf += format_string_std("<th style='padding-left: 10px;'>%s</th>", translate("gettextFromC", "duration"));
if (plan_display_runtime) if (plan_display_runtime)
put_format(&buf, "<th style='padding-left: 10px;'>%s</th>", translate("gettextFromC", "runtime")); buf += format_string_std("<th style='padding-left: 10px;'>%s</th>", translate("gettextFromC", "runtime"));
put_format(&buf, "<th style='padding-left: 10px; float: left;'>%s</th></tr>\n</thead>\n<tbody style='float: left;'>\n", buf += format_string_std("<th style='padding-left: 10px; float: left;'>%s</th></tr>\n</thead>\n<tbody style='float: left;'>\n",
translate("gettextFromC", "gas")); translate("gettextFromC", "gas"));
} }
@ -232,7 +231,7 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
if (dp->depth.mm != lastprintdepth) { if (dp->depth.mm != lastprintdepth) {
if (plan_display_transitions || dp->entered || !dp->next || (gaschange_after && dp->next && dp->depth.mm != nextdp->depth.mm)) { if (plan_display_transitions || dp->entered || !dp->next || (gaschange_after && dp->next && dp->depth.mm != nextdp->depth.mm)) {
if (dp->setpoint) { if (dp->setpoint) {
put_format_loc(&buf, translate("gettextFromC", "%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)"), buf += casprintf_loc(translate("gettextFromC", "%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)"),
dp->depth.mm < lastprintdepth ? translate("gettextFromC", "Ascend") : translate("gettextFromC", "Descend"), dp->depth.mm < lastprintdepth ? translate("gettextFromC", "Ascend") : translate("gettextFromC", "Descend"),
decimals, depthvalue, depth_unit, decimals, depthvalue, depth_unit,
FRACTION(dp->time - lasttime, 60), FRACTION(dp->time - lasttime, 60),
@ -240,7 +239,7 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
gasname(gasmix), gasname(gasmix),
(double) dp->setpoint / 1000.0); (double) dp->setpoint / 1000.0);
} else { } else {
put_format_loc(&buf, translate("gettextFromC", "%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s"), buf += casprintf_loc(translate("gettextFromC", "%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s"),
dp->depth.mm < lastprintdepth ? translate("gettextFromC", "Ascend") : translate("gettextFromC", "Descend"), dp->depth.mm < lastprintdepth ? translate("gettextFromC", "Ascend") : translate("gettextFromC", "Descend"),
decimals, depthvalue, depth_unit, decimals, depthvalue, depth_unit,
FRACTION(dp->time - lasttime, 60), FRACTION(dp->time - lasttime, 60),
@ -248,28 +247,28 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
gasname(gasmix)); gasname(gasmix));
} }
put_string(&buf, "<br/>\n"); buf += "<br/>\n";
} }
newdepth = dp->depth.mm; newdepth = dp->depth.mm;
lasttime = dp->time; lasttime = dp->time;
} else { } else {
if ((nextdp && dp->depth.mm != nextdp->depth.mm) || gaschange_after) { if ((nextdp && dp->depth.mm != nextdp->depth.mm) || gaschange_after) {
if (dp->setpoint) { if (dp->setpoint) {
put_format_loc(&buf, translate("gettextFromC", "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)"), buf += casprintf_loc(translate("gettextFromC", "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)"),
decimals, depthvalue, depth_unit, decimals, depthvalue, depth_unit,
FRACTION(dp->time - lasttime, 60), FRACTION(dp->time - lasttime, 60),
FRACTION(dp->time, 60), FRACTION(dp->time, 60),
gasname(gasmix), gasname(gasmix),
(double) dp->setpoint / 1000.0); (double) dp->setpoint / 1000.0);
} else { } else {
put_format_loc(&buf, translate("gettextFromC", "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s"), buf += casprintf_loc(translate("gettextFromC", "Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s"),
decimals, depthvalue, depth_unit, decimals, depthvalue, depth_unit,
FRACTION(dp->time - lasttime, 60), FRACTION(dp->time - lasttime, 60),
FRACTION(dp->time, 60), FRACTION(dp->time, 60),
gasname(gasmix), gasname(gasmix),
translate("gettextFromC", divemode_text_ui[dp->divemode])); translate("gettextFromC", divemode_text_ui[dp->divemode]));
} }
put_string(&buf, "<br/>\n"); buf += "<br/>\n";
newdepth = dp->depth.mm; newdepth = dp->depth.mm;
lasttime = dp->time; lasttime = dp->time;
} }
@ -307,20 +306,17 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
else else
segmentsymbol = "-"; // minus sign (a.k.a. horizontal line) for deco stop segmentsymbol = "-"; // minus sign (a.k.a. horizontal line) for deco stop
put_format(&buf, "<tr><td style='padding-left: 10px; float: right;'>%s</td>", segmentsymbol); buf += format_string_std("<tr><td style='padding-left: 10px; float: right;'>%s</td>", segmentsymbol);
asprintf_loc(&temp, translate("gettextFromC", "%3.0f%s"), depthvalue, depth_unit); std::string temp = casprintf_loc(translate("gettextFromC", "%3.0f%s"), depthvalue, depth_unit);
put_format(&buf, "<td style='padding-left: 10px; float: right;'>%s</td>", temp); buf += format_string_std("<td style='padding-left: 10px; float: right;'>%s</td>", temp.c_str());
free(temp);
if (plan_display_duration) { if (plan_display_duration) {
asprintf_loc(&temp, translate("gettextFromC", "%3dmin"), (dp->time - lasttime + 30) / 60); temp = casprintf_loc(translate("gettextFromC", "%3dmin"), (dp->time - lasttime + 30) / 60);
put_format(&buf, "<td style='padding-left: 10px; float: right;'>%s</td>", temp); buf += format_string_std("<td style='padding-left: 10px; float: right;'>%s</td>", temp.c_str());
free(temp);
} }
if (plan_display_runtime) { if (plan_display_runtime) {
asprintf_loc(&temp, translate("gettextFromC", "%3dmin"), (dp->time + 30) / 60); temp = casprintf_loc(translate("gettextFromC", "%3dmin"), (dp->time + 30) / 60);
put_format(&buf, "<td style='padding-left: 10px; float: right;'>%s</td>", temp); buf += format_string_std("<td style='padding-left: 10px; float: right;'>%s</td>", temp.c_str());
free(temp);
} }
/* Normally a gas change is displayed on the stopping segment, so only display a gas change at the end of /* Normally a gas change is displayed on the stopping segment, so only display a gas change at the end of
@ -328,18 +324,17 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
*/ */
if (isascent && gaschange_after && dp->next && nextdp && nextdp->entered) { if (isascent && gaschange_after && dp->next && nextdp && nextdp->entered) {
if (nextdp->setpoint) { if (nextdp->setpoint) {
asprintf_loc(&temp, translate("gettextFromC", "(SP = %.1fbar CCR)"), nextdp->setpoint / 1000.0); temp = casprintf_loc(translate("gettextFromC", "(SP = %.1fbar CCR)"), nextdp->setpoint / 1000.0);
put_format(&buf, "<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", buf += format_string_std("<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>",
gasname(newgasmix), temp); gasname(newgasmix), temp.c_str());
free(temp);
} else { } else {
put_format(&buf, "<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", buf += format_string_std("<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>",
gasname(newgasmix), dp->divemode == UNDEF_COMP_TYPE || dp->divemode == nextdp->divemode ? "" : translate("gettextFromC", divemode_text_ui[nextdp->divemode])); gasname(newgasmix), dp->divemode == UNDEF_COMP_TYPE || dp->divemode == nextdp->divemode ? "" : translate("gettextFromC", divemode_text_ui[nextdp->divemode]));
if (isascent && (get_he(lastprintgasmix) > 0)) { // For a trimix gas change on ascent, save ICD info if previous cylinder had helium if (isascent && (get_he(lastprintgasmix) > 0)) { // For a trimix gas change on ascent, save ICD info if previous cylinder had helium
if (isobaric_counterdiffusion(lastprintgasmix, newgasmix, &icdvalues)) // Do icd calulations if (isobaric_counterdiffusion(lastprintgasmix, newgasmix, &icdvalues)) // Do icd calulations
icdwarning = true; icdwarning = true;
if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen.. if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen..
add_icd_entry(&icdbuf, &icdvalues, icdtableheader, dp->time, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, newgasmix); // .. then print calculations to buffer. icdbuf += icd_entry(&icdvalues, icdtableheader, dp->time, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, newgasmix); // .. then print calculations to buffer.
icdtableheader = false; icdtableheader = false;
} }
} }
@ -351,17 +346,16 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
} else if (gaschange_before || rebreatherchange_before) { } else if (gaschange_before || rebreatherchange_before) {
// If a new gas has been used for this segment, now is the time to show it // If a new gas has been used for this segment, now is the time to show it
if (dp->setpoint) { if (dp->setpoint) {
asprintf_loc(&temp, translate("gettextFromC", "(SP = %.1fbar CCR)"), (double) dp->setpoint / 1000.0); temp = casprintf_loc(translate("gettextFromC", "(SP = %.1fbar CCR)"), (double) dp->setpoint / 1000.0);
put_format(&buf, "<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", gasname(gasmix), temp); buf += format_string_std("<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", gasname(gasmix), temp.c_str());
free(temp);
} else { } else {
put_format(&buf, "<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", gasname(gasmix), buf += format_string_std("<td style='padding-left: 10px; color: red; float: left;'><b>%s %s</b></td>", gasname(gasmix),
lastdivemode == UNDEF_COMP_TYPE || lastdivemode == dp->divemode ? "" : translate("gettextFromC", divemode_text_ui[dp->divemode])); lastdivemode == UNDEF_COMP_TYPE || lastdivemode == dp->divemode ? "" : translate("gettextFromC", divemode_text_ui[dp->divemode]));
if (get_he(lastprintgasmix) > 0) { // For a trimix gas change, save ICD info if previous cylinder had helium if (get_he(lastprintgasmix) > 0) { // For a trimix gas change, save ICD info if previous cylinder had helium
if (isobaric_counterdiffusion(lastprintgasmix, gasmix, &icdvalues)) // Do icd calculations if (isobaric_counterdiffusion(lastprintgasmix, gasmix, &icdvalues)) // Do icd calculations
icdwarning = true; icdwarning = true;
if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen.. if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen..
add_icd_entry(&icdbuf, &icdvalues, icdtableheader, lasttime, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, gasmix); // .. then print data to buffer. icdbuf += icd_entry(&icdvalues, icdtableheader, lasttime, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, gasmix); // .. then print data to buffer.
icdtableheader = false; icdtableheader = false;
} }
} }
@ -372,9 +366,9 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
lastdivemode = dp->divemode; lastdivemode = dp->divemode;
gaschange_after = false; gaschange_after = false;
} else { } else {
put_string(&buf, "<td>&nbsp;</td>"); buf += "<td>&nbsp;</td>";
} }
put_string(&buf, "</tr>\n"); buf += "</tr>\n";
newdepth = dp->depth.mm; newdepth = dp->depth.mm;
// Only add the time we actually displayed so rounding errors dont accumulate // Only add the time we actually displayed so rounding errors dont accumulate
lasttime += ((dp->time - lasttime + 30) / 60) * 60; lasttime += ((dp->time - lasttime + 30) / 60) * 60;
@ -385,19 +379,19 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
if (plan_verbatim) { if (plan_verbatim) {
if (lastsetpoint >= 0) { if (lastsetpoint >= 0) {
if (nextdp && nextdp->setpoint) { if (nextdp && nextdp->setpoint) {
put_format_loc(&buf, translate("gettextFromC", "Switch gas to %s (SP = %.1fbar)"), gasname(newgasmix), (double) nextdp->setpoint / 1000.0); buf += casprintf_loc(translate("gettextFromC", "Switch gas to %s (SP = %.1fbar)"), gasname(newgasmix), (double) nextdp->setpoint / 1000.0);
} else { } else {
put_format(&buf, translate("gettextFromC", "Switch gas to %s"), gasname(newgasmix)); buf += format_string_std(translate("gettextFromC", "Switch gas to %s"), gasname(newgasmix));
if ((isascent) && (get_he(lastprintgasmix) > 0)) { // For a trimix gas change on ascent: if ((isascent) && (get_he(lastprintgasmix) > 0)) { // For a trimix gas change on ascent:
if (isobaric_counterdiffusion(lastprintgasmix, newgasmix, &icdvalues)) // Do icd calculations if (isobaric_counterdiffusion(lastprintgasmix, newgasmix, &icdvalues)) // Do icd calculations
icdwarning = true; icdwarning = true;
if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen.. if (icdvalues.dN2 > 0) { // If the gas change involved helium as well as an increase in nitrogen..
add_icd_entry(&icdbuf, &icdvalues, icdtableheader, dp->time, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, newgasmix); // ... then print data to buffer. icdbuf += icd_entry(&icdvalues, icdtableheader, dp->time, depth_to_mbar(dp->depth.mm, dive), lastprintgasmix, newgasmix); // ... then print data to buffer.
icdtableheader = false; icdtableheader = false;
} }
} }
} }
put_string(&buf, "<br/>\n"); buf += "<br/>\n";
} }
lastprintgasmix = newgasmix; lastprintgasmix = newgasmix;
gaschange_after = false; gaschange_after = false;
@ -410,37 +404,37 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
lastentered = dp->entered; lastentered = dp->entered;
} while ((dp = nextdp) != NULL); } while ((dp = nextdp) != NULL);
if (!plan_verbatim) if (!plan_verbatim)
put_string(&buf, "</tbody>\n</table>\n<br/>\n"); buf += "</tbody>\n</table>\n<br/>\n";
/* Print the CNS and OTU next.*/ /* Print the CNS and OTU next.*/
dive->cns = 0; dive->cns = 0;
dive->maxcns = 0; dive->maxcns = 0;
update_cylinder_related_info(dive); update_cylinder_related_info(dive);
put_format_loc(&buf, "<div>\n%s: %i%%", translate("gettextFromC", "CNS"), dive->cns); buf += casprintf_loc("<div>\n%s: %i%%", translate("gettextFromC", "CNS"), dive->cns);
put_format_loc(&buf, "<br/>\n%s: %i<br/>\n</div>\n", translate("gettextFromC", "OTU"), dive->otu); buf += casprintf_loc("<br/>\n%s: %i<br/>\n</div>\n", translate("gettextFromC", "OTU"), dive->otu);
/* Print the settings for the diveplan next. */ /* Print the settings for the diveplan next. */
put_string(&buf, "<div>\n"); buf += "<div>\n";
if (decoMode(true) == BUEHLMANN) { if (decoMode(true) == BUEHLMANN) {
put_format_loc(&buf, translate("gettextFromC", "Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%"), diveplan->gflow, diveplan->gfhigh); buf += casprintf_loc(translate("gettextFromC", "Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%"), diveplan->gflow, diveplan->gfhigh);
} else if (decoMode(true) == VPMB) { } else if (decoMode(true) == VPMB) {
if (diveplan->vpmb_conservatism == 0) if (diveplan->vpmb_conservatism == 0)
put_string(&buf, translate("gettextFromC", "Deco model: VPM-B at nominal conservatism")); buf += translate("gettextFromC", "Deco model: VPM-B at nominal conservatism");
else else
put_format_loc(&buf, translate("gettextFromC", "Deco model: VPM-B at +%d conservatism"), diveplan->vpmb_conservatism); buf += casprintf_loc(translate("gettextFromC", "Deco model: VPM-B at +%d conservatism"), diveplan->vpmb_conservatism);
if (diveplan->eff_gflow) if (diveplan->eff_gflow)
put_format_loc(&buf, translate("gettextFromC", ", effective GF=%d/%d"), diveplan->eff_gflow, diveplan->eff_gfhigh); buf += casprintf_loc( translate("gettextFromC", ", effective GF=%d/%d"), diveplan->eff_gflow, diveplan->eff_gfhigh);
} else if (decoMode(true) == RECREATIONAL) { } else if (decoMode(true) == RECREATIONAL) {
put_format_loc(&buf, translate("gettextFromC", "Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%"), buf += casprintf_loc(translate("gettextFromC", "Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%"),
diveplan->gflow, diveplan->gfhigh); diveplan->gflow, diveplan->gfhigh);
} }
put_string(&buf, "<br/>\n"); buf += "<br/>\n";
{ {
const char *depth_unit; const char *depth_unit;
int altitude = (int) get_depth_units((int) (pressure_to_altitude(diveplan->surface_pressure)), NULL, &depth_unit); int altitude = (int) get_depth_units((int) (pressure_to_altitude(diveplan->surface_pressure)), NULL, &depth_unit);
put_format_loc(&buf, translate("gettextFromC", "ATM pressure: %dmbar (%d%s)<br/>\n</div>\n"), diveplan->surface_pressure, altitude, depth_unit); buf += casprintf_loc(translate("gettextFromC", "ATM pressure: %dmbar (%d%s)<br/>\n</div>\n"), diveplan->surface_pressure, altitude, depth_unit);
} }
/* Get SAC values and units for printing it in gas consumption */ /* Get SAC values and units for printing it in gas consumption */
@ -456,21 +450,22 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
if (sacdecimals==1) sacdecimals--; if (sacdecimals==1) sacdecimals--;
/* Print the gas consumption next.*/ /* Print the gas consumption next.*/
std::string temp;
if (dive->dc.divemode == CCR) if (dive->dc.divemode == CCR)
temp = strdup(translate("gettextFromC", "Gas consumption (CCR legs excluded):")); temp = translate("gettextFromC", "Gas consumption (CCR legs excluded):");
else else
asprintf_loc(&temp, "%s %.*f|%.*f%s/min):", translate("gettextFromC", "Gas consumption (based on SAC"), temp = casprintf_loc("%s %.*f|%.*f%s/min):", translate("gettextFromC", "Gas consumption (based on SAC"),
sacdecimals, bottomsacvalue, sacdecimals, decosacvalue, sacunit); sacdecimals, bottomsacvalue, sacdecimals, decosacvalue, sacunit);
put_format(&buf, "<div>\n%s<br/>\n", temp); buf += format_string_std("<div>\n%s<br/>\n", temp.c_str());
free(temp);
} }
/* Print gas consumption: This loop covers all cylinders */ /* Print gas consumption: This loop covers all cylinders */
for (int gasidx = 0; gasidx < dive->cylinders.nr; gasidx++) { for (int gasidx = 0; gasidx < dive->cylinders.nr; gasidx++) {
double volume, pressure, deco_volume, deco_pressure, mingas_volume, mingas_pressure, mingas_d_pressure, mingas_depth; double volume, pressure, deco_volume, deco_pressure, mingas_volume, mingas_pressure, mingas_d_pressure, mingas_depth;
const char *unit, *pressure_unit, *depth_unit; const char *unit, *pressure_unit, *depth_unit;
char warning[1000] = ""; std::string temp;
char mingas[1000] = ""; std::string warning;
std::string mingas;
cylinder_t *cyl = get_cylinder(dive, gasidx); cylinder_t *cyl = get_cylinder(dive, gasidx);
if (cyl->cylinder_use == NOT_USED) if (cyl->cylinder_use == NOT_USED)
continue; continue;
@ -487,13 +482,13 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
* This only works if we have working pressure for the cylinder * This only works if we have working pressure for the cylinder
* 10bar is a made up number - but it seemed silly to pretend you could breathe cylinder down to 0 */ * 10bar is a made up number - but it seemed silly to pretend you could breathe cylinder down to 0 */
if (cyl->end.mbar < 10000) if (cyl->end.mbar < 10000)
snprintf(warning, sizeof(warning), "<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s", warning = format_string_std("<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s",
translate("gettextFromC", "Warning:"), translate("gettextFromC", "Warning:"),
translate("gettextFromC", "this is more gas than available in the specified cylinder!")); translate("gettextFromC", "this is more gas than available in the specified cylinder!"));
else else
if (cyl->end.mbar / 1000.0 * cyl->type.size.mliter / gas_compressibility_factor(cyl->gasmix, cyl->end.mbar / 1000.0) if (cyl->end.mbar / 1000.0 * cyl->type.size.mliter / gas_compressibility_factor(cyl->gasmix, cyl->end.mbar / 1000.0)
< cyl->deco_gas_used.mliter) < cyl->deco_gas_used.mliter)
snprintf(warning, sizeof(warning), "<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s", warning = format_string_std("<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s",
translate("gettextFromC", "Warning:"), translate("gettextFromC", "Warning:"),
translate("gettextFromC", "not enough reserve for gas sharing on ascent!")); translate("gettextFromC", "not enough reserve for gas sharing on ascent!"));
@ -517,7 +512,7 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
mingas_depth = get_depth_units(lastbottomdp->depth.mm, NULL, &depth_unit); mingas_depth = get_depth_units(lastbottomdp->depth.mm, NULL, &depth_unit);
/* Print it to results */ /* Print it to results */
if (cyl->start.mbar > lastbottomdp->minimum_gas.mbar) { if (cyl->start.mbar > lastbottomdp->minimum_gas.mbar) {
snprintf_loc(mingas, sizeof(mingas), "<br/>\n&nbsp;&mdash; <span style='color: %s;'>%s</span> (%s %.1fx%s/+%d%s@%.0f%s): " mingas = casprintf_loc("<br/>\n&nbsp;&mdash; <span style='color: %s;'>%s</span> (%s %.1fx%s/+%d%s@%.0f%s): "
"%.0f%s/%.0f%s<span style='color: %s;'>/&Delta;:%+.0f%s</span>", "%.0f%s/%.0f%s<span style='color: %s;'>/&Delta;:%+.0f%s</span>",
mingas_d_pressure > 0 ? "green" :"red", mingas_d_pressure > 0 ? "green" :"red",
translate("gettextFromC", "Minimum gas"), translate("gettextFromC", "Minimum gas"),
@ -532,47 +527,44 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
mingas_d_pressure > 0 ? "grey" :"indianred", mingas_d_pressure > 0 ? "grey" :"indianred",
mingas_d_pressure, pressure_unit); mingas_d_pressure, pressure_unit);
} else { } else {
snprintf(warning, sizeof(warning), "<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s", warning = format_string_std("<br/>\n&nbsp;&mdash; <span style='color: red;'>%s </span> %s",
translate("gettextFromC", "Warning:"), translate("gettextFromC", "Warning:"),
translate("gettextFromC", "required minimum gas for ascent already exceeding start pressure of cylinder!")); translate("gettextFromC", "required minimum gas for ascent already exceeding start pressure of cylinder!"));
} }
} }
/* Print the gas consumption for every cylinder here to temp buffer. */ /* Print the gas consumption for every cylinder here to temp buffer. */
if (lrint(volume) > 0) { if (lrint(volume) > 0) {
asprintf_loc(&temp, translate("gettextFromC", "%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)"), temp = casprintf_loc(translate("gettextFromC", "%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)"),
volume, unit, pressure, pressure_unit, gasname(cyl->gasmix), deco_volume, unit, deco_pressure, pressure_unit); volume, unit, pressure, pressure_unit, gasname(cyl->gasmix), deco_volume, unit, deco_pressure, pressure_unit);
} else { } else {
asprintf_loc(&temp, translate("gettextFromC", "%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span>"), temp = casprintf_loc(translate("gettextFromC", "%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span>"),
volume, unit, pressure, pressure_unit, gasname(cyl->gasmix)); volume, unit, pressure, pressure_unit, gasname(cyl->gasmix));
} }
} else { } else {
if (lrint(volume) > 0) { if (lrint(volume) > 0) {
asprintf_loc(&temp, translate("gettextFromC", "%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)"), temp = casprintf_loc(translate("gettextFromC", "%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)"),
volume, unit, gasname(cyl->gasmix), deco_volume, unit); volume, unit, gasname(cyl->gasmix), deco_volume, unit);
} else { } else {
asprintf_loc(&temp, translate("gettextFromC", "%.0f%s of <span style='color: red;'><b>%s</b></span>"), temp = casprintf_loc(translate("gettextFromC", "%.0f%s of <span style='color: red;'><b>%s</b></span>"),
volume, unit, gasname(cyl->gasmix)); volume, unit, gasname(cyl->gasmix));
} }
} }
/* Gas consumption: Now finally print all strings to output */ /* Gas consumption: Now finally print all strings to output */
put_format(&buf, "%s%s%s<br/>\n", temp, warning, mingas); buf += format_string_std("%s%s%s<br/>\n", temp.c_str(), warning.c_str(), mingas.c_str());
free(temp);
} }
put_format(&buf, "</div>\n"); buf += "</div>\n";
/* For trimix OC dives, if an icd table header and icd data were printed to buffer, then add the ICD table here */ /* For trimix OC dives, if an icd table header and icd data were printed to buffer, then add the ICD table here */
if (!icdtableheader && prefs.show_icd) { if (!icdtableheader && prefs.show_icd) {
put_string(&icdbuf, "</tbody></table>\n"); // End the ICD table icdbuf += "</tbody></table>\n"; // End the ICD table
mb_cstring(&icdbuf); buf += icdbuf;
put_string(&buf, icdbuf.buffer); // ..and add it to the html buffer
if (icdwarning) { // If necessary, add warning if (icdwarning) { // If necessary, add warning
put_format(&buf, "<span style='color: red;'>%s</span> %s", buf += format_string_std("<span style='color: red;'>%s</span> %s",
translate("gettextFromC", "Warning:"), translate("gettextFromC", "Warning:"),
translate("gettextFromC", "Isobaric counterdiffusion conditions exceeded")); translate("gettextFromC", "Isobaric counterdiffusion conditions exceeded"));
} }
put_string(&buf, "<br/></div>\n"); buf += "<br/></div>\n";
} }
free_buffer(&icdbuf);
/* Print warnings for pO2 (move into separate function?) */ /* Print warnings for pO2 (move into separate function?) */
{ {
@ -586,6 +578,7 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
if (dive->dc.divemode != CCR) { if (dive->dc.divemode != CCR) {
while (dp) { while (dp) {
if (dp->time != 0) { if (dp->time != 0) {
std::string temp;
struct gas_pressures pressures; struct gas_pressures pressures;
struct gasmix gasmix = get_cylinder(dive, dp->cylinderid)->gasmix; struct gasmix gasmix = get_cylinder(dive, dp->cylinderid)->gasmix;
@ -598,34 +591,32 @@ extern "C" void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive,
int decimals; int decimals;
double depth_value = get_depth_units(dp->depth.mm, &decimals, &depth_unit); double depth_value = get_depth_units(dp->depth.mm, &decimals, &depth_unit);
if (!o2warning_exist) if (!o2warning_exist)
put_string(&buf, "<div>\n"); buf += "<div>\n";
o2warning_exist = true; o2warning_exist = true;
asprintf_loc(&temp, translate("gettextFromC", "high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s"), temp = casprintf_loc(translate("gettextFromC", "high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s"),
pressures.o2, FRACTION(dp->time, 60), gasname(gasmix), decimals, depth_value, depth_unit); pressures.o2, FRACTION(dp->time, 60), gasname(gasmix), decimals, depth_value, depth_unit);
put_format(&buf, "<span style='color: red;'>%s </span> %s<br/>\n", translate("gettextFromC", "Warning:"), temp); buf += format_string_std("<span style='color: red;'>%s </span> %s<br/>\n", translate("gettextFromC", "Warning:"), temp.c_str());
free(temp);
} else if (pressures.o2 < 0.16) { } else if (pressures.o2 < 0.16) {
const char *depth_unit; const char *depth_unit;
int decimals; int decimals;
double depth_value = get_depth_units(dp->depth.mm, &decimals, &depth_unit); double depth_value = get_depth_units(dp->depth.mm, &decimals, &depth_unit);
if (!o2warning_exist) if (!o2warning_exist)
put_string(&buf, "<div>"); buf += "<div>";
o2warning_exist = true; o2warning_exist = true;
asprintf_loc(&temp, translate("gettextFromC", "low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s"), temp = casprintf_loc(translate("gettextFromC", "low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s"),
pressures.o2, FRACTION(dp->time, 60), gasname(gasmix), decimals, depth_value, depth_unit); pressures.o2, FRACTION(dp->time, 60), gasname(gasmix), decimals, depth_value, depth_unit);
put_format(&buf, "<span style='color: red;'>%s </span> %s<br/>\n", translate("gettextFromC", "Warning:"), temp); buf += format_string_std("<span style='color: red;'>%s </span> %s<br/>\n", translate("gettextFromC", "Warning:"), temp.c_str());
free(temp);
} }
} }
dp = dp->next; dp = dp->next;
} }
} }
if (o2warning_exist) if (o2warning_exist)
put_string(&buf, "</div>\n"); buf += "</div>\n";
} }
finished: // TODO: avoid copy
free(dive->notes); free(dive->notes);
dive->notes = detach_cstring(&buf); dive->notes = strdup(buf.c_str());
#ifdef DEBUG_PLANNER_NOTES #ifdef DEBUG_PLANNER_NOTES
printf("<!DOCTYPE html>\n<html>\n\t<head><title>plannernotes</title><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/></head>\n\t<body>\n%s\t</body>\n</html>\n", dive->notes); printf("<!DOCTYPE html>\n<html>\n\t<head><title>plannernotes</title><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/></head>\n\t<body>\n%s\t</body>\n</html>\n", dive->notes);
#endif #endif

4
core/qthelper.cpp
View file

@ -1025,14 +1025,14 @@ QString get_last_dive_date_string()
return dives->nr > 0 ? get_dive_only_date_string(dives->dives[dives->nr - 1]->when) : gettextFromC::tr("no dives"); return dives->nr > 0 ? get_dive_only_date_string(dives->dives[dives->nr - 1]->when) : gettextFromC::tr("no dives");
} }
extern "C" char *get_current_date() std::string get_current_date()
{ {
QDateTime ts(QDateTime::currentDateTime());; QDateTime ts(QDateTime::currentDateTime());;
QString current_date; QString current_date;
current_date = loc.toString(ts, QString(prefs.date_format_short)); current_date = loc.toString(ts, QString(prefs.date_format_short));
return copy_qstring(current_date); return current_date.toStdString();
} }
static QMutex hashOfMutex; static QMutex hashOfMutex;

2
core/qthelper.h
View file

@ -97,6 +97,7 @@ QString printGPSCoords(const location_t *loc);
std::string printGPSCoordsC(const location_t *loc); std::string printGPSCoordsC(const location_t *loc);
std::vector<int> get_cylinder_map_for_remove(int count, int n); std::vector<int> get_cylinder_map_for_remove(int count, int n);
std::vector<int> get_cylinder_map_for_add(int count, int n); std::vector<int> get_cylinder_map_for_add(int count, int n);
std::string get_current_date();
extern QString (*changesCallback)(); extern QString (*changesCallback)();
void uiNotification(const QString &msg); void uiNotification(const QString &msg);
@ -132,7 +133,6 @@ char *cloud_url();
char *hashfile_name_string(); char *hashfile_name_string();
enum deco_mode decoMode(bool in_planner); enum deco_mode decoMode(bool in_planner);
void parse_seabear_header(const char *filename, struct xml_params *params); void parse_seabear_header(const char *filename, struct xml_params *params);
char *get_current_date();
time_t get_dive_datetime_from_isostring(char *when); time_t get_dive_datetime_from_isostring(char *when);
void print_qt_versions(); void print_qt_versions();
void lock_planner(); void lock_planner();

5
desktop-widgets/diveplanner.cpp
View file

@ -609,13 +609,12 @@ void PlannerWidgets::replanDive(int currentDC)
void PlannerWidgets::printDecoPlan() void PlannerWidgets::printDecoPlan()
{ {
#ifndef NO_PRINTING #ifndef NO_PRINTING
char *disclaimer = get_planner_disclaimer_formatted(); std::string disclaimer = get_planner_disclaimer_formatted();
// Prepend a logo and a disclaimer to the plan. // Prepend a logo and a disclaimer to the plan.
// Save the old plan so that it can be restored at the end of the function. // Save the old plan so that it can be restored at the end of the function.
QString origPlan = plannerDetails.divePlanOutput()->toHtml(); QString origPlan = plannerDetails.divePlanOutput()->toHtml();
QString diveplan = QStringLiteral("<img height=50 src=\":subsurface-icon\"> ") + QString diveplan = QStringLiteral("<img height=50 src=\":subsurface-icon\"> ") +
QString(disclaimer) + origPlan; QString::fromStdString(disclaimer) + origPlan;
free(disclaimer);
QPrinter printer; QPrinter printer;
QPrintDialog dialog(&printer, MainWindow::instance()); QPrintDialog dialog(&printer, MainWindow::instance());