diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2016-11-08 21:17:35 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-11-09 06:25:11 -0800 |
| commit | 05098f90cd89315a618907038e5e625e767e2b0e (patch) | |
| tree | fdd74d471f76e7f886c3d339f850eb8fb78b7030 | |
| parent | 97be5fda2c9ed3cf135c31a0e2c77107ab2d7eb1 (diff) | |
| download | subsurface-05098f90cd89315a618907038e5e625e767e2b0e.tar.gz | |
Use fake profile when replanning dives without samples
This can happen when the user asks to replan a dive that
was imported from CSV.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 33151efb8..e1ef641dc 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -903,9 +903,9 @@ void MainWindow::setupForAddAndPlan(const char *model) void MainWindow::on_actionReplanDive_triggered() { - if (!plannerStateClean() || !current_dive || !current_dive->dc.model) + if (!plannerStateClean() || !current_dive) return; - else if (strcmp(current_dive->dc.model, "planned dive")) { + else if (!current_dive->dc.model || strcmp(current_dive->dc.model, "planned dive")) { if (QMessageBox::warning(this, tr("Warning"), tr("Trying to replan a dive that's not a planned dive."), QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) return; diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 27797d148..43e4686ff 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -4,6 +4,7 @@ #include "qt-models/cylindermodel.h" #include "core/planner.h" #include "qt-models/models.h" +#include "core/device.h" /* TODO: Port this to CleanerTableModel to remove a bit of boilerplate and * use the signal warningMessage() to communicate errors to the MainWindow. @@ -66,6 +67,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d) int depthsum = 0; int samplecount = 0; bool oldRec = recalc; + struct divecomputer *dc = &(d->dc); recalc = false; CylindersModel::instance()->updateDive(); duration_t lasttime = {}; @@ -79,16 +81,18 @@ void DivePlannerPointsModel::loadFromDive(dive *d) bool hasMarkedSamples = false; - if (d->dc.samples) - hasMarkedSamples = d->dc.sample[0].manually_entered; + if (dc->samples) + hasMarkedSamples = dc->sample[0].manually_entered; + else + dc = fake_dc(dc, true); // if this dive has more than 100 samples (so it is probably a logged dive), // average samples so we end up with a total of 100 samples. - int plansamples = d->dc.samples <= 100 ? d->dc.samples : 100; + int plansamples = dc->samples <= 100 ? dc->samples : 100; int j = 0; for (int i = 0; i < plansamples - 1; i++) { - while (j * plansamples <= i * d->dc.samples) { - const sample &s = d->dc.sample[j]; + while (j * plansamples <= i * dc->samples) { + const sample &s = dc->sample[j]; if (s.time.seconds != 0 && (!hasMarkedSamples || s.manually_entered)) { depthsum += s.depth.mm; ++samplecount; @@ -97,7 +101,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d) j++; } if (samplecount) { - int cylinderid = get_cylinderid_at_time(d, &d->dc, lasttime); + int cylinderid = get_cylinderid_at_time(d, dc, lasttime); addStop(depthsum / samplecount, newtime.seconds, cylinderid, 0, true); lasttime = newtime; depthsum = 0; |