X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=99447a4b1aabbafd3c6fcb04635474a9b774b3b7;hb=b2319fcc38be5c500ed7cafc014cf9da96a4ce98;hp=42424d9dc8a4a30b95cd7f93905ec5d9e0385ec5;hpb=9c5d69ef1e102b1eac18ec13c362522f40c9000d;p=jalview.git

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 42424d9..99447a4 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -24,7 +24,6 @@ import java.awt.*;
 import java.awt.image.*;
 
 import javax.swing.*;
-import jalview.schemes.*;
 
 
 /**
@@ -35,19 +34,23 @@ import jalview.schemes.*;
  */
 public class SeqCanvas extends JComponent
 {
-    FeatureRenderer fr;
-    SequenceRenderer sr;
+    final FeatureRenderer fr;
+    final SequenceRenderer sr;
     BufferedImage img;
     Graphics2D gg;
     int imgWidth;
     int imgHeight;
     AlignViewport av;
-    boolean displaySearch = false;
-    int[] searchResults = null;
+    SearchResults searchResults = null;
     boolean fastPaint = false;
     int LABEL_WEST;
     int LABEL_EAST;
 
+
+    int cursorX = 0;
+    int cursorY = 0;
+
+
     /**
      * Creates a new SeqCanvas object.
      *
@@ -102,8 +105,11 @@ public class SeqCanvas extends JComponent
         // NORTH SCALE
         for (int i = scalestartx; i < endx; i += 10)
         {
-            String string = String.valueOf(i);
-            g.drawString(string, (i - startx - 1) * av.charWidth,
+            int value = i;
+            if(av.hasHiddenColumns)
+                value = av.getColumnSelection().adjustForHiddenColumns(value);
+
+            g.drawString( String.valueOf(value), (i - startx - 1) * av.charWidth,
                 ypos - (av.charHeight / 2));
 
             g.drawLine(((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
@@ -126,6 +132,9 @@ public class SeqCanvas extends JComponent
         FontMetrics fm = getFontMetrics(av.getFont());
         ypos += av.charHeight;
 
+        if(av.hasHiddenColumns)
+                startx = av.getColumnSelection().adjustForHiddenColumns(startx);
+
         // EAST SCALE
         for (int i = 0; i < av.alignment.getHeight(); i++)
         {
@@ -168,6 +177,9 @@ public class SeqCanvas extends JComponent
     {
         ypos += av.charHeight;
 
+        if(av.hasHiddenColumns)
+                endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+
         // EAST SCALE
         for (int i = 0; i < av.alignment.getHeight(); i++)
         {
@@ -175,6 +187,8 @@ public class SeqCanvas extends JComponent
             int index = endx;
             int value = -1;
 
+
+
             while (index > startx)
             {
                 if (jalview.util.Comparison.isGap(seq.getCharAt(index)))
@@ -191,7 +205,7 @@ public class SeqCanvas extends JComponent
 
             if (value != -1)
             {
-                g.drawString(String.valueOf(value), av.charWidth/2,
+                g.drawString(String.valueOf(value), 0,
                     (ypos + (i * av.charHeight)) - (av.charHeight / 5));
             }
         }
@@ -210,6 +224,9 @@ public class SeqCanvas extends JComponent
             return;
         }
 
+
+        fastPaint = true;
+
         gg.copyArea(horizontal * av.charWidth,
                     vertical * av.charHeight,
                     imgWidth,
@@ -224,6 +241,7 @@ public class SeqCanvas extends JComponent
         int transX = 0;
         int transY = 0;
 
+
         if (horizontal > 0) // scrollbar pulled right, image to the left
         {
             er ++;
@@ -258,10 +276,9 @@ public class SeqCanvas extends JComponent
         }
 
         gg.translate(transX, transY);
-        drawPanel(gg, sr, er, ss, es, sr, ss, 0);
+        drawPanel(gg, sr, er, ss, es, 0);
         gg.translate(-transX, -transY);
 
-        fastPaint = true;
         repaint();
     }
 
@@ -281,7 +298,7 @@ public class SeqCanvas extends JComponent
     {
         super.paintComponent(g);
 
-        sr.renderGaps(av.renderGaps);
+
 
         if ( img != null && (fastPaint
              || (getVisibleRect().width != g.getClipBounds().width)
@@ -308,8 +325,10 @@ public class SeqCanvas extends JComponent
         img = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);
         gg = (Graphics2D) img.getGraphics();
         gg.setFont(av.getFont());
-        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-          RenderingHints.VALUE_ANTIALIAS_ON);
+
+        if (av.antiAlias)
+          gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                              RenderingHints.VALUE_ANTIALIAS_ON);
 
         gg.setColor(Color.white);
         gg.fillRect(0, 0, imgWidth, imgHeight);
@@ -321,15 +340,14 @@ public class SeqCanvas extends JComponent
         }
         else
         {
-            drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq,
-                av.startRes, av.startSeq, 0);
+            drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, 0);
         }
 
         g.drawImage(img, 0, 0, this);
 
         if (pdbCanvas != null)
         {
-         pdbCanvas.updateSeqColours();
+           pdbCanvas.updateSeqColours();
         }
 
     }
@@ -350,7 +368,7 @@ public class SeqCanvas extends JComponent
 
         if (av.scaleRightWrapped)
         {
-            LABEL_EAST = fm.stringWidth(getMask()+"0");
+            LABEL_EAST = fm.stringWidth(getMask());
         }
 
         if (av.scaleLeftWrapped)
@@ -368,7 +386,7 @@ public class SeqCanvas extends JComponent
      */
     String getMask()
     {
-      String mask = "0";
+      String mask = "00";
       for (int i = av.alignment.getWidth(); i > 0; i /= 10)
       {
         mask += "0";
@@ -396,7 +414,7 @@ public class SeqCanvas extends JComponent
 
         if (av.scaleRightWrapped)
         {
-            LABEL_EAST = fm.stringWidth(getMask()+"0");
+            LABEL_EAST = fm.stringWidth(getMask());
         }
 
         int LABEL_WEST = 0;
@@ -418,12 +436,18 @@ public class SeqCanvas extends JComponent
         av.endRes = av.startRes + cWidth;
 
 
-        int endx = (startRes + cWidth) - 1;
+        int endx;
         int ypos = hgap;
 
-
         while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))
         {
+          endx = startRes + cWidth;
+
+          if (endx > al.getWidth())
+          {
+            endx = al.getWidth();
+          }
+
             g.setFont(av.getFont());
             g.setColor(Color.black);
 
@@ -460,13 +484,7 @@ public class SeqCanvas extends JComponent
                     cWidth * av.charWidth, (int) clip.getBounds().getHeight());
             }
 
-            if (av.vconsensus!=null && av.alignment.getWidth() >= av.vconsensus.size())
-            {
-              endx = av.vconsensus.size() - 2;
-            }
-
-
-            drawPanel(g, startRes, endx, 0, al.getHeight(), startRes, 0, ypos);
+            drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);
 
             if(av.showAnnotation)
             {
@@ -474,7 +492,7 @@ public class SeqCanvas extends JComponent
               if(annotations==null)
                 annotations = new AnnotationPanel(av);
 
-              annotations.drawComponent( (Graphics2D) g, startRes, endx + 1);
+              annotations.drawComponent( (Graphics2D) g, startRes, endx);
               g.translate(0, -cHeight - ypos);
             }
             g.setClip(clip);
@@ -485,12 +503,6 @@ public class SeqCanvas extends JComponent
               ypos -= 3;
 
             startRes += cWidth;
-            endx = (startRes + cWidth) - 1;
-
-            if (endx > al.getWidth())
-            {
-                endx = al.getWidth();
-            }
         }
     }
 
@@ -510,116 +522,127 @@ public class SeqCanvas extends JComponent
      * DOCUMENT ME!
      *
      * @param g1 DOCUMENT ME!
-     * @param x1 DOCUMENT ME!
-     * @param x2 DOCUMENT ME!
-     * @param y1 DOCUMENT ME!
-     * @param y2 DOCUMENT ME!
-     * @param startx DOCUMENT ME!
-     * @param starty DOCUMENT ME!
+     * @param startRes DOCUMENT ME!
+     * @param endRes DOCUMENT ME!
+     * @param startSeq DOCUMENT ME!
+     * @param endSeq DOCUMENT ME!
      * @param offset DOCUMENT ME!
      */
-
-    float aaRatio = 2f/3f;
-    public void increaseAARatio()
+    void drawPanel(Graphics g1, int startRes, int endRes,
+                    int startSeq, int endSeq, int offset)
     {
-      aaRatio += .025;
-      if(aaRatio>1)
-        aaRatio = 1;
+      if(!av.hasHiddenColumns)
+      {
+        draw(g1, startRes, endRes, startSeq, endSeq, offset);
+      }
+      else
+      {
+        java.util.Vector regions = av.getColumnSelection().getHiddenColumns();
 
-      repaint();
-    }
+        int screenY = 0;
+        int blockStart = startRes;
+        int blockEnd = endRes;
 
-    public void decreaseAARation()
-    {
-      aaRatio -= .025;
-      if(aaRatio<0)
-        aaRatio = 0;
+        for (int i = 0; i < regions.size(); i++)
+        {
+          int[] region = (int[]) regions.elementAt(i);
+          int hideStart = region[0];
+          int hideEnd = region[1];
+
+          if (hideStart <= blockStart)
+          {
+            blockStart += (hideEnd - hideStart) + 1;
+            continue;
+          }
+
+          blockEnd = hideStart - 1;
+
+          g1.translate(screenY * av.charWidth, 0);
+
+          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);
+
+          g1.setColor(Color.blue);
+          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,
+                      startSeq + offset,
+                      (blockEnd - blockStart + 1) * av.charWidth - 1,
+                      startSeq + (endSeq - startSeq) * av.charHeight + offset);
+          g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth,
+                      startSeq + offset,
+                      (blockEnd - blockStart + 1) * av.charWidth,
+                      startSeq + (endSeq - startSeq) * av.charHeight + offset);
+
+          g1.translate( -screenY * av.charWidth, 0);
+          screenY += blockEnd - blockStart + 1;
+          blockStart = hideEnd + 1;
+        }
+
+        if (screenY <= (endRes - startRes))
+        {
+          blockEnd = blockStart + (endRes - startRes) - screenY;
+          g1.translate(screenY * av.charWidth, 0);
+          draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);
+          g1.translate( -screenY * av.charWidth, 0);
+        }
+      }
 
-      repaint();
     }
 
 
-    synchronized public void drawPanel(Graphics g1, int x1, int x2, int y1,
-        int y2, int startx, int starty, int offset)
-    {
-      Graphics2D g = (Graphics2D) g1;
-      g.setFont(av.getFont());
 
-      SequenceI nextSeq, dna = null;
-      int aaHeight = av.charHeight, dnaHeight = av.charHeight;
-      Font dnafont = null, aafont = av.getFont();
 
- /*     if (av.getShowTranslation())
-      {
-        aaHeight = (int) (av.getCharHeight() * aaRatio);
-        dnaHeight = (int) (av.getCharHeight() * (1 - aaRatio));
-        java.awt.geom.AffineTransform transform = new java.awt.geom.AffineTransform();
-        transform.scale(1f / 3f, 1);
-        dnafont = new Font(av.getFont().getName(), av.getFont().getStyle(),
-                                dnaHeight);
-        dnafont = dnafont.deriveFont(transform);
-
-        aafont = new Font(av.getFont().getName(), av.getFont().getStyle(),
-                               aaHeight);
-        transform = new java.awt.geom.AffineTransform();
-        transform.scale(1 / aaRatio, 1);
-        aafont = aafont.deriveFont(transform);
-      }
-*/
+    //int startRes, int endRes, int startSeq, int endSeq, int x, int y,
+    // int x1, int x2, int y1, int y2, int startx, int starty,
+    void draw(Graphics g1,
+                   int startRes, int endRes,
+                   int startSeq, int endSeq,
+                   int offset)
+   {
 
-      ColourSchemeI cs = av.getGlobalColourScheme();
+
+      Graphics2D g = (Graphics2D) g1;
+      g.setFont(av.getFont());
+      sr.prepare(g, av.renderGaps);
+
+      SequenceI nextSeq;
 
         /// First draw the sequences
         /////////////////////////////
-        for (int i = y1; i < y2; i++)
+        for (int i = startSeq; i < endSeq; i++)
         {
             nextSeq = av.alignment.getSequenceAt(i);
-            g.setFont(aafont);
-         /*   if(av.getShowTranslation())
-            {
-              dna = nextSeq;
-              StringBuffer sb = new StringBuffer();
-              for(int r = 0; r<nextSeq.getLength(); r+=3)
-              {
-                String codon = nextSeq.getSequence(r, r+3);
-                codon = codon.replace('U', 'T');
-                String res = ResidueProperties.codonTranslate(codon);
-                if(res !=null )
-                {
-                  if (res.equals("STOP"))
-                    sb.append("X");
-                  else
-                    sb.append(res);
-                }
-              }
-              nextSeq = new Sequence("d", sb.toString());
-            }*/
 
-            sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq),
-                            x1, x2, (x1 - startx) * av.charWidth,
-                            offset + ( (i - starty) * av.charHeight), av.charWidth,
-                            aaHeight);
+            sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),
+                            startRes, endRes,
+                            offset + ( (i - startSeq) * av.charHeight));
 
-         /*   if(av.getShowTranslation())
+            if (av.showSequenceFeatures)
             {
-              av.setGlobalColourScheme(new NucleotideColourScheme());
-              g.setFont(dnafont);
-              sr.drawSequence(g, dna, null,
-                              x1*3, (x2+2) * 3, ( (x1 - startx) * av.charWidth) / 3,
-                              offset + ( (i - starty) * av.charHeight) + aaHeight,
-                              av.charWidth / 3,
-                              dnaHeight);
-              av.setGlobalColourScheme(cs);
-            }*/
+                fr.drawSequence(g1, nextSeq, startRes, endRes,
+                    offset + ((i - startSeq) * av.charHeight));
+            }
 
-            if (av.showSequenceFeatures)
+            /// Highlight search Results once all sequences have been drawn
+            //////////////////////////////////////////////////////////
+            if (searchResults != null)
             {
-                fr.drawSequence(g, nextSeq, x1, x2,
-                    (x1 - startx) * av.charWidth,
-                    offset + ((i - starty) * av.charHeight), av.charWidth,
-                    av.charHeight);
+              int[] visibleResults = searchResults.getResults(nextSeq, startRes, endRes);
+              if (visibleResults != null)
+                for (int r = 0; r < visibleResults.length; r += 2)
+                {
+                  sr.drawHighlightedText(nextSeq, visibleResults[r],
+                                         visibleResults[r + 1],
+                                         (visibleResults[r] - startRes) * av.charWidth,
+                                         offset + ( (i - startSeq) * av.charHeight));
+                }
             }
-        }
+
+            if(av.cursorMode && cursorY==i
+               && cursorX>=startRes && cursorX<=endRes)
+            {
+              sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth,
+                            offset + ( (i - startSeq) * av.charHeight));
+            }
+          }
 
         //
         /////////////////////////////////////
@@ -648,10 +671,10 @@ public class SeqCanvas extends JComponent
                 int top = -1;
                 int bottom = -1;
 
-                for (i = y1; i < y2; i++)
+                for (i = startSeq; i < endSeq; i++)
                 {
-                    sx = (group.getStartRes() - startx) * av.charWidth;
-                    sy = offset + ((i - starty) * av.charHeight);
+                    sx = (group.getStartRes() - startRes) * av.charWidth;
+                    sy = offset + ((i - startSeq) * av.charHeight);
                     ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -
                         1;
 
@@ -660,7 +683,7 @@ public class SeqCanvas extends JComponent
                       continue;
                     }
 
-                    if ( (sx <= (x2-x1)*av.charWidth) &&
+                    if ( (sx <= (endRes-startRes)*av.charWidth) &&
                             group.sequences.contains(av.alignment.getSequenceAt(
                                     i)))
                     {
@@ -717,8 +740,8 @@ public class SeqCanvas extends JComponent
                         if (sx + ex > imgWidth)
                           ex = imgWidth;
 
-                        else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)
-                          ex = (x2 - x1 + 1) * av.charWidth;
+                        else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)
+                          ex = (endRes - startRes + 1) * av.charWidth;
 
                         if (top != -1)
                         {
@@ -739,7 +762,7 @@ public class SeqCanvas extends JComponent
 
                 if (inGroup)
                 {
-                  sy = offset + ( (i - starty) * av.charHeight);
+                  sy = offset + ( (i - startSeq) * av.charHeight);
                   if (sx >= 0 && sx < imgWidth)
                     g.drawLine(sx, oldY, sx, sy);
 
@@ -754,8 +777,8 @@ public class SeqCanvas extends JComponent
 
                   if (sx + ex > imgWidth)
                     ex = imgWidth;
-                  else if (sx + ex >= (x2 - x1 + 1) * av.charWidth)
-                    ex = (x2 - x1 + 1) * av.charWidth;
+                  else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)
+                    ex = (endRes - startRes + 1) * av.charWidth;
 
                   if (top != -1)
                   {
@@ -783,41 +806,6 @@ public class SeqCanvas extends JComponent
             }
             while (groupIndex < av.alignment.getGroups().size());
         }
-
-        /// Highlight search Results once all sequences have been drawn
-        //////////////////////////////////////////////////////////
-        if (displaySearch)
-        {
-            for (int r = 0; r < searchResults.length; r += 3)
-            {
-                int searchSeq = searchResults[r];
-
-                if ((searchSeq >= y1) && (searchSeq < y2))
-                {
-                    SequenceI seq = av.getAlignment().getSequenceAt(searchSeq);
-
-                    int searchStart = seq.findIndex(searchResults[r + 1]) - 1;
-                    int searchEnd = seq.findIndex(searchResults[r + 2]) - 1;
-
-                    SequenceRenderer ssr = (SequenceRenderer) sr;
-
-                    if (searchStart < x1)
-                    {
-                        searchStart = x1;
-                    }
-
-                    if (searchEnd > x2)
-                    {
-                        searchEnd = x2;
-                    }
-
-                    ssr.drawHighlightedText(seq, searchStart, searchEnd,
-                        (searchStart - startx) * av.charWidth,
-                        offset + ((searchSeq - starty) * av.charHeight),
-                        av.charWidth, av.charHeight);
-                }
-            }
-        }
     }
 
     /**
@@ -825,17 +813,9 @@ public class SeqCanvas extends JComponent
      *
      * @param results DOCUMENT ME!
      */
-    public void highlightSearchResults(int[] results)
+    public void highlightSearchResults(SearchResults results)
     {
-        // results are in the order sequence, startRes, endRes
-        if (results == null)
-        {
-            displaySearch = false;
-        }
-        else
-        {
-            displaySearch = true;
-        }
+        img = null;
 
         searchResults = results;