\r
while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
{\r
+ g.setFont(av.getFont());\r
g.setColor(Color.black);\r
\r
if (av.scaleLeftWrapped)\r
* @param starty DOCUMENT ME!\r
* @param offset DOCUMENT ME!\r
*/\r
+\r
+ float aaRatio = 2f/3f;\r
+ public void increaseAARatio()\r
+ {\r
+ aaRatio += .025;\r
+ if(aaRatio>1)\r
+ aaRatio = 1;\r
+\r
+ repaint();\r
+ }\r
+\r
+ public void decreaseAARation()\r
+ {\r
+ aaRatio -= .025;\r
+ if(aaRatio<0)\r
+ aaRatio = 0;\r
+\r
+ repaint();\r
+ }\r
+\r
synchronized public void drawPanel(Graphics g1, int x1, int x2, int y1,\r
int y2, int startx, int starty, int offset)\r
{\r
Graphics2D g = (Graphics2D) g1;\r
g.setFont(av.getFont());\r
\r
- SequenceI nextSeq;\r
+\r
+ SequenceI nextSeq;\r
+\r
+ SequenceI dna = null;\r
+\r
+ int aaHeight = (int)(av.getCharHeight()*aaRatio);\r
+ int dnaHeight =(int)(av.getCharHeight() * (1-aaRatio));\r
+\r
+\r
+ java.awt.geom.AffineTransform transform = new java.awt.geom.AffineTransform();\r
+ transform.scale(1f/3f , 1);\r
+ Font dnafont = new Font(av.getFont().getName(), av.getFont().getStyle(),\r
+ dnaHeight);\r
+ dnafont = dnafont.deriveFont(transform);\r
+\r
+ Font aafont = new Font(av.getFont().getName(), av.getFont().getStyle(),\r
+ aaHeight);\r
+ transform = new java.awt.geom.AffineTransform();\r
+ transform.scale(1/aaRatio, 1);\r
+ aafont = aafont.deriveFont(transform);\r
\r
/// First draw the sequences\r
/////////////////////////////\r
for (int i = y1; i < y2; i++)\r
{\r
nextSeq = av.alignment.getSequenceAt(i);\r
+ g.setFont(aafont);\r
+/*\r
+ StringBuffer dnasb = new StringBuffer();\r
+ for (int j = 0; j < nextSeq.getLength(); j++)\r
+ {\r
+ java.util.Vector codons = jalview.schemes.ResidueProperties.getCodons(nextSeq.getSequence(j,\r
+ j + 1));\r
+ if (codons != null && codons.size() > 0)\r
+ dnasb.append(codons.elementAt(0).toString());\r
+ }\r
+\r
+ dna = new Sequence("dna", dnasb.toString());*/\r
+\r
\r
sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq),\r
- x1, x2, (x1 - startx) * av.charWidth,\r
- offset + ((i - starty) * av.charHeight), av.charWidth,\r
- av.charHeight);\r
+ x1, x2, (x1 - startx) * av.charWidth,\r
+ offset + ( (i - starty) * av.charHeight), av.charWidth,\r
+ aaHeight);\r
+\r
+\r
+ /* g.setFont(dnafont);\r
+\r
+ sr.drawSequence(g, dna, null,\r
+ x1, x2 * 3 +2, ( (x1 - startx) * av.charWidth) / 3,\r
+ offset + ( (i - starty) * av.charHeight) + aaHeight, av.charWidth / 3,\r
+ dnaHeight);*/\r
\r
if (av.showSequenceFeatures)\r
{\r