diff options
| -rw-r--r-- | planner.c | 8 | ||||
| -rw-r--r-- | qt-ui/diveplanner.cpp | 4 |
2 files changed, 5 insertions, 7 deletions
@@ -480,7 +480,6 @@ static unsigned int *sort_stops(int *dstops, int dnr, struct gaschanges *gstops, return stoplevels; } -#if DO_WE_WANT_THIS_IN_QT static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive) { char buffer[20000]; @@ -493,7 +492,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive) return; 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 */ o2 = get_o2(&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; const char *unit; 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) continue; len = strlen(buffer); @@ -576,7 +577,6 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive) } dive->notes = strdup(buffer); } -#endif 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; record_dive(dive); -#if DO_WE_WANT_THIS_IN_QT add_plan_to_notes(diveplan, dive); -#endif error_exit: free(stoplevels); diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index ada2b4e73..312a5ffff 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -441,13 +441,13 @@ DivePlannerPointsModel *DivePlannerPointsModel::instance() void DivePlannerPointsModel::setBottomSac(int sac) { - diveplan.bottomsac = sac; + diveplan.bottomsac = sac * 1000; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } void DivePlannerPointsModel::setDecoSac(int sac) { - diveplan.decosac = sac; + diveplan.decosac = sac * 1000; emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1)); } |