JAL-2831 Don't show cursor if position in hidden region

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 4f01761..36ae682 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -365,14 +365,11 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
             ranges.getStartRes(), ranges.getEndRes(),
             ranges.getStartSeq(), ranges.getEndSeq());
 
-    BufferedImage cursorImage = drawCursor(ranges.getStartRes(),
-            ranges.getEndRes(), ranges.getStartSeq(), ranges.getEndSeq());
-
     if ((img != null) && (fastPaint
             || (getVisibleRect().width != g.getClipBounds().width)
             || (getVisibleRect().height != g.getClipBounds().height)))
     {
-      BufferedImage lcimg = buildLocalImage(selectImage, cursorImage);
+      BufferedImage lcimg = buildLocalImage(selectImage);
       g.drawImage(lcimg, 0, 0, this);
       fastPaint = false;
     }
@@ -412,8 +409,15 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       }
 
       // lcimg is a local *copy* of img which we'll draw selectImage on top of
-      BufferedImage lcimg = buildLocalImage(selectImage, cursorImage);
+      BufferedImage lcimg = buildLocalImage(selectImage);
       g.drawImage(lcimg, 0, 0, this);
+
+    }
+
+    if (av.cursorMode)
+    {
+      drawCursor(g, ranges.getStartRes(), ranges.getEndRes(),
+              ranges.getStartSeq(), ranges.getEndSeq());
     }
   }
   
@@ -497,8 +501,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    * Make a local image by combining the cached image img
    * with any selection
    */
-  private BufferedImage buildLocalImage(BufferedImage selectImage,
-          BufferedImage cursorImage)
+  private BufferedImage buildLocalImage(BufferedImage selectImage)
   {
     // clone the cached image
     BufferedImage lcimg = new BufferedImage(img.getWidth(), img.getHeight(),
@@ -513,12 +516,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
               AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
       g2d.drawImage(selectImage, 0, 0, this);
     }
-    // overlay cursor on lcimg
-    if (cursorImage != null)
-    {
-      g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
-      g2d.drawImage(cursorImage, 0, 0, this);
-    }
+
     g2d.dispose();
 
     return lcimg;
@@ -1152,13 +1150,6 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
           }
         }
       }
-
-      /*      if (av.cursorMode && cursorY == i && cursorX >= startRes
-              && cursorX <= endRes)
-      {
-        seqRdr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * charWidth,
-                offset + ((i - startSeq) * charHeight));
-      }*/
     }
 
     if (av.getSelectionGroup() != null
@@ -1270,74 +1261,79 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    * @return a transparent image of the same size as the sequence canvas, with
    *         the cursor drawn on it, if any
    */
-  private BufferedImage drawCursor(int startRes, int endRes, int startSeq,
+  private void drawCursor(Graphics g, int startRes, int endRes,
+          int startSeq,
           int endSeq)
   {
-    // define our cursor image
-    BufferedImage cursorImage = null;
+    // convert the cursorY into a position on the visible alignment
+    int cursor_ypos = av.getAlignment().getHiddenSequences()
+            .findIndexWithoutHiddenSeqs(cursorY);
 
     // don't do work unless we have to
-    if (av.cursorMode && cursorY >= startSeq && cursorY <= endSeq)
+    if (!av.getAlignment().getHiddenSequences().isHidden(cursorY)
+            && cursor_ypos >= startSeq && cursor_ypos <= endSeq)
     {
       int yoffset = 0;
       int xoffset = 0;
       int startx = startRes;
       int endx = endRes;
-      if (av.getWrapAlignment())
+
+      // convert the cursorX into a position on the visible alignment
+      int cursor_xpos = av.getAlignment().getHiddenColumns()
+              .findColumnPosition(cursorX);
+
+      if (av.getAlignment().getHiddenColumns().isVisible(cursorX))
       {
-        // work out the correct offsets for the cursor
-        int charHeight = av.getCharHeight();
-        int charWidth = av.getCharWidth();
-        int canvasWidth = getWidth();
-        int canvasHeight = getHeight();
 
-        // height gap above each panel
-        int hgap = charHeight;
-        if (av.getScaleAboveWrapped())
+        if (av.getWrapAlignment())
         {
-          hgap += charHeight;
-        }
+          // work out the correct offsets for the cursor
+          int charHeight = av.getCharHeight();
+          int charWidth = av.getCharWidth();
+          int canvasWidth = getWidth();
+          int canvasHeight = getHeight();
+
+          // height gap above each panel
+          int hgap = charHeight;
+          if (av.getScaleAboveWrapped())
+          {
+            hgap += charHeight;
+          }
 
-        int cWidth = (canvasWidth - labelWidthEast - labelWidthWest)
-                / charWidth;
-        int cHeight = av.getAlignment().getHeight() * charHeight;
+          int cWidth = (canvasWidth - labelWidthEast - labelWidthWest)
+                  / charWidth;
+          int cHeight = av.getAlignment().getHeight() * charHeight;
 
-        endx = startx + cWidth - 1;
-        int ypos = hgap; // vertical offset
+          endx = startx + cWidth - 1;
+          int ypos = hgap; // vertical offset
 
-        // iterate down the wrapped panels
-        while ((ypos <= canvasHeight) && (endx < cursorX))
-        {
-          // update vertical offset
-          ypos += cHeight + getAnnotationHeight() + hgap;
+          // iterate down the wrapped panels
+          while ((ypos <= canvasHeight) && (endx < cursor_xpos))
+          {
+            // update vertical offset
+            ypos += cHeight + getAnnotationHeight() + hgap;
 
-          // update horizontal offset
-          startx += cWidth;
-          endx = startx + cWidth - 1;
+            // update horizontal offset
+            startx += cWidth;
+            endx = startx + cWidth - 1;
+          }
+          yoffset = ypos;
+          xoffset = labelWidthWest;
         }
-        yoffset = ypos;
-        xoffset = labelWidthWest;
-      }
 
-      // now check if cursor is within range for x values
-      if (cursorX >= startx && cursorX <= endx)
-      {
-        // get a new image of the correct size
-        cursorImage = setupImage();
-        Graphics2D g = (Graphics2D) cursorImage.getGraphics();
-
-        // get the character the cursor is drawn at
-        SequenceI seq = av.getAlignment().getSequenceAt(cursorY);
-        char s = seq.getCharAt(cursorX);
-
-        seqRdr.drawCursor(g, s,
-                xoffset + (cursorX - startx) * av.getCharWidth(),
-                yoffset + (cursorY - startSeq) * av.getCharHeight());
-        g.dispose();
+        // now check if cursor is within range for x values
+        if (cursor_xpos >= startx && cursor_xpos <= endx)
+        {
+          // get the character the cursor is drawn at
+          SequenceI seq = av.getAlignment().getSequenceAt(cursorY);
+          char s = seq.getCharAt(cursorX);
+
+          seqRdr.drawCursor(g, s,
+                  xoffset + (cursor_xpos - startx) * av.getCharWidth(),
+                  yoffset + (cursor_ypos - startSeq) * av.getCharHeight());
+        }
       }
     }
-
-    return cursorImage;
   }