From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 31 Oct 2017 18:12:36 +0000 (+0000)
Subject: Merge branch 'bug/JAL-2791selectVisibleFeatures' into
X-Git-Tag: Release_2_11_0~164
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d2fbfb17ae43c983123e18a0ef1074c2aba907ff;p=jalview.git

Merge branch 'bug/JAL-2791selectVisibleFeatures' into
features/JAL-1793VCF

Conflicts:
	src/jalview/controller/AlignViewController.java
---

d2fbfb17ae43c983123e18a0ef1074c2aba907ff
diff --cc src/jalview/controller/AlignViewController.java
index cc5a184,7bb295e..8b001b3
--- a/src/jalview/controller/AlignViewController.java
+++ b/src/jalview/controller/AlignViewController.java
@@@ -243,20 -244,22 +244,22 @@@ public class AlignViewController implem
          List<SequenceFeature> sfs = sq.findFeatures(startColumn,
                  endColumn, featureType);
  
-         if (!sfs.isEmpty())
-         {
-           nseq++;
-         }
- 
+         boolean found = false;
          for (SequenceFeature sf : sfs)
          {
 -          {
 -            if (!visibleFeatures.contains(sf.getType())
 -                    || fr.getColour(sf) == null) // could pull up getColour to
 -                                                 // FeatureRenderer interface
 -            {
 -              continue;
 +          { 
 +            if (!visibleFeatures.contains(sf.getType()) 
 +                    || fr.getColour(sf) == null) // could pull up getColour to FeatureRenderer interface 
 +            { 
 +              continue; 
              }
            }
+           if (!found)
+           {
+             nseq++;
+           }
+           found = true;
++
            int sfStartCol = sq.findIndex(sf.getBegin());
            int sfEndCol = sq.findIndex(sf.getEnd());