*/\r
public class SeqCanvas extends JComponent\r
{\r
- FeatureRenderer fr;\r
- SequenceRenderer sr;\r
+ final FeatureRenderer fr;\r
+ final SequenceRenderer sr;\r
BufferedImage img;\r
Graphics2D gg;\r
int imgWidth;\r
int LABEL_WEST;\r
int LABEL_EAST;\r
\r
+\r
+ int cursorX = 0;\r
+ int cursorY = 0;\r
+\r
+\r
/**\r
* Creates a new SeqCanvas object.\r
*\r
// NORTH SCALE\r
for (int i = scalestartx; i < endx; i += 10)\r
{\r
- String string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i));\r
- g.drawString(string, (i - startx - 1) * av.charWidth,\r
+ int value = i;\r
+ if(av.hasHiddenColumns)\r
+ value = av.getColumnSelection().adjustForHiddenColumns(value);\r
+\r
+ g.drawString( String.valueOf(value), (i - startx - 1) * av.charWidth,\r
ypos - (av.charHeight / 2));\r
\r
g.drawLine(((i - startx - 1) * av.charWidth) + (av.charWidth / 2),\r
FontMetrics fm = getFontMetrics(av.getFont());\r
ypos += av.charHeight;\r
\r
+ if(av.hasHiddenColumns)\r
+ startx = av.getColumnSelection().adjustForHiddenColumns(startx);\r
+\r
// EAST SCALE\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
{\r
ypos += av.charHeight;\r
\r
+ if(av.hasHiddenColumns)\r
+ endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
+\r
// EAST SCALE\r
for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
int index = endx;\r
int value = -1;\r
\r
+\r
+\r
while (index > startx)\r
{\r
if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
return;\r
}\r
\r
+\r
fastPaint = true;\r
\r
gg.copyArea(horizontal * av.charWidth,\r
int transX = 0;\r
int transY = 0;\r
\r
+\r
if (horizontal > 0) // scrollbar pulled right, image to the left\r
{\r
er ++;\r
{\r
super.paintComponent(g);\r
\r
- sr.renderGaps(av.renderGaps);\r
+\r
\r
if ( img != null && (fastPaint\r
|| (getVisibleRect().width != g.getClipBounds().width)\r
\r
if (pdbCanvas != null)\r
{\r
- pdbCanvas.updateSeqColours();\r
+ pdbCanvas.updateSeqColours();\r
}\r
\r
}\r
av.endRes = av.startRes + cWidth;\r
\r
\r
- int endx = (startRes + cWidth) - 1;\r
+ int endx;\r
int ypos = hgap;\r
\r
-\r
while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
{\r
+ endx = startRes + cWidth;\r
+\r
+ if (endx > al.getWidth())\r
+ {\r
+ endx = al.getWidth();\r
+ }\r
+\r
g.setFont(av.getFont());\r
g.setColor(Color.black);\r
\r
cWidth * av.charWidth, (int) clip.getBounds().getHeight());\r
}\r
\r
- if (av.vconsensus!=null && av.alignment.getWidth() >= av.vconsensus.size())\r
- {\r
- endx = av.vconsensus.size() - 2;\r
- }\r
-\r
-\r
drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);\r
\r
if(av.showAnnotation)\r
if(annotations==null)\r
annotations = new AnnotationPanel(av);\r
\r
- annotations.drawComponent( (Graphics2D) g, startRes, endx + 1);\r
+ annotations.drawComponent( (Graphics2D) g, startRes, endx);\r
g.translate(0, -cHeight - ypos);\r
}\r
g.setClip(clip);\r
ypos -= 3;\r
\r
startRes += cWidth;\r
- endx = (startRes + cWidth) - 1;\r
-\r
- if (endx > al.getWidth())\r
- {\r
- endx = al.getWidth();\r
- }\r
}\r
}\r
\r
* DOCUMENT ME!\r
*\r
* @param g1 DOCUMENT ME!\r
- * @param x1 DOCUMENT ME!\r
- * @param x2 DOCUMENT ME!\r
- * @param y1 DOCUMENT ME!\r
- * @param y2 DOCUMENT ME!\r
- * @param startx DOCUMENT ME!\r
- * @param starty DOCUMENT ME!\r
+ * @param startRes DOCUMENT ME!\r
+ * @param endRes DOCUMENT ME!\r
+ * @param startSeq DOCUMENT ME!\r
+ * @param endSeq 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
-\r
void drawPanel(Graphics g1, int startRes, int endRes,\r
int startSeq, int endSeq, int offset)\r
{\r
blockStart = hideEnd + 1;\r
}\r
\r
- if (screenY < (endRes - startRes))\r
+ if (screenY <= (endRes - startRes))\r
{\r
blockEnd = blockStart + (endRes - startRes) - screenY;\r
g1.translate(screenY * av.charWidth, 0);\r
int startSeq, int endSeq,\r
int offset)\r
{\r
+\r
+\r
Graphics2D g = (Graphics2D) g1;\r
g.setFont(av.getFont());\r
+ sr.prepare(g, av.renderGaps);\r
\r
SequenceI nextSeq;\r
\r
{\r
nextSeq = av.alignment.getSequenceAt(i);\r
\r
- sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq),\r
+ sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),\r
startRes, endRes,\r
offset + ( (i - startSeq) * av.charHeight));\r
\r
if (av.showSequenceFeatures)\r
{\r
fr.drawSequence(g1, nextSeq, startRes, endRes,\r
- offset + ((i - startSeq) * av.charHeight), av.charWidth,\r
- av.charHeight);\r
+ offset + ((i - startSeq) * av.charHeight));\r
}\r
\r
/// Highlight search Results once all sequences have been drawn\r
sr.drawHighlightedText(nextSeq, visibleResults[r],\r
visibleResults[r + 1],\r
(visibleResults[r] - startRes) * av.charWidth,\r
- offset + ( (i - startSeq) * av.charHeight),\r
- av.charWidth, av.charHeight);\r
+ offset + ( (i - startSeq) * av.charHeight));\r
}\r
}\r
+\r
+ if(av.cursorMode && cursorY==i\r
+ && cursorX>=startRes && cursorX<=endRes)\r
+ {\r
+ sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
+ }\r
}\r
\r
//\r