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
Merge branch 'bug/JAL-2634' into develop
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
d3e502b
..
2881e81
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-643,6
+643,11
@@
public abstract class AlignmentViewport implements AlignViewportI,
{
residueShading.setConservation(hconservation);
}
{
residueShading.setConservation(hconservation);
}
+ /*
+ * reset conservation flag in case just set to false if
+ * Conservation was null (calculation still in progress)
+ */
+ residueShading.setConservationApplied(getConservationSelected());
residueShading.alignmentChanged(alignment, hiddenRepSequences);
}
residueShading.alignmentChanged(alignment, hiddenRepSequences);
}
@@
-1441,7
+1446,6
@@
public abstract class AlignmentViewport implements AlignViewportI,
setSequenceAnnotationsVisible(seq, true);
}
setSequenceAnnotationsVisible(seq, true);
}
- // ranges.setStartSeq(startSeq);
ranges.setStartEndSeq(startSeq, endSeq + tmp.size());
firePropertyChange("alignment", null, alignment.getSequences());
ranges.setStartEndSeq(startSeq, endSeq + tmp.size());
firePropertyChange("alignment", null, alignment.getSequences());