X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=9a722f279ad171fa1c0305db395dc52f5629ceb9;hb=7e129811d6ff01074428462284dffc2a6c2395a4;hp=dea44169fd3c2b8856b6b2f1d1325b30163090fb;hpb=3f0f2fc8583156a04aab175b91ac27127374703e;p=jalview.git diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java index dea4416..9a722f2 100755 --- a/src/jalview/appletgui/SequenceRenderer.java +++ b/src/jalview/appletgui/SequenceRenderer.java @@ -1,8 +1,28 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer + * Copyright (C) 2005 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 + */ + package jalview.appletgui; +import java.awt.*; + import jalview.datamodel.*; import jalview.schemes.*; -import java.awt.*; public class SequenceRenderer { @@ -10,7 +30,7 @@ public class SequenceRenderer FontMetrics fm; boolean renderGaps = true; SequenceGroup currentSequenceGroup = null; - SequenceGroup [] allGroups = null; + SequenceGroup[] allGroups = null; Color resBoxColour; Graphics graphics; @@ -19,7 +39,6 @@ public class SequenceRenderer this.av = av; } - public void renderGaps(boolean b) { renderGaps = b; @@ -33,13 +52,19 @@ public class SequenceRenderer void getBoxColour(ColourSchemeI cs, SequenceI seq, int i) { - if (cs != null) - resBoxColour = cs.findColour(seq.getSequence(i, i + 1), i); - else - resBoxColour = Color.white; + if (cs != null) + { + resBoxColour = cs.findColour(seq.getSequence(i, i + 1), i); + } + else + { + resBoxColour = Color.white; + } } - public void drawSequence(Graphics g,SequenceI seq,SequenceGroup [] sg, int start, int end, int x1, int y1, int width, int height) + public void drawSequence(Graphics g, SequenceI seq, SequenceGroup[] sg, + int start, int end, int x1, int y1, int width, + int height) { allGroups = sg; @@ -48,12 +73,14 @@ public class SequenceRenderer drawBoxes(seq, start, end, x1, y1, (int) width, height); fm = g.getFontMetrics(); - drawText(seq,start,end,x1,y1,(int)width,height); + drawText(seq, start, end, x1, y1, (int) width, height); } - public void drawBoxes(SequenceI seq,int start, int end, int x1, int y1, int width, int height) { - int i = start; + public void drawBoxes(SequenceI seq, int start, int end, int x1, int y1, + int width, int height) + { + int i = start; int length = seq.getLength(); int curStart = -1; @@ -62,23 +89,33 @@ public class SequenceRenderer Color tempColour = null; while (i <= end && i < length) { - if(inCurrentSequenceGroup(i)) + if (inCurrentSequenceGroup(i)) { - if( currentSequenceGroup.getDisplayBoxes()) - getBoxColour(currentSequenceGroup.cs, seq, i); + if (currentSequenceGroup.getDisplayBoxes()) + { + getBoxColour(currentSequenceGroup.cs, seq, i); + } else - resBoxColour = Color.white; + { + resBoxColour = Color.white; + } + } + else if (av.getShowBoxes()) + { + getBoxColour(av.getGlobalColourScheme(), seq, i); } - else if(av.getShowBoxes()) - getBoxColour(av.getGlobalColourScheme(), seq, i); else + { resBoxColour = Color.white; - + } if (resBoxColour != tempColour) { - if(tempColour!=null) - graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height); + if (tempColour != null) + { + graphics.fillRect(x1 + width * (curStart - start), y1, curWidth, + height); + } graphics.setColor(resBoxColour); curStart = i; @@ -87,104 +124,126 @@ public class SequenceRenderer } else + { curWidth += width; + } i++; } - - graphics.fillRect(x1+width*(curStart-start),y1,curWidth,height); + graphics.fillRect(x1 + width * (curStart - start), y1, curWidth, height); } - public void drawText(SequenceI seq,int start, int end, int x1, int y1, int width, int height) + public void drawText(SequenceI seq, int start, int end, int x1, int y1, + int width, int height) { - int pady = height/5; - int charOffset=0; + int pady = height / 5; + int charOffset = 0; char s; // Need to find the sequence position here. - String sequence = seq.getSequence(); + String sequence = seq.getSequence(); for (int i = start; i <= end; i++) { - graphics.setColor(Color.black); - if(i=res) + for (int i = 0; i < allGroups.length; i++) + { + if (allGroups[i].getStartRes() <= res && allGroups[i].getEndRes() >= res) { - currentSequenceGroup = allGroups[i]; - return true; + currentSequenceGroup = allGroups[i]; + return true; } + } return false; } - public void drawHighlightedText(SequenceI seq,int start, int end, int x1, int y1, int width, int height) + public void drawHighlightedText(SequenceI seq, int start, int end, int x1, + int y1, int width, int height) { - int pady = height/5; - int charOffset=0; + int pady = height / 5; + int charOffset = 0; graphics.setColor(Color.black); - graphics.fillRect(x1,y1,width*(end-start+1),height); + graphics.fillRect(x1, y1, width * (end - start + 1), height); graphics.setColor(Color.white); - char s='~'; + char s = '~'; // Need to find the sequence position here. for (int i = start; i <= end; i++) { - if(i