git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1517 update copyright to version 2.8.2
[jalview.git]
/
src
/
jalview
/
workers
/
ConservationThread.java
diff --git
a/src/jalview/workers/ConservationThread.java
b/src/jalview/workers/ConservationThread.java
index
b6186d4
..
c440c0f
100644
(file)
--- a/
src/jalview/workers/ConservationThread.java
+++ b/
src/jalview/workers/ConservationThread.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-80,7
+80,7
@@
public class ConservationThread extends AlignCalcWorker implements
ourAnnot.add(conservation);
ourAnnot.add(quality);
ourAnnots = ourAnnot;
ourAnnot.add(conservation);
ourAnnot.add(quality);
ourAnnots = ourAnnot;
-
+ ConsPercGaps = alignViewport.getConsPercGaps();
// AlignViewport.UPDATING_CONSERVATION = true;
if (alignment == null || (alWidth = alignment.getWidth()) < 0)
// AlignViewport.UPDATING_CONSERVATION = true;
if (alignment == null || (alWidth = alignment.getWidth()) < 0)
@@
-125,7
+125,10
@@
public class ConservationThread extends AlignCalcWorker implements
{
if (b || !calcMan.isWorking(this) && cons != null
&& conservation != null && quality != null)
{
if (b || !calcMan.isWorking(this) && cons != null
&& conservation != null && quality != null)
+ {
+ alignViewport.setConservation(cons);
cons.completeAnnotations(conservation, quality, 0, alWidth);
cons.completeAnnotations(conservation, quality, 0, alWidth);
+ }
}
@Override
}
@Override