From 0a2de5e40c8a65c535374f965e0f568b2f41fc17 Mon Sep 17 00:00:00 2001 From: kiramt Date: Wed, 22 Mar 2017 10:29:16 +0000 Subject: [PATCH] JAL-2388 Minor changes to thread flags --- src/jalview/gui/OverviewCanvas.java | 18 +++++++++--------- src/jalview/gui/OverviewPanel.java | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java index ba5881e..7d42e5e 100644 --- a/src/jalview/gui/OverviewCanvas.java +++ b/src/jalview/gui/OverviewCanvas.java @@ -20,11 +20,11 @@ public class OverviewCanvas extends JComponent private BufferedImage lastMiniMe = null; - public boolean resizing = false; + public boolean updating = false; // This is set true if the user resizes whilst // the overview is being calculated - public boolean resizeAgain = false; + public volatile boolean updateAgain = false; // Can set different properties in this seqCanvas than // main visible SeqCanvas @@ -95,7 +95,7 @@ public class OverviewCanvas extends JComponent if (showAnnotation) { renderer.updateFromAlignViewport(av); - for (int col = 0; col < od.getWidth() && !resizeAgain; col++) + for (int col = 0; col < od.getWidth() && !updateAgain; col++) { mg.translate(col, od.getSequencesHeight()); renderer.drawGraph(mg, av.getAlignmentConservationAnnotation(), @@ -108,11 +108,11 @@ public class OverviewCanvas extends JComponent } System.gc(); - resizing = false; + updating = false; - if (resizeAgain) + if (updateAgain) { - resizeAgain = false; + updateAgain = false; op.updateOverviewImage(); } else @@ -124,7 +124,7 @@ public class OverviewCanvas extends JComponent @Override public void paintComponent(Graphics g) { - if (resizing || resizeAgain) + if (updating || updateAgain) { if (lastMiniMe == null) { @@ -168,7 +168,7 @@ public class OverviewCanvas extends JComponent // get hidden row and hidden column map once at beginning. // clone featureRenderer settings to avoid race conditions... if state is // updated just need to refresh again - for (int row = 0; row < od.getSequencesHeight() && !resizeAgain; row++) + for (int row = 0; row < od.getSequencesHeight() && !updateAgain; row++) { boolean doCopy = true; int currentrow = (int) (row * sampleRow); @@ -184,7 +184,7 @@ public class OverviewCanvas extends JComponent seq = av.getAlignment().getSequenceAtAbsoluteIndex(lastrow); } - for (int col = 0; col < od.getWidth() && !resizeAgain; col++) + for (int col = 0; col < od.getWidth() && !updateAgain; col++) { if (doCopy) { diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 01ca978..f9f3e4c 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -117,13 +117,13 @@ public class OverviewPanel extends JPanel implements Runnable */ public void updateOverviewImage() { - if (oviewCanvas.resizing) + if (oviewCanvas.updating) { - oviewCanvas.resizeAgain = true; + oviewCanvas.updateAgain = true; return; } - oviewCanvas.resizing = true; + oviewCanvas.updating = true; if ((getWidth() > 0) && (getHeight() > 0)) { -- 1.7.10.2