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

Always show notes when replanning

Browse source 
... as per popular request. Plus adding const keyword to constant
strings.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-03-28 15:04:35 +02:00 • committed by Dirk Hohndel
parent d344779c47
commit 1b744c7639
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/planner.c
View file

@ -538,7 +538,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
const unsigned int sz_temp = 100000; const unsigned int sz_temp = 100000;
char *buffer = (char *)malloc(sz_buffer); char *buffer = (char *)malloc(sz_buffer);
char *temp = (char *)malloc(sz_temp); char *temp = (char *)malloc(sz_temp);
char *deco, *segmentsymbol; const char *deco, *segmentsymbol;
static char buf[1000]; static char buf[1000];
int len, lastdepth = 0, lasttime = 0, lastsetpoint = -1, newdepth = 0, lastprintdepth = 0, lastprintsetpoint = -1; int len, lastdepth = 0, lasttime = 0, lastsetpoint = -1, newdepth = 0, lastprintdepth = 0, lastprintsetpoint = -1;
struct gasmix lastprintgasmix = {{ -1 }, { -1 }}; struct gasmix lastprintgasmix = {{ -1 }, { -1 }};

3
qt-models/diveplannermodel.cpp
View file

@ -873,7 +873,7 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
setRecalc(oldRecalc); setRecalc(oldRecalc);
//TODO: C-based function here? //TODO: C-based function here?
bool did_deco = plan(&diveplan, &cache, isPlanner(), true); plan(&diveplan, &cache, isPlanner(), true);
free(cache); free(cache);
if (!current_dive || displayed_dive.id != current_dive->id) { if (!current_dive || displayed_dive.id != current_dive->id) {
// we were planning a new dive, not re-planning an existing on // we were planning a new dive, not re-planning an existing on
@ -896,7 +896,6 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
QString oldnotes(current_dive->notes); QString oldnotes(current_dive->notes);
if (oldnotes.indexOf(QString(disclaimer).left(40)) >= 0) if (oldnotes.indexOf(QString(disclaimer).left(40)) >= 0)
oldnotes.truncate(oldnotes.indexOf(QString(displayed_dive.notes).left(40))); oldnotes.truncate(oldnotes.indexOf(QString(displayed_dive.notes).left(40)));
if (did_deco)
oldnotes.append(displayed_dive.notes); oldnotes.append(displayed_dive.notes);
displayed_dive.notes = strdup(oldnotes.toUtf8().data()); displayed_dive.notes = strdup(oldnotes.toUtf8().data());
} }