X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=6a941f1a7b42984430de1c9a3d304479a49c0d26;hb=46ca91c8b2a49f1d2f80b6823ade9f1c29c4121c;hp=bec3c630439f7214f610f6295efec974dbdd63bc;hpb=67d05eb25eaeae54f1291ac2954305da266ad57b;p=jalview.git diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java index bec3c63..6a941f1 100755 --- a/src/jalview/appletgui/IdCanvas.java +++ b/src/jalview/appletgui/IdCanvas.java @@ -1,40 +1,42 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ - package jalview.appletgui; import java.awt.*; import jalview.datamodel.*; -public class IdCanvas - extends Panel +public class IdCanvas extends Panel { protected AlignViewport av; protected boolean showScores = true; protected int maxIdLength = -1; + protected String maxIdStr = null; + Image image; + Graphics gg; + int imgHeight = 0; + boolean fastPaint = false; java.util.Vector searchResults; @@ -47,36 +49,36 @@ public class IdCanvas } public void drawIdString(Graphics gg, SequenceI s, int i, int starty, - int ypos) + int ypos) { int charHeight = av.getCharHeight(); if (searchResults != null && searchResults.contains(s)) { gg.setColor(Color.black); - gg.fillRect(0, ( (i - starty) * charHeight) + ypos, - getSize().width, charHeight); + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, + charHeight); gg.setColor(Color.white); } - else if (av.getSelectionGroup() != null && - av.getSelectionGroup().getSequences(null).contains(s)) + else if (av.getSelectionGroup() != null + && av.getSelectionGroup().getSequences(null).contains(s)) { gg.setColor(Color.lightGray); - gg.fillRect(0, ( (i - starty) * charHeight) + ypos, - getSize().width, charHeight); + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, + charHeight); gg.setColor(Color.white); } else { gg.setColor(av.getSequenceColour(s)); - gg.fillRect(0, ( (i - starty) * charHeight) + ypos, - getSize().width, charHeight); + gg.fillRect(0, ((i - starty) * charHeight) + ypos, getSize().width, + charHeight); gg.setColor(Color.black); } gg.drawString(s.getDisplayId(av.getShowJVSuffix()), 0, - ( (i - starty) * charHeight) + ypos + - charHeight - (charHeight / 5)); + ((i - starty) * charHeight) + ypos + charHeight + - (charHeight / 5)); if (av.hasHiddenRows && av.showHiddenMarkers) { @@ -93,7 +95,8 @@ public class IdCanvas return; } - gg.copyArea(0, 0, getSize().width, imgHeight, 0, -vertical * av.charHeight); + gg.copyArea(0, 0, getSize().width, imgHeight, 0, -vertical + * av.charHeight); int ss = av.startSeq, es = av.endSeq, transY = 0; if (vertical > 0) // scroll down @@ -160,21 +163,21 @@ public class IdCanvas gg.setFont(av.getFont()); } - //Fill in the background + // Fill in the background gg.setColor(Color.white); - Font italic = new Font(av.getFont().getName(), Font.ITALIC, - av.getFont().getSize()); + Font italic = new Font(av.getFont().getName(), Font.ITALIC, av + .getFont().getSize()); gg.setFont(italic); gg.fillRect(0, 0, getSize().width, getSize().height); drawIds(av.startSeq, av.endSeq); g.drawImage(image, 0, 0, this); } - + void drawIds(int starty, int endy) { - Font italic = new Font(av.getFont().getName(), Font.ITALIC, - av.getFont().getSize()); + Font italic = new Font(av.getFont().getName(), Font.ITALIC, av + .getFont().getSize()); gg.setFont(italic); @@ -207,16 +210,13 @@ public class IdCanvas hgap += av.charHeight; } - int cHeight = alheight * av.charHeight - + hgap - + annotationHeight; + 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 <= getSize().height) && (row < maxwidth); - ypos += cHeight, row += rowSize) + for (int ypos = hgap, row = av.startRes; (ypos <= getSize().height) + && (row < maxwidth); ypos += cHeight, row += rowSize) { for (int i = starty; i < alheight; i++) { @@ -241,7 +241,7 @@ public class IdCanvas } else { - //Now draw the id strings + // Now draw the id strings SequenceI seq; for (int i = starty; i < endy; i++) { @@ -252,22 +252,21 @@ public class IdCanvas continue; } gg.setFont(italic); - //boolean isrep=false; + // boolean isrep=false; if (av.hasHiddenRows) { - //isrep = + // isrep = setHiddenFont(seq); } // Selected sequence colours - if ( (searchResults != null) && - searchResults.contains(seq)) + if ((searchResults != null) && searchResults.contains(seq)) { currentColor = Color.black; currentTextColor = Color.white; } - else if ( (av.getSelectionGroup() != null) && - av.getSelectionGroup().getSequences(null).contains(seq)) + else if ((av.getSelectionGroup() != null) + && av.getSelectionGroup().getSequences(null).contains(seq)) { currentColor = Color.lightGray; currentTextColor = Color.black; @@ -279,15 +278,15 @@ public class IdCanvas } gg.setColor(currentColor); - // TODO: isrep could be used to highlight the representative in a different way + // TODO: isrep could be used to highlight the representative in a + // different way gg.fillRect(0, (i - starty) * av.charHeight, getSize().width, - av.charHeight); + av.charHeight); gg.setColor(currentTextColor); - gg.drawString(seq.getDisplayId(av.getShowJVSuffix()), - 0, - ( ( (i - starty) * av.charHeight) + av.charHeight) - - (av.charHeight / 5)); + gg.drawString(seq.getDisplayId(av.getShowJVSuffix()), 0, + (((i - starty) * av.charHeight) + av.charHeight) + - (av.charHeight / 5)); if (av.hasHiddenRows && av.showHiddenMarkers) { @@ -306,15 +305,14 @@ public class IdCanvas void drawMarker(int i, int starty, int yoffset) { SequenceI[] hseqs = av.alignment.getHiddenSequences().hiddenSequences; - //Use this method here instead of calling hiddenSeq adjust - //3 times. + // Use this method here instead of calling hiddenSeq adjust + // 3 times. int hSize = hseqs.length; int hiddenIndex = i; int lastIndex = i - 1; int nextIndex = i + 1; - for (int j = 0; j < hSize; j++) { if (hseqs[j] != null) @@ -341,40 +339,31 @@ public class IdCanvas if (below) { gg.fillPolygon(new int[] - {getSize().width - av.charHeight, - getSize().width - av.charHeight, - getSize().width}, - new int[] - { - (i - starty) * av.charHeight + yoffset, - (i - starty) * av.charHeight + yoffset + av.charHeight / 4, - (i - starty) * av.charHeight + yoffset - }, 3); + { getSize().width - av.charHeight, getSize().width - av.charHeight, + getSize().width }, 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[] - {getSize().width - av.charHeight, - getSize().width - av.charHeight, - getSize().width}, - new int[] - { - (i - starty + 1) * av.charHeight + yoffset, - (i - starty + 1) * av.charHeight + yoffset - - av.charHeight / 4, - (i - starty + 1) * av.charHeight + yoffset - }, 3); + { getSize().width - av.charHeight, getSize().width - av.charHeight, + getSize().width }, new int[] + { (i - starty + 1) * av.charHeight + yoffset, + (i - starty + 1) * av.charHeight + yoffset - av.charHeight / 4, + (i - starty + 1) * av.charHeight + yoffset }, 3); } } + boolean setHiddenFont(SequenceI seq) { - Font bold = new Font(av.getFont().getName(), Font.BOLD - , - av.getFont().getSize()); + Font bold = new Font(av.getFont().getName(), Font.BOLD, av.getFont() + .getSize()); - if (av.hiddenRepSequences != null && - av.hiddenRepSequences.containsKey(seq)) + if (av.hiddenRepSequences != null + && av.hiddenRepSequences.containsKey(seq)) { gg.setFont(bold); return true;