From c0f9aa17f55a468c72d63027ab72531976760123 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 30 Aug 2013 12:05:36 +0100 Subject: [PATCH] JAL-1367 allow reference sequence to be shown in bold in ID panel --- src/jalview/appletgui/IdCanvas.java | 4 ++-- src/jalview/gui/IdCanvas.java | 4 ++-- src/jalview/viewmodel/AlignmentViewport.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java index a35be15..14cccc9 100755 --- a/src/jalview/appletgui/IdCanvas.java +++ b/src/jalview/appletgui/IdCanvas.java @@ -224,7 +224,7 @@ public class IdCanvas extends Panel SequenceI s = av.getAlignment().getSequenceAt(i); gg.setFont(italic); - if (av.hasHiddenRows()) + if (av.isDisplayReferenceSeq() || av.hasHiddenRows()) { setHiddenFont(s); } @@ -254,7 +254,7 @@ public class IdCanvas extends Panel } gg.setFont(italic); // boolean isrep=false; - if (av.hasHiddenRows()) + if (av.isDisplayReferenceSeq() || av.hasHiddenRows()) { // isrep = setHiddenFont(seq); diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 5b589bb..92747a2 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -307,7 +307,7 @@ public class IdCanvas extends JPanel for (int i = starty; i < alheight; i++) { SequenceI s = av.getAlignment().getSequenceAt(i); - if (av.hasHiddenRows()) + if (av.isDisplayReferenceSeq() || av.hasHiddenRows()) { setHiddenFont(s); } @@ -347,7 +347,7 @@ public class IdCanvas extends JPanel continue; } - if (av.hasHiddenRows()) + if (av.isDisplayReferenceSeq() || av.hasHiddenRows()) { setHiddenFont(sequence); } diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java index 05f69b1..2d06012 100644 --- a/src/jalview/viewmodel/AlignmentViewport.java +++ b/src/jalview/viewmodel/AlignmentViewport.java @@ -984,8 +984,8 @@ public abstract class AlignmentViewport implements AlignViewportI public boolean isHiddenRepSequence(SequenceI seq) { - return hiddenRepSequences != null - && hiddenRepSequences.containsKey(seq); + return alignment.getSeqrep()==seq || (hiddenRepSequences != null + && hiddenRepSequences.containsKey(seq)); } public SequenceGroup getRepresentedSequences(SequenceI seq) -- 1.7.10.2