X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=7f9ee97a26ba931d54d1423123fadfd53ef463a3;hb=d1a7bcdb924eaa9403d2ad10b26f0afa93c9828a;hp=303aac69ea4a6a3134293ce2b4cfc5bfe7d64220;hpb=ce728f87f1f43be3041ef02f7f2cc2e39314711a;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 303aac6..7f9ee97 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -396,6 +396,7 @@ public class SeqCanvas extends JComponent while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth())) { + g.setFont(av.getFont()); g.setColor(Color.black); if (av.scaleLeftWrapped) @@ -489,24 +490,51 @@ public class SeqCanvas extends JComponent * @param starty DOCUMENT ME! * @param offset DOCUMENT ME! */ + + float aaRatio = 2f/3f; + public void increaseAARatio() + { + aaRatio += .025; + if(aaRatio>1) + aaRatio = 1; + + repaint(); + } + + public void decreaseAARation() + { + aaRatio -= .025; + if(aaRatio<0) + aaRatio = 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; + + SequenceI nextSeq; + /// First draw the sequences ///////////////////////////// for (int i = y1; i < y2; i++) { nextSeq = av.alignment.getSequenceAt(i); + g.setFont(av.getFont()); + sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), - x1, x2, (x1 - startx) * av.charWidth, - offset + ((i - starty) * av.charHeight), av.charWidth, - av.charHeight); + x1, x2, (x1 - startx) * av.charWidth, + offset + ( (i - starty) * av.charHeight), av.charWidth, + av.charHeight); + + + if (av.showSequenceFeatures) {