From 45395fd466a8d71a1600cf182d08d4aa45d3b892 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 16 May 2018 15:25:57 +0200 Subject: Dive pictures: Don't plot pictures twice when changing current dive In MainWindow::current_dive_changed() first plotDive() is called, which replots all the pictures by calling plotPictures(). This is pointess, because it plots the pictures of the previous dive. Then, updateDiveInfo() is called, which resets the dive pictures and automatically replots them. Thus, switching between dives both with hundreds of pictures is way slower than necessary. Switching the plotDive() and updateDiveInfo() calls doesn't work. The reason is not 100% clear, but it doesn't make sense to plot pictures of the new dive as long as the profile still shows the old dive anyway. As a quick-fix, add a flag to plotDive(), which tells the function to clear the pictures list instead of redrawing it. Ultimately, plotDive() should probably be split in two functions. One for the callers who update the pictures themselves and one for the others. Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 8 ++++---- desktop-widgets/printer.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 9898fc72b..030b33b70 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -531,7 +531,7 @@ void MainWindow::current_dive_changed(int divenr) if (divenr >= 0) { select_dive(divenr); } - graphics()->plotDive(); + graphics()->plotDive(nullptr, false, true); information()->updateDiveInfo(); configureToolbar(); MapWidget::instance()->reload(); @@ -1095,7 +1095,7 @@ void MainWindow::on_actionAddDive_triggered() graphics()->setAddState(); DivePlannerPointsModel::instance()->createSimpleDive(); configureToolbar(); - graphics()->plotDive(); + graphics()->plotDive(nullptr, false, true); fixup_dc_duration(&displayed_dive.dc); displayed_dive.duration = displayed_dive.dc.duration; @@ -1314,7 +1314,7 @@ void MainWindow::on_actionPreviousDC_triggered() unsigned nrdc = number_of_computers(current_dive); dc_number = (dc_number + nrdc - 1) % nrdc; configureToolbar(); - graphics()->plotDive(); + graphics()->plotDive(nullptr, false, true); information()->updateDiveInfo(); } @@ -1323,7 +1323,7 @@ void MainWindow::on_actionNextDC_triggered() unsigned nrdc = number_of_computers(current_dive); dc_number = (dc_number + 1) % nrdc; configureToolbar(); - graphics()->plotDive(); + graphics()->plotDive(nullptr, false, true); information()->updateDiveInfo(); } diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp index 7381b5f7f..2d1a1d258 100644 --- a/desktop-widgets/printer.cpp +++ b/desktop-widgets/printer.cpp @@ -41,7 +41,7 @@ void Printer::putProfileImage(QRect profilePlaceholder, QRect viewPort, QPainter int y = profilePlaceholder.y() - viewPort.y(); // use the placeHolder and the viewPort position to calculate the relative position of the dive profile. QRect pos(x, y, profilePlaceholder.width(), profilePlaceholder.height()); - profile->plotDive(dive, true); + profile->plotDive(dive, true, true); if (!printOptions->color_selected) { QImage image(pos.width(), pos.height(), QImage::Format_ARGB32); @@ -204,7 +204,7 @@ void Printer::render(int Pages = 0) prefs.animation_speed = animationOriginal; //replot the dive after returning the settings - profile->plotDive(0, true); + profile->plotDive(0, true, true); } //value: ranges from 0 : 100 and shows the progress of the templating engine -- cgit v1.2.3-70-g09d2