// NORTH SCALE\r
for (int i = scalestartx; i < endx; i += 10)\r
{\r
- String string = String.valueOf(i);\r
- g.drawString(string, (i - startx - 1) * av.charWidth,\r
- ypos - av.charHeight / 2);\r
+ int value = i;\r
+ if(av.hasHiddenColumns)\r
+ value = av.getColumnSelection().adjustForHiddenColumns(value);\r
\r
- g.drawLine( (i - startx - 1) * av.charWidth + av.charWidth / 2,\r
- ypos + 2 - av.charHeight / 2,\r
- (i - startx - 1) * av.charWidth + av.charWidth / 2, ypos - 2);\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
+ (ypos + 2) - (av.charHeight / 2),\r
+ ((i - startx - 1) * av.charWidth) + (av.charWidth / 2), ypos -\r
+ 2);\r
}\r
}\r
\r
{\r
FontMetrics fm = getFontMetrics(av.getFont());\r
ypos += av.charHeight;\r
- // EAST SCALE\r
- for (int i = 0; i < av.alignment.getHeight(); i++)\r
+ if (av.hasHiddenColumns)\r
{\r
- SequenceI seq = av.alignment.getSequenceAt(i);\r
- int index = startx;\r
- int value = -1;\r
- while (index < endx)\r
+ startx = av.getColumnSelection().adjustForHiddenColumns(startx);\r
+ endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
+ }\r
+\r
+ int maxwidth = av.alignment.getWidth();\r
+ if (av.hasHiddenColumns)\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
+\r
+ // WEST SCALE\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ SequenceI seq = av.alignment.getSequenceAt(i);\r
+ int index = startx;\r
+ int value = -1;\r
+\r
+ while (index < endx)\r
{\r
- index++;\r
- continue;\r
+ if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ {\r
+ index++;\r
+\r
+ continue;\r
+ }\r
+\r
+ value = av.alignment.getSequenceAt(i).findPosition(index);\r
+\r
+ break;\r
}\r
\r
- value = av.alignment.getSequenceAt(i).findPosition(index);\r
- break;\r
- }\r
- if (value != -1)\r
- {\r
- int x = LABEL_WEST - fm.stringWidth(String.valueOf(value))-av.charWidth/2;\r
- g.drawString(value + "", x,\r
- ypos + i * av.charHeight - av.charHeight / 5);\r
+ if (value != -1)\r
+ {\r
+ int x = LABEL_WEST - fm.stringWidth(String.valueOf(value)) -\r
+ av.charWidth / 2;\r
+ g.drawString(value + "", x,\r
+ (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
+ }\r
}\r
}\r
- }\r
-\r
void drawEastScale(Graphics g, int startx, int endx, int ypos)\r
{\r
- ypos += av.charHeight;\r
- // EAST SCALE\r
- for (int i = 0; i < av.alignment.getHeight(); i++)\r
- {\r
- SequenceI seq = av.alignment.getSequenceAt(i);\r
- int index = endx;\r
- int value = -1;\r
- while (index > startx)\r
- {\r
- if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ ypos += av.charHeight;\r
+\r
+ if(av.hasHiddenColumns)\r
+ endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
+\r
+ SequenceI seq;\r
+ // EAST SCALE\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- index--;\r
- continue;\r
- }\r
+ seq = av.alignment.getSequenceAt(i);\r
+ int index = endx;\r
+ int value = -1;\r
\r
- value = seq.findPosition(index);\r
- break;\r
- }\r
- if (value != -1)\r
- {\r
- g.drawString(value + "", av.charWidth/2,\r
- ypos + i * av.charHeight - av.charHeight / 5);\r
- }\r
- }\r
+ while (index > startx)\r
+ {\r
+ if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
+ {\r
+ index--;\r
\r
- }\r
+ continue;\r
+ }\r
+\r
+ value = seq.findPosition(index);\r
+\r
+ break;\r
+ }\r
+\r
+ if (value != -1)\r
+ {\r
+ g.drawString(String.valueOf(value), 0,\r
+ (ypos + (i * av.charHeight)) - (av.charHeight / 5));\r
+ }\r
+ }\r
+ }\r
\r
int lastsr=0;\r
void fastPaint(int horizontal, int vertical)\r
int endx;\r
int ypos = hgap;\r
\r
+ int maxwidth = av.alignment.getWidth();\r
+\r
+ if(av.hasHiddenColumns)\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth)-1;\r
\r
- while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
+ while ((ypos <= canvasHeight) && (startRes < maxwidth))\r
{\r
endx = startRes + cWidth -1;\r
\r
- if (endx > al.getWidth())\r
+ if (endx > maxwidth)\r
{\r
- endx = al.getWidth();\r
+ endx = maxwidth;\r
}\r
\r
g.setColor(Color.black);\r
\r
if (av.scaleAboveWrapped)\r
{\r
- drawNorthScale(g, startRes, endx, ypos);\r
+ drawNorthScale(g, startRes, endx, ypos);\r
+ }\r
+ if (av.hasHiddenColumns && av.showHiddenMarkers)\r
+ {\r
+ g.setColor(Color.blue);\r
+ int res;\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
+ i++)\r
+ {\r
+ res = av.getColumnSelection().findHiddenRegionPosition(i) -\r
+ startRes;\r
+\r
+ if (res < 0 || res > endx - startRes)\r
+ continue;\r
+\r
+ gg.fillPolygon(new int[]\r
+ {res * av.charWidth - av.charHeight / 4,\r
+ res * av.charWidth + av.charHeight / 4,\r
+ res * av.charWidth},\r
+ new int[]\r
+ {\r
+ ypos - (av.charHeight / 2),\r
+ ypos - (av.charHeight / 2),\r
+ ypos - (av.charHeight / 2) + 8\r
+ }, 3);\r
+\r
+ }\r
}\r
\r
if(g.getClip()==null)\r
return annotations.adjustPanelHeight();\r
}\r
\r
- void drawPanel(Graphics g, int startRes, int endRes, int startSeq, int endSeq, int offset)\r
- {\r
- g.setFont(av.getFont());\r
- sr.renderGaps(av.renderGaps);\r
+ void drawPanel(Graphics g1, int startRes, int endRes,\r
+ int startSeq, int endSeq, int offset)\r
+ {\r
+ if(!av.hasHiddenColumns)\r
+ {\r
+ draw(g1, startRes, endRes, startSeq, endSeq, offset);\r
+ }\r
+ else\r
+ {\r
+ java.util.Vector regions = av.getColumnSelection().getHiddenColumns();\r
\r
- SequenceI nextSeq;\r
- /// First draw the sequences\r
- /////////////////////////////\r
- for (int i = startSeq; i < endSeq; i++)\r
- {\r
- nextSeq = av.alignment.getSequenceAt(i);\r
+ int screenY = 0;\r
+ int blockStart = startRes;\r
+ int blockEnd = endRes;\r
+\r
+ for (int i = 0; i < regions.size(); i++)\r
+ {\r
+ int[] region = (int[]) regions.elementAt(i);\r
+ int hideStart = region[0];\r
+ int hideEnd = region[1];\r
\r
- sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), startRes, endRes,\r
- offset + ( (i - startSeq) * av.charHeight));\r
+ if (hideStart <= blockStart)\r
+ {\r
+ blockStart += (hideEnd - hideStart) + 1;\r
+ continue;\r
+ }\r
\r
- if (av.showSequenceFeatures)\r
- {\r
- fr.drawSequence(g, nextSeq, startRes, endRes,\r
- offset + ((i - startSeq) * av.charHeight),\r
- av.charWidth, av.charHeight);\r
- }\r
- /// Highlight search Results once all sequences have been drawn\r
- //////////////////////////////////////////////////////////\r
- if (searchResults != null)\r
- {\r
- int[] visibleResults = searchResults.getResults(nextSeq, startRes, endRes);\r
- if (visibleResults != null)\r
- for (int r = 0; r < visibleResults.length; r += 2)\r
- {\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
- }\r
- }\r
+ blockEnd = hideStart - 1;\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
+ g1.translate(screenY * av.charWidth, 0);\r
\r
- }\r
+ draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
\r
- //\r
- /////////////////////////////////////\r
- // Now outline any areas if necessary\r
- /////////////////////////////////////\r
- SequenceGroup group = av.getSelectionGroup();\r
+ if(av.getShowHiddenMarkers())\r
+ {\r
+ g1.setColor(Color.blue);\r
+ g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+ startSeq + offset,\r
+ (blockEnd - blockStart + 1) * av.charWidth - 1,\r
+ startSeq + (endSeq - startSeq) * av.charHeight + offset);\r
+ }\r
\r
- int sx = -1;\r
- int sy = -1;\r
- int ex = -1;\r
- int groupIndex = -1;\r
+ g1.translate( -screenY * av.charWidth, 0);\r
+ screenY += blockEnd - blockStart + 1;\r
+ blockStart = hideEnd + 1;\r
+ }\r
\r
- if ((group == null) && (av.alignment.getGroups().size() > 0))\r
- {\r
- group = (SequenceGroup) av.alignment.getGroups().elementAt(0);\r
- groupIndex = 0;\r
- }\r
+ if (screenY <= (endRes - startRes))\r
+ {\r
+ blockEnd = blockStart + (endRes - startRes) - screenY;\r
+ g1.translate(screenY * av.charWidth, 0);\r
+ draw(g1, blockStart, blockEnd, startSeq, endSeq, offset);\r
\r
- if ( group != null )\r
- {\r
- do\r
- {\r
- int oldY = -1;\r
- int i = 0;\r
- boolean inGroup = false;\r
- int top = -1;\r
- int bottom = -1;\r
- int alHeight = av.alignment.getHeight()-1;\r
-\r
- for (i = startSeq; i < endSeq; i++)\r
- {\r
- sx = (group.getStartRes() - startRes) * av.charWidth;\r
- sy = offset + ((i - startSeq) * av.charHeight);\r
- ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -\r
- 1;\r
-\r
- if(sx+ex<0 || sx>imgWidth)\r
- {\r
- continue;\r
- }\r
-\r
- if ( (sx <= (endRes-startRes)*av.charWidth) &&\r
- group.getSequences(false).contains(av.alignment.getSequenceAt(\r
- i)))\r
- {\r
- if ( (bottom == -1) &&\r
- (i >= alHeight ||\r
- !group.getSequences(false).contains(\r
- av.alignment.getSequenceAt(i + 1))))\r
- {\r
- bottom = sy + av.charHeight;\r
- }\r
+ g1.translate( -screenY * av.charWidth, 0);\r
+ }\r
+ }\r
\r
- if (!inGroup)\r
- {\r
- if (((top == -1) && (i == 0)) ||\r
- !group.getSequences(false).contains(\r
- av.alignment.getSequenceAt(i - 1)))\r
- {\r
- top = sy;\r
- }\r
-\r
- oldY = sy;\r
- inGroup = true;\r
-\r
- if (group == av.getSelectionGroup())\r
- {\r
- g.setColor(Color.red);\r
- }\r
- else\r
- {\r
- g.setColor(group.getOutlineColour());\r
- }\r
- }\r
- }\r
- else\r
- {\r
- if (inGroup)\r
- {\r
- if (sx >= 0 && sx < imgWidth)\r
- g.drawLine(sx, oldY, sx, sy);\r
-\r
- if (sx + ex < imgWidth)\r
- g.drawLine(sx + ex, oldY, sx + ex, sy);\r
-\r
- if (sx < 0)\r
- {\r
- ex += sx;\r
- sx = 0;\r
- }\r
-\r
- if (sx + ex > imgWidth)\r
- ex = imgWidth;\r
-\r
- else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
- ex = (endRes - startRes + 1) * av.charWidth;\r
-\r
- if (top != -1)\r
- {\r
- g.drawLine(sx, top, sx + ex, top);\r
- top = -1;\r
- }\r
-\r
- if (bottom != -1)\r
- {\r
- g.drawLine(sx, bottom, sx + ex, bottom);\r
- bottom = -1;\r
- }\r
-\r
- inGroup = false;\r
- }\r
- }\r
- }\r
+ }\r
\r
- if (inGroup)\r
- {\r
- sy = offset + ( (i - startSeq) * av.charHeight);\r
- if (sx >= 0 && sx < imgWidth)\r
- g.drawLine(sx, oldY, sx, sy);\r
\r
- if (sx + ex < imgWidth)\r
- g.drawLine(sx + ex, oldY, sx + ex, sy);\r
\r
- if (sx < 0)\r
- {\r
- ex += sx;\r
- sx = 0;\r
- }\r
\r
- if (sx + ex > imgWidth)\r
- ex = imgWidth;\r
- else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
- ex = (endRes - startRes + 1) * av.charWidth;\r
+ //int startRes, int endRes, int startSeq, int endSeq, int x, int y,\r
+ // int x1, int x2, int y1, int y2, int startx, int starty,\r
+ void draw(Graphics g,\r
+ int startRes, int endRes,\r
+ int startSeq, int endSeq,\r
+ int offset)\r
+ {\r
+ g.setFont(av.getFont());\r
+ sr.prepare(g, av.renderGaps);\r
+\r
+ SequenceI nextSeq;\r
\r
- if (top != -1)\r
+ /// First draw the sequences\r
+ /////////////////////////////\r
+ for (int i = startSeq; i < endSeq; i++)\r
+ {\r
+ nextSeq = av.alignment.getSequenceAt(i);\r
+\r
+ sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq),\r
+ startRes, endRes,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
+\r
+ if (av.showSequenceFeatures)\r
{\r
- g.drawLine(sx, top, sx + ex, top);\r
- top = -1;\r
+ fr.drawSequence(g, nextSeq, startRes, endRes,\r
+ offset + ((i - startSeq) * av.charHeight));\r
}\r
\r
- if (bottom != -1)\r
+ /// Highlight search Results once all sequences have been drawn\r
+ //////////////////////////////////////////////////////////\r
+ if (searchResults != null)\r
{\r
- g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
- bottom = -1;\r
+ int[] visibleResults = searchResults.getResults(nextSeq, startRes, endRes);\r
+ if (visibleResults != null)\r
+ for (int r = 0; r < visibleResults.length; r += 2)\r
+ {\r
+ sr.drawHighlightedText(nextSeq, visibleResults[r],\r
+ visibleResults[r + 1],\r
+ (visibleResults[r] - startRes) * av.charWidth,\r
+ offset + ( (i - startSeq) * av.charHeight));\r
+ }\r
}\r
\r
- inGroup = false;\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
- groupIndex++;\r
+ if(av.getSelectionGroup()!=null || av.alignment.getGroups().size()>0)\r
+ drawGroupsBoundaries(g, startRes, endRes, startSeq, endSeq, offset);\r
\r
- if (groupIndex >= av.alignment.getGroups().size())\r
- {\r
- break;\r
- }\r
+ }\r
\r
- group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);\r
- }\r
- while (groupIndex < av.alignment.getGroups().size());\r
- }\r
- }\r
+ void drawGroupsBoundaries(Graphics g,\r
+ int startRes, int endRes,\r
+ int startSeq, int endSeq,\r
+ int offset)\r
+ {\r
+ //\r
+ /////////////////////////////////////\r
+ // Now outline any areas if necessary\r
+ /////////////////////////////////////\r
+ SequenceGroup group = av.getSelectionGroup();\r
+\r
+ int sx = -1;\r
+ int sy = -1;\r
+ int ex = -1;\r
+ int groupIndex = -1;\r
+\r
+ if ( (group == null) && (group.getSize(false) > 0))\r
+ {\r
+ group = (SequenceGroup) av.alignment.getGroups().elementAt(0);\r
+ groupIndex = 0;\r
+ }\r
+\r
+ if (group != null)\r
+ {\r
+ do\r
+ {\r
+ int oldY = -1;\r
+ int i = 0;\r
+ boolean inGroup = false;\r
+ int top = -1;\r
+ int bottom = -1;\r
+ int alHeight = av.alignment.getHeight()-1;\r
+\r
+ for (i = startSeq; i < endSeq; i++)\r
+ {\r
+ sx = (group.getStartRes() - startRes) * av.charWidth;\r
+ sy = offset + ( (i - startSeq) * av.charHeight);\r
+ ex = ( ( (group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) -\r
+ 1;\r
+\r
+ if (sx + ex < 0 || sx > imgWidth)\r
+ {\r
+ continue;\r
+ }\r
+\r
+ if ( (sx <= (endRes - startRes) * av.charWidth) &&\r
+ group.getSequences(false).\r
+ contains(av.alignment.getSequenceAt(i)))\r
+ {\r
+ if ( (bottom == -1) &&\r
+ (i >= alHeight ||\r
+ !group.getSequences(false).contains(\r
+ av.alignment.getSequenceAt(i + 1))))\r
+ {\r
+ bottom = sy + av.charHeight;\r
+ }\r
+\r
+ if (!inGroup)\r
+ {\r
+ if ( ( (top == -1) && (i == 0)) ||\r
+ !group.getSequences(false).contains(\r
+ av.alignment.getSequenceAt(i - 1)))\r
+ {\r
+ top = sy;\r
+ }\r
+\r
+ oldY = sy;\r
+ inGroup = true;\r
+\r
+ if (group == av.getSelectionGroup())\r
+ {\r
+ g.setColor(Color.red);\r
+ }\r
+ else\r
+ {\r
+ g.setColor(group.getOutlineColour());\r
+ }\r
+ }\r
+ }\r
+ else\r
+ {\r
+ if (inGroup)\r
+ {\r
+ if (sx >= 0 && sx < imgWidth)\r
+ g.drawLine(sx, oldY, sx, sy);\r
+\r
+ if (sx + ex < imgWidth)\r
+ g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
+\r
+ if (sx + ex > imgWidth)\r
+ ex = imgWidth;\r
+\r
+ else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
+ ex = (endRes - startRes + 1) * av.charWidth;\r
+\r
+ if (top != -1)\r
+ {\r
+ g.drawLine(sx, top, sx + ex, top);\r
+ top = -1;\r
+ }\r
+\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom, sx + ex, bottom);\r
+ bottom = -1;\r
+ }\r
+\r
+ inGroup = false;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (inGroup)\r
+ {\r
+ sy = offset + ( (i - startSeq) * av.charHeight);\r
+ if (sx >= 0 && sx < imgWidth)\r
+ g.drawLine(sx, oldY, sx, sy);\r
+\r
+ if (sx + ex < imgWidth)\r
+ g.drawLine(sx + ex, oldY, sx + ex, sy);\r
+\r
+ if (sx < 0)\r
+ {\r
+ ex += sx;\r
+ sx = 0;\r
+ }\r
+\r
+ if (sx + ex > imgWidth)\r
+ ex = imgWidth;\r
+ else if (sx + ex >= (endRes - startRes + 1) * av.charWidth)\r
+ ex = (endRes - startRes + 1) * av.charWidth;\r
+\r
+ if (top != -1)\r
+ {\r
+ g.drawLine(sx, top, sx + ex, top);\r
+ top = -1;\r
+ }\r
+\r
+ if (bottom != -1)\r
+ {\r
+ g.drawLine(sx, bottom - 1, sx + ex, bottom - 1);\r
+ bottom = -1;\r
+ }\r
+\r
+ inGroup = false;\r
+ }\r
+\r
+ groupIndex++;\r
+\r
+ if (groupIndex >= av.alignment.getGroups().size())\r
+ {\r
+ break;\r
+ }\r
+\r
+ group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex);\r
+ }\r
+ while (groupIndex < av.alignment.getGroups().size());\r
+\r
+ }\r
+ }\r
\r
public void highlightSearchResults(SearchResults results)\r
{\r
git://source.jalview.org / jalview.git / blobdiff