X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRenderer.java;h=e66b7d5189753053692555297a9c9bb1d11b2451;hb=692669611f7244598bd34df92e8a3e5cbaf9bd2e;hp=39d705b13f17b6f29d7a5988625a42de6a123cab;hpb=c6d5255c09855fc1b0d03a085da9988a75cd3898;p=jalview.git

diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index 39d705b..e66b7d5 100644
--- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@ -20,10 +20,17 @@
  */
 package jalview.renderer.seqfeatures;
 
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.util.List;
+
 import jalview.api.AlignViewportI;
 import jalview.api.FeatureColourI;
+import jalview.datamodel.ContiguousI;
 import jalview.datamodel.MappedFeatures;
-import jalview.datamodel.Range;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
@@ -32,13 +39,6 @@ import jalview.util.Comparison;
 import jalview.util.ReverseListIterator;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.util.List;
-
 public class FeatureRenderer extends FeatureRendererModel
 {
   private static final AlphaComposite NO_TRANSPARENCY = AlphaComposite
@@ -112,6 +112,10 @@ public class FeatureRenderer extends FeatureRendererModel
         continue;
       }
 
+      /*
+       * JAL-3045 text is always drawn over features, even if
+       * 'Show Text' is unchecked in the format menu
+       */
       g.setColor(Color.white);
       int charOffset = (charWidth - fm.charWidth(s)) / 2;
       g.drawString(String.valueOf(s),
@@ -276,9 +280,9 @@ public class FeatureRenderer extends FeatureRendererModel
     /*
      * if columns are all gapped, or sequence has no features, nothing to do
      */
-    Range visiblePositions = seq.findPositions(start+1, end+1);
-    if (visiblePositions == null || (!seq.getFeatures().hasFeatures()
-            && !av.isShowComplementFeatures()))
+    ContiguousI visiblePositions = seq.findPositions(start + 1, end + 1);
+    if (visiblePositions == null || !seq.getFeatures().hasFeatures()
+            && !av.isShowComplementFeatures())
     {
       return null;
     }
@@ -319,7 +323,7 @@ public class FeatureRenderer extends FeatureRendererModel
       List<SequenceFeature> overlaps = seq.getFeatures().findFeatures(
               visiblePositions.getBegin(), visiblePositions.getEnd(), type);
 
-      if (fc.isSimpleColour())
+      if (overlaps.size() > 1 && fc.isSimpleColour())
       {
         filterFeaturesForDisplay(overlaps);
       }
@@ -354,8 +358,8 @@ public class FeatureRenderer extends FeatureRendererModel
         }
 
         int featureStartCol = seq.findIndex(visibleStart);
-        int featureEndCol = sf.begin == sf.end ? featureStartCol : seq
-                .findIndex(visibleEnd);
+        int featureEndCol = sf.begin == sf.end ? featureStartCol
+                : seq.findIndex(visibleEnd);
 
         // Color featureColour = getColour(sequenceFeature);
 
@@ -396,14 +400,13 @@ public class FeatureRenderer extends FeatureRendererModel
           else
           {
           */
-            boolean drawn = renderFeature(g, seq,
-                    featureStartCol - 1,
-                    featureEndCol - 1, featureColour,
-                    start, end, y1, colourOnly);
-            if (drawn)
-            {
-              drawnColour = featureColour;
-            }
+          boolean drawn = renderFeature(g, seq, featureStartCol - 1,
+                  featureEndCol - 1, featureColour, start, end, y1,
+                  colourOnly);
+          if (drawn)
+          {
+            drawnColour = featureColour;
+          }
           /*}*/
         }
       }
@@ -447,23 +450,29 @@ public class FeatureRenderer extends FeatureRendererModel
    */
   Color drawComplementFeatures(final Graphics g, final SequenceI seq,
           int start, int end, int y1, boolean colourOnly,
-          Range visiblePositions, Color drawnColour)
+          ContiguousI visiblePositions, Color drawnColour)
   {
     AlignViewportI comp = av.getCodingComplement();
     FeatureRenderer fr2 = Desktop.getAlignFrameFor(comp)
             .getFeatureRenderer();
-    for (int pos = visiblePositions.start; pos <= visiblePositions.end; pos++)
+
+    final int visibleStart = visiblePositions.getBegin();
+    final int visibleEnd = visiblePositions.getEnd();
+
+    for (int pos = visibleStart; pos <= visibleEnd; pos++)
     {
       int column = seq.findIndex(pos);
-      MappedFeatures mf = fr2
-              .findComplementFeaturesAtResidue(seq, pos);
-      for (SequenceFeature sf : mf.features)
+      MappedFeatures mf = fr2.findComplementFeaturesAtResidue(seq, pos);
+      if (mf != null)
       {
-        FeatureColourI fc = fr2.getFeatureStyle(sf.getType());
-        Color featureColour = fr2.getColor(sf, fc);
-        renderFeature(g, seq, column - 1, column - 1, featureColour,
-                start, end, y1, colourOnly);
-        drawnColour = featureColour;
+        for (SequenceFeature sf : mf.features)
+        {
+          FeatureColourI fc = fr2.getFeatureStyle(sf.getType());
+          Color featureColour = fr2.getColor(sf, fc);
+          renderFeature(g, seq, column - 1, column - 1, featureColour,
+                  start, end, y1, colourOnly);
+          drawnColour = featureColour;
+        }
       }
     }
     return drawnColour;
@@ -528,10 +537,15 @@ public class FeatureRenderer extends FeatureRendererModel
         continue;
       }
 
+      /*
+       * find features of this type, and the colour of the _last_ one
+       * (the one that would be drawn on top) that has a colour
+       */
       List<SequenceFeature> overlaps = seq.findFeatures(column, column,
               type);
-      for (SequenceFeature sequenceFeature : overlaps)
+      for (int i = overlaps.size() - 1 ; i >= 0 ; i--)
       {
+        SequenceFeature sequenceFeature = overlaps.get(i);
         if (!featureGroupNotShown(sequenceFeature))
         {
           Color col = getColour(sequenceFeature);
@@ -561,9 +575,12 @@ public class FeatureRenderer extends FeatureRendererModel
     AlignViewportI complement = av.getCodingComplement();
     AlignFrame af = Desktop.getAlignFrameFor(complement);
     FeatureRendererModel fr2 = af.getFeatureRenderer();
-    MappedFeatures mf = fr2.findComplementFeaturesAtResidue(
-            seq, seq.findPosition(column - 1));
-
+    MappedFeatures mf = fr2.findComplementFeaturesAtResidue(seq,
+            seq.findPosition(column - 1));
+    if (mf == null)
+    {
+      return null;
+    }
     ReverseListIterator<SequenceFeature> it = new ReverseListIterator<>(
             mf.features);
     while (it.hasNext())