X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=7734f9affc6bc33489cd5ef21dedd8b0a8309e3d;hb=e33cdacd2ac2836504375c538574a0f1cafec7e3;hp=c14da85ce44bb151f73abb2cafcf15db96f6a8d1;hpb=92a3a0f396a86b2bc0a8d1a311680ceda4abec7b;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index c14da85..7734f9a 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -18,243 +18,377 @@
  */
 package jalview.gui;
 
+import jalview.datamodel.*;
+
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
-import jalview.analysis.*;
-import jalview.datamodel.*;
 
-public class IdCanvas
-    extends JPanel
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class IdCanvas extends JPanel
 {
-  protected AlignViewport av;
-  protected boolean showScores = true;
-  protected int maxIdLength = -1;
-  protected String maxIdStr = null;
-  BufferedImage image;
-  Graphics2D gg;
-  int imgHeight = 0;
-  boolean fastPaint = false;
-  java.util.Vector searchResults;
-
-  public IdCanvas(AlignViewport av)
-  {
-    setLayout(new BorderLayout());
-    this.av = av;
-    PaintRefresher.Register(this);
-  }
-
-  public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty,
-                           int ypos)
-  {
-    int charHeight = av.getCharHeight();
-
-    if ( (searchResults != null) && searchResults.contains(s))
-    {
-      gg.setColor(Color.black);
-      gg.fillRect(0,
-                  AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
-                  getWidth(), charHeight);
-      gg.setColor(Color.white);
-    }
-    else if ( (av.getSelectionGroup() != null) &&
-             av.getSelectionGroup().sequences.contains(s))
+    protected AlignViewport av;
+    protected boolean showScores = true;
+    protected int maxIdLength = -1;
+    protected String maxIdStr = null;
+    BufferedImage image;
+    Graphics2D gg;
+    int imgHeight = 0;
+    boolean fastPaint = false;
+    java.util.Vector searchResults;
+
+    /**
+     * Creates a new IdCanvas object.
+     *
+     * @param av DOCUMENT ME!
+     */
+    public IdCanvas(AlignViewport av)
     {
-      gg.setColor(Color.lightGray);
-      gg.fillRect(0,
-                  AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
-                  getWidth(), charHeight);
-      gg.setColor(Color.white);
+        setLayout(new BorderLayout());
+        this.av = av;
+        PaintRefresher.Register(this, av.alignment);
     }
-    else
-    {
-      gg.setColor(s.getColor());
-      gg.fillRect(0,
-                  AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos,
-                  getWidth(), charHeight);
-      gg.setColor(Color.black);
-    }
-
-    String string = s.getName();
 
-    if (av.getShowFullId())
+    /**
+     * DOCUMENT ME!
+     *
+     * @param gg DOCUMENT ME!
+     * @param s DOCUMENT ME!
+     * @param i DOCUMENT ME!
+     * @param starty DOCUMENT ME!
+     * @param ypos DOCUMENT ME!
+     */
+    public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty, int ypos)
     {
-      string = s.getDisplayId();
-    }
+        int charHeight = av.charHeight;
 
-    gg.drawString(string, 0,
-                  (AlignmentUtil.getPixelHeight(starty, i, charHeight) + ypos +
-                   charHeight) - (charHeight / 5));
-  }
+        if ((searchResults != null) && searchResults.contains(s))
+        {
+            gg.setColor(Color.black);
+            gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
+                charHeight);
+            gg.setColor(Color.white);
+        }
+        else if ((av.getSelectionGroup() != null) &&
+                av.getSelectionGroup().getSequences(false).contains(s))
+        {
+            gg.setColor(Color.lightGray);
+            gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
+                charHeight);
+            gg.setColor(Color.white);
+        }
+        else
+        {
+            gg.setColor(s.getColor());
+            gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
+                charHeight);
+            gg.setColor(Color.black);
+        }
 
-  public void fastPaint(int vertical)
-  {
-    if (gg == null)
-    {
-      repaint();
-      return;
-    }
 
-    gg.copyArea(0, 0, getWidth(), imgHeight, 0, -vertical * av.charHeight);
+        gg.drawString( s.getDisplayId(av.getShowJVSuffix()),
+                      0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
 
-    int ss = av.startSeq;
-    int es = av.endSeq;
-    int transY = 0;
+        if (av.hasHiddenRows && av.showHiddenMarkers)
+          drawMarker(i, starty, ypos);
 
-    if (vertical > 0) // scroll down
-    {
-      ss = es - vertical;
 
-      if (ss < av.startSeq)
-      { // ie scrolling too fast, more than a page at a time
-        ss = av.startSeq;
-      }
-      else
-      {
-        transY = imgHeight - (vertical * av.charHeight);
-      }
     }
-    else if (vertical < 0)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param vertical DOCUMENT ME!
+     */
+    public void fastPaint(int vertical)
     {
-      es = ss - vertical;
+        if (gg == null)
+        {
+            repaint();
 
-      if (es > av.endSeq)
-      {
-        es = av.endSeq;
-      }
-    }
+            return;
+        }
 
-    gg.translate(0, transY);
+        gg.copyArea(0, 0, getWidth(), imgHeight, 0, -vertical * av.charHeight);
 
-    drawIds(ss, es);
+        int ss = av.startSeq;
+        int es = av.endSeq;
+        int transY = 0;
 
-    gg.translate(0, -transY);
+        if (vertical > 0) // scroll down
+        {
+            ss = es - vertical;
+
+            if (ss < av.startSeq)
+            { // ie scrolling too fast, more than a page at a time
+                ss = av.startSeq;
+            }
+            else
+            {
+                transY = imgHeight - (vertical * av.charHeight);
+            }
+        }
+        else if (vertical < 0)
+        {
+            es = ss - vertical;
 
-    fastPaint = true;
-    repaint();
-  }
+            if (es > av.endSeq)
+            {
+                es = av.endSeq;
+            }
+        }
 
-  public void paintComponent(Graphics g)
-  {
-    g.setColor(Color.white);
-    g.fillRect(0, 0, getWidth(), getHeight());
+        gg.translate(0, transY);
 
-    if (fastPaint)
-    {
-      fastPaint = false;
-      g.drawImage(image, 0, 0, this);
+        drawIds(ss, es);
 
-      return;
-    }
+        gg.translate(0, -transY);
 
-    imgHeight = getHeight();
-    imgHeight -= (imgHeight % av.charHeight);
+        fastPaint = true;
+        repaint();
+    }
 
-    if (imgHeight < 1)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
     {
-      return;
-    }
+        g.setColor(Color.white);
+        g.fillRect(0, 0, getWidth(), getHeight());
 
-    image = new BufferedImage(getWidth(), imgHeight,
-                              BufferedImage.TYPE_INT_RGB);
-    gg = (Graphics2D) image.getGraphics();
+        if (fastPaint)
+        {
+            fastPaint = false;
+            g.drawImage(image, 0, 0, this);
 
-    //Fill in the background
-    gg.setColor(Color.white);
-    gg.fillRect(0, 0, getWidth(), imgHeight);
-    gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                        RenderingHints.VALUE_ANTIALIAS_ON);
+            return;
+        }
 
-    Font italic = new Font(av.getFont().getName(), Font.ITALIC,
-                           av.getFont().getSize());
-    gg.setFont(italic);
+        int oldHeight = imgHeight;
 
-    drawIds(av.getStartSeq(), av.endSeq);
+        imgHeight = getHeight();
+        imgHeight -= (imgHeight % av.charHeight);
 
-    g.drawImage(image, 0, 0, this);
-  }
+        if (imgHeight < 1)
+        {
+            return;
+        }
 
-  void drawIds(int starty, int endy)
-  {
-    if(gg==null)
-      return;
+        if(oldHeight!=imgHeight)
+        {
+          image = new BufferedImage(getWidth(), imgHeight,
+                                    BufferedImage.TYPE_INT_RGB);
+        }
 
+        gg = (Graphics2D) image.getGraphics();
+        //Fill in the background
+        gg.setColor(Color.white);
+        gg.fillRect(0, 0, getWidth(), imgHeight);
 
-    Color currentColor = Color.white;
-    Color currentTextColor = Color.black;
+        drawIds(av.getStartSeq(), av.endSeq);
 
-    if (av.getWrapAlignment())
-    {
-      int rowSize = av.getEndRes() - av.getStartRes();
-
-      // Draw the rest of the panels
-      for (int ypos = 2 * av.charHeight, row = av.startRes;
-           (ypos <= getHeight()) && (row < av.alignment.getWidth());
-           ypos += av.chunkHeight, row += rowSize)
-      {
-        for (int i = starty; i < av.alignment.getHeight(); i++)
-        {
-          SequenceI s = av.alignment.getSequenceAt(i);
-          drawIdString(gg, s, i, 0, ypos);
-        }
-      }
+        g.drawImage(image, 0, 0, this);
     }
-    else
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param starty DOCUMENT ME!
+     * @param endy DOCUMENT ME!
+     */
+    void drawIds(int starty, int endy)
     {
-      //Now draw the id strings
-      for (int i = starty; i < endy; i++)
-      {
-        // Selected sequence colours
-        if ( (searchResults != null) &&
-            searchResults.contains(av.alignment.getSequenceAt(i)))
-        {
-          gg.setColor(Color.black);
-          currentColor = Color.black;
-          currentTextColor = Color.white;
-        }
-        else if ( (av.getSelectionGroup() != null) &&
-                 av.getSelectionGroup().sequences.contains(
-                     av.alignment.getSequenceAt(i)))
+      Font italic = new Font(av.getFont().getName(), Font.ITALIC,
+                             av.getFont().getSize());
+
+      gg.setFont(italic);
+
+      if (av.antiAlias)
+        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                            RenderingHints.VALUE_ANTIALIAS_ON);
+
+        Color currentColor = Color.white;
+        Color currentTextColor = Color.black;
+
+        if (av.getWrapAlignment())
         {
-          currentColor = Color.lightGray;
-          currentTextColor = Color.black;
+          int maxwidth = av.alignment.getWidth();
+          int alheight = av.alignment.getHeight();
+
+          if (av.hasHiddenColumns)
+            maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+          int annotationHeight = 0;
+          AnnotationLabels labels = null;
+
+          if(av.showAnnotation)
+          {
+            AnnotationPanel ap = new AnnotationPanel(av);
+            annotationHeight = ap.adjustPanelHeight();
+            labels = new AnnotationLabels(av);
+          }
+
+          int hgap = av.charHeight;
+          if (av.scaleAboveWrapped)
+            hgap += av.charHeight;
+
+          int cHeight = alheight * av.charHeight
+              + hgap
+              + annotationHeight;
+
+          int rowSize = av.getEndRes() - av.getStartRes();
+
+
+            // Draw the rest of the panels
+            for (int ypos = hgap, row = av.startRes;
+                    (ypos <= getHeight()) && (row < maxwidth);
+                    ypos += cHeight, row += rowSize)
+            {
+              for (int i = starty; i < alheight; i++)
+              {
+                if (av.hasHiddenRows)
+                {
+                  setHiddenFont(i);
+                }
+                else
+                  gg.setFont(italic);
+
+                SequenceI s = av.alignment.getSequenceAt(i);
+                drawIdString(gg, s, i, 0, ypos);
+              }
+
+                if(labels!=null)
+                {
+                  gg.translate(0, ypos+(alheight * av.charHeight));
+                  labels.drawComponent(gg, getWidth());
+                  gg.translate(0, -ypos-(alheight * av.charHeight));
+                }
+
+
+            }
         }
         else
         {
-          currentColor = av.alignment.getSequenceAt(i).getColor();
-          currentTextColor = Color.black;
-        }
-
-        gg.setColor(currentColor);
+          //Now draw the id strings
+
+            //Now draw the id strings
+            for (int i = starty; i < endy; i++)
+            {
+              if (av.hasHiddenRows)
+              {
+                setHiddenFont(i);
+              }
+
+                // Selected sequence colours
+                if ( (searchResults != null) &&
+                    searchResults.contains(av.alignment.getSequenceAt(i)))
+                {
+                  currentColor = Color.black;
+                  currentTextColor = Color.white;
+                }
+                else if ( (av.getSelectionGroup() != null) &&
+                         av.getSelectionGroup().getSequences(false).contains(
+                             av.alignment.getSequenceAt(i)))
+                {
+                  currentColor = Color.lightGray;
+                  currentTextColor = Color.black;
+                }
+                else
+                {
+                  currentColor = av.alignment.getSequenceAt(i).getColor();
+                  currentTextColor = Color.black;
+                }
+
+                gg.setColor(currentColor);
+
+                gg.fillRect(0, (i - starty) * av.charHeight, getWidth(),
+                            av.charHeight);
+
+                gg.setColor(currentTextColor);
+
+                String string = av.alignment.getSequenceAt(i).getDisplayId( av.getShowJVSuffix());
+
+                gg.drawString(string, 0,
+                    (((i - starty) * av.charHeight) + av.charHeight) -
+                    (av.charHeight / 5));
+
+               if(av.hasHiddenRows && av.showHiddenMarkers)
+                 drawMarker(i, starty, 0);
+
+            }
 
-        gg.fillRect(0,
-                    AlignmentUtil.getPixelHeight(starty, i, av.charHeight),
-                    getWidth(), av.charHeight);
+        }
+    }
 
-        gg.setColor(currentTextColor);
+    void drawMarker(int i, int starty, int yoffset)
+    {
+      int hiddenIndex = av.adjustForHiddenSeqs(i);
+      int lastIndex = av.adjustForHiddenSeqs(i - 1);
+      int nextIndex = av.adjustForHiddenSeqs(i + 1);
 
-        String string = av.alignment.getSequenceAt(i).getName();
+      boolean below = (hiddenIndex > lastIndex + 1);
+      boolean above = (nextIndex>hiddenIndex+1);
 
-        if (av.getShowFullId())
+        gg.setColor(Color.blue);
+        if(below)
+        {
+          gg.fillPolygon(new int[]
+                         {getWidth()- av.charHeight,
+                         getWidth()- av.charHeight,
+                         getWidth()},
+                         new int[]
+                         {
+                         (i - starty) * av.charHeight +yoffset,
+                         (i - starty) * av.charHeight +yoffset+ av.charHeight / 4,
+                         (i - starty) * av.charHeight+yoffset
+          }, 3);
+        }
+        if(above)
         {
-          string = av.alignment.getSequenceAt(i).getDisplayId();
+          gg.fillPolygon(new int[]
+                        {getWidth()- av.charHeight,
+                        getWidth()- av.charHeight,
+                        getWidth() },
+                        new int[]
+                        {
+                        (i - starty+1) * av.charHeight +yoffset,
+                        (i - starty+1) * av.charHeight +yoffset- av.charHeight / 4,
+                        (i - starty+1) * av.charHeight +yoffset
+         }, 3);
+
         }
+    }
 
-        gg.drawString(string, 0,
-                      (AlignmentUtil.getPixelHeight(starty, i, av.charHeight) +
-                       av.charHeight) - (av.charHeight / 5));
-      }
+    void setHiddenFont(int i)
+    {
+      Font italic = new Font(av.getFont().getName(), Font.ITALIC,
+                             av.getFont().getSize());
+      Font bold = new Font(av.getFont().getName(), Font.BOLD,
+                           av.getFont().getSize());
 
-      // add a border
-      gg.setColor(Color.white);
-      gg.fillRect(getWidth() - 4, 0, 4, getHeight());
+      if (av.alignment.getSequenceAt(i).getHiddenSequences() != null)
+        gg.setFont(bold);
+      else
+        gg.setFont(italic);
     }
-  }
 
-  public void setHighlighted(java.util.Vector found)
-  {
-    searchResults = found;
-    repaint();
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param found DOCUMENT ME!
+     */
+    public void setHighlighted(java.util.Vector found)
+    {
+        searchResults = found;
+        repaint();
+    }
 }