From a01e54d0cb8f9511077685d0d3f75004df7bdce1 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 25 Mar 2016 15:31:22 +0000 Subject: [PATCH] JAL-2034 break out of redraw loop early if another update has already been requested --- src/jalview/appletgui/OverviewPanel.java | 8 ++++++++ src/jalview/gui/OverviewPanel.java | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index bc64728..c068a4d 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -304,6 +304,10 @@ public class OverviewPanel extends Panel implements Runnable, AlignmentI alignment = av.getAlignment(); for (row = 0; row <= sequencesHeight; row++) { + if (resizeAgain) + { + break; + } if ((int) (row * sampleRow) == lastrow) { sameRow++; @@ -385,6 +389,10 @@ public class OverviewPanel extends Panel implements Runnable, { for (col = 0; col < width; col++) { + if (resizeAgain) + { + break; + } lastcol = (int) (col * sampleCol); { mg.translate(col, sequencesHeight); diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index de0dbe5..9be4fdb 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -297,12 +297,20 @@ public class OverviewPanel extends JPanel implements Runnable boolean hiddenRow = false; for (row = 0; row < sequencesHeight; row++) { + if (resizeAgain) + { + break; + } if ((int) (row * sampleRow) == lastrow) { // No need to recalculate the colours, // Just copy from the row above for (col = 0; col < width; col++) { + if (resizeAgain) + { + break; + } miniMe.setRGB(col, row, miniMe.getRGB(col, row - 1)); } continue; @@ -340,6 +348,10 @@ public class OverviewPanel extends JPanel implements Runnable for (col = 0; col < width; col++) { + if (resizeAgain) + { + break; + } if ((int) (col * sampleCol) == lastcol && (int) (row * sampleRow) == lastrow) { @@ -380,6 +392,10 @@ public class OverviewPanel extends JPanel implements Runnable renderer.updateFromAlignViewport(av); for (col = 0; col < width; col++) { + if (resizeAgain) + { + break; + } lastcol = (int) (col * sampleCol); { mg.translate(col, sequencesHeight); -- 1.7.10.2