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

Merge branch 'atdotde'

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/diveplanner.cpp
This commit is contained in:
Dirk Hohndel 2014-05-26 09:59:08 -07:00
commit a61c04bb58
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
planner.c
View file

@ -480,7 +480,6 @@ static unsigned int *sort_stops(int *dstops, int dnr, struct gaschanges *gstops,
return stoplevels; return stoplevels;
} }
#if DO_WE_WANT_THIS_IN_QT
static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive) static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive)
{ {
char buffer[20000]; char buffer[20000];
@ -493,7 +492,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive)
return; return;
snprintf(buffer, sizeof(buffer), translate("gettextFromC", "%s\nSubsurface dive plan\nbased on GFlow = %.0f and GFhigh = %.0f\n\n"), snprintf(buffer, sizeof(buffer), translate("gettextFromC", "%s\nSubsurface dive plan\nbased on GFlow = %.0f and GFhigh = %.0f\n\n"),
disclaimer, plangflow * 100, plangfhigh * 100); disclaimer, diveplan->gflow * 100, diveplan->gfhigh * 100);
/* we start with gas 0, then check if that was changed */ /* we start with gas 0, then check if that was changed */
o2 = get_o2(&dive->cylinder[0].gasmix); o2 = get_o2(&dive->cylinder[0].gasmix);
he = get_he(&dive->cylinder[0].gasmix); he = get_he(&dive->cylinder[0].gasmix);
@ -566,6 +565,8 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive)
double volume; double volume;
const char *unit; const char *unit;
char gas[64]; char gas[64];
if (dive->cylinder[gasidx].type.size.mliter)
dive->cylinder[gasidx].end.mbar = dive->cylinder[gasidx].start.mbar - consumption[gasidx] / dive->cylinder[gasidx].type.size.mliter / 1000;
if (consumption[gasidx] == 0) if (consumption[gasidx] == 0)
continue; continue;
len = strlen(buffer); len = strlen(buffer);
@ -576,7 +577,6 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive)
} }
dive->notes = strdup(buffer); dive->notes = strdup(buffer);
} }
#endif
int ascend_velocity(int depth, int avg_depth, int bottom_time) int ascend_velocity(int depth, int avg_depth, int bottom_time)
{ {
@ -768,9 +768,7 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b
goto error_exit; goto error_exit;
record_dive(dive); record_dive(dive);
#if DO_WE_WANT_THIS_IN_QT
add_plan_to_notes(diveplan, dive); add_plan_to_notes(diveplan, dive);
#endif
error_exit: error_exit:
free(stoplevels); free(stoplevels);

4
qt-ui/diveplanner.cpp
View file

@ -441,13 +441,13 @@ DivePlannerPointsModel *DivePlannerPointsModel::instance()
void DivePlannerPointsModel::setBottomSac(int sac) void DivePlannerPointsModel::setBottomSac(int sac)
{ {
diveplan.bottomsac = sac; diveplan.bottomsac = sac * 1000;
emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1));
} }
void DivePlannerPointsModel::setDecoSac(int sac) void DivePlannerPointsModel::setDecoSac(int sac)
{ {
diveplan.decosac = sac; diveplan.decosac = sac * 1000;
emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1));
} }