From: amwaterhouse Date: Fri, 21 Jul 2006 08:47:13 +0000 (+0000) Subject: av.showHiddenMarkers check X-Git-Tag: Release_2_1~247 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=628a29c56cc280f434f3568f3bf79555e1c77726;p=jalview.git av.showHiddenMarkers check --- diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index a05c6c0..5959493 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -65,8 +65,7 @@ public class IdCanvas extends JPanel * @param starty DOCUMENT ME! * @param ypos DOCUMENT ME! */ - public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty, - int ypos) + public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty, int ypos) { int charHeight = av.charHeight; @@ -96,6 +95,11 @@ public class IdCanvas extends JPanel gg.drawString( s.getDisplayId(av.getShowJVSuffix()), 0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5)); + + if (av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, ypos); + + } /** @@ -249,7 +253,7 @@ public class IdCanvas extends JPanel { if (av.hasHiddenRows) { - setHiddenFont(i, starty); + setHiddenFont(i); } else gg.setFont(italic); @@ -264,16 +268,20 @@ public class IdCanvas extends JPanel labels.drawComponent(gg, getWidth()); gg.translate(0, -ypos-(alheight * av.charHeight)); } + + } } else { + //Now draw the id strings + //Now draw the id strings for (int i = starty; i < endy; i++) { if (av.hasHiddenRows) { - setHiddenFont(i, starty); + setHiddenFont(i); } // Selected sequence colours @@ -308,32 +316,60 @@ public class IdCanvas extends JPanel gg.drawString(string, 0, (((i - starty) * av.charHeight) + av.charHeight) - (av.charHeight / 5)); + + if(av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, 0); + } } } - void setHiddenFont(int i, int starty) + void drawMarker(int i, int starty, int yoffset) { - Font italic = new Font(av.getFont().getName(), Font.ITALIC, - av.getFont().getSize()); - Font bold = new Font(av.getFont().getName(), Font.BOLD, - av.getFont().getSize()); + int hiddenIndex = av.adjustForHiddenSeqs(i); + int lastIndex = av.adjustForHiddenSeqs(i - 1); + int nextIndex = av.adjustForHiddenSeqs(i + 1); - int tmp, hiddenIndex = starty; - tmp = av.adjustForHiddenSeqs(i); + boolean below = (hiddenIndex > lastIndex + 1); + boolean above = (nextIndex>hiddenIndex+1); - if (av.adjustForHiddenSeqs(i - 1) == tmp - 1) - { - hiddenIndex = tmp; - } + 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) + { + 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); - if (hiddenIndex != tmp) - { - hiddenIndex = tmp; - } + } + } - hiddenIndex++; + 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()); if (av.alignment.getSequenceAt(i).getHiddenSequences() != null) gg.setFont(bold); diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index b3d7cda..29e338c 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -121,7 +121,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList { public void actionPerformed(ActionEvent e) { - av.getColumnSelection().hideColumns(res, av); + av.hideColumns(res, res+1); ap.repaint(); if(ap.overviewPanel != null) ap.overviewPanel.updateOverviewImage(); @@ -401,20 +401,29 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList { gg.setColor(Color.blue); int res; - for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++) + if(av.getShowHiddenMarkers()) { - res = av.getColumnSelection().findHiddenRegionPosition( i )-startx; + for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); + i++) + { + + res = av.getColumnSelection().findHiddenRegionPosition(i) - + startx; - gg.fillPolygon(new int[] { res*av.charWidth - av.charHeight/4, - res*av.charWidth + av.charHeight/4, - res*av.charWidth }, - new int[] - { - y-av.charHeight/2 , y-av.charHeight/2 , - y + 8 - }, 3); + if(res < 0 || res > endx-scalestartx) + continue; + gg.fillPolygon(new int[] + {res * av.charWidth - av.charHeight / 4, + res * av.charWidth + av.charHeight / 4, + res * av.charWidth}, + new int[] + { + y - av.charHeight / 2, y - av.charHeight / 2, + y + 8 + }, 3); + } } if (reveal != null && reveal[0] > startx && reveal[0] < endx) diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index c4de7cd..8623872 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -477,6 +477,35 @@ public class SeqCanvas extends JComponent drawNorthScale(g, startRes, endx, ypos); } + if (av.hasHiddenColumns && av.showHiddenMarkers) + { + g.setColor(Color.blue); + int res; + for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); + i++) + { + res = av.getColumnSelection().findHiddenRegionPosition(i) - + startRes; + + if (res < 0 || res > endx - startRes) + continue; + + gg.fillPolygon(new int[] + {res * av.charWidth - av.charHeight / 4, + res * av.charWidth + av.charHeight / 4, + res * av.charWidth}, + new int[] + { + ypos - (av.charHeight / 2), + ypos - (av.charHeight / 2), + ypos - (av.charHeight / 2) + 8 + }, 3); + + } + } + + + // When printing we have an extra clipped region, // the Printable page which we need to account for here Shape clip = g.getClip(); @@ -568,15 +597,14 @@ public class SeqCanvas extends JComponent 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); + if(av.getShowHiddenMarkers()) + { + 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.translate( -screenY * av.charWidth, 0); screenY += blockEnd - blockStart + 1; @@ -588,6 +616,7 @@ public class SeqCanvas extends JComponent blockEnd = blockStart + (endRes - startRes) - screenY; g1.translate(screenY * av.charWidth, 0); draw(g1, blockStart, blockEnd, startSeq, endSeq, offset); + g1.translate( -screenY * av.charWidth, 0); } }