/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
int min; //used by mouseDragged to see if user\r
int max; //used by mouseDragged to see if user\r
boolean mouseDragging = false;\r
- int [] reveal;\r
+ int[] reveal;\r
\r
public ScalePanel(AlignViewport av, AlignmentPanel ap)\r
{\r
final int res;\r
\r
if (av.hasHiddenColumns)\r
+ {\r
res = av.getColumnSelection().adjustForHiddenColumns(x);\r
+ }\r
else\r
+ {\r
res = x;\r
+ }\r
\r
min = res;\r
max = res;\r
- if ((evt.getModifiers() & InputEvent.BUTTON3_MASK)\r
+ if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK)\r
== InputEvent.BUTTON3_MASK)\r
{\r
PopupMenu pop = new PopupMenu();\r
{\r
av.showColumn(reveal[0]);\r
reveal = null;\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
if (ap.overviewPanel != null)\r
+ {\r
ap.overviewPanel.updateOverviewImage();\r
+ }\r
}\r
});\r
pop.add(item);\r
{\r
av.showAllHiddenColumns();\r
reveal = null;\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
if (ap.overviewPanel != null)\r
+ {\r
ap.overviewPanel.updateOverviewImage();\r
+ }\r
}\r
});\r
pop.add(item);\r
av.hideColumns(res, res);\r
if (av.getSelectionGroup() != null\r
&&\r
- av.getSelectionGroup().getSize(false) == av.alignment.getHeight())\r
+ av.getSelectionGroup().getSize() == av.alignment.getHeight())\r
+ {\r
av.setSelectionGroup(null);\r
+ }\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
if (ap.overviewPanel != null)\r
+ {\r
ap.overviewPanel.updateOverviewImage();\r
+ }\r
}\r
});\r
pop.add(item);\r
sg.setEndRes(res);\r
av.setSelectionGroup(sg);\r
\r
- if(evt.isShiftDown())\r
+ if (evt.isShiftDown())\r
{\r
int min = Math.min(av.getColumnSelection().getMin(), res);\r
int max = Math.max(av.getColumnSelection().getMax(), res);\r
- for (int i = min; i<max; i++)\r
+ for (int i = min; i < max; i++)\r
{\r
- av.getColumnSelection().addElement(i);\r
+ av.getColumnSelection().addElement(i);\r
}\r
sg.setStartRes(min);\r
sg.setEndRes(max);\r
}\r
}\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
}\r
\r
public void mouseReleased(MouseEvent evt)\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
- if(res> av.alignment.getWidth())\r
+ if (res > av.alignment.getWidth())\r
{\r
- res = av.alignment.getWidth()-1;\r
+ res = av.alignment.getWidth() - 1;\r
}\r
\r
- if(av.hasHiddenColumns)\r
+ if (av.hasHiddenColumns)\r
+ {\r
res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+ }\r
\r
if (!stretchingGroup)\r
{\r
- ap.repaint();\r
+ ap.paintAlignment(false);\r
\r
- return;\r
+ return;\r
}\r
\r
SequenceGroup sg = av.getSelectionGroup();\r
\r
if (res > sg.getStartRes())\r
{\r
- sg.setEndRes(res);\r
+ sg.setEndRes(res);\r
}\r
else if (res < sg.getStartRes())\r
{\r
- sg.setStartRes(res);\r
+ sg.setStartRes(res);\r
}\r
\r
stretchingGroup = false;\r
- ap.repaint();\r
+ ap.paintAlignment(false);\r
}\r
\r
public void mouseDragged(MouseEvent evt)\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
if (res < 0)\r
+ {\r
res = 0;\r
+ }\r
\r
if (av.hasHiddenColumns)\r
+ {\r
res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+ }\r
\r
if (res > av.alignment.getWidth())\r
{\r
sg.setStartRes(res);\r
}\r
\r
+ int col;\r
for (int i = min; i <= max; i++)\r
{\r
- if ( (i < sg.getStartRes()) || (i > sg.getEndRes()))\r
+ col = av.getColumnSelection().adjustForHiddenColumns(i);\r
+\r
+ if ( (col < sg.getStartRes()) || (col > sg.getEndRes()))\r
{\r
- av.getColumnSelection().removeElement(i);\r
+ av.getColumnSelection().removeElement(col);\r
}\r
else\r
{\r
- av.getColumnSelection().addElement(i);\r
+ av.getColumnSelection().addElement(col);\r
}\r
}\r
\r
- ap.repaint();\r
+ ap.paintAlignment(false);\r
}\r
}\r
\r
-\r
public void mouseEntered(MouseEvent evt)\r
{\r
if (mouseDragging)\r
+ {\r
ap.seqPanel.scrollCanvas(null);\r
+ }\r
}\r
\r
public void mouseExited(MouseEvent evt)\r
{\r
if (mouseDragging)\r
+ {\r
ap.seqPanel.scrollCanvas(evt);\r
+ }\r
}\r
\r
public void mouseClicked(MouseEvent evt)\r
public void mouseMoved(MouseEvent evt)\r
{\r
if (!av.hasHiddenColumns)\r
+ {\r
return;\r
+ }\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
{\r
gg.setFont(av.getFont());\r
\r
-\r
//Fill in the background\r
gg.setColor(Color.white);\r
gg.fillRect(0, 0, width, height);\r
\r
for (int i = 0; i < cs.size(); i++)\r
{\r
- int sel = cs.columnAt(i);\r
- if(av.hasHiddenColumns)\r
- sel = av.getColumnSelection().findColumnPosition(sel);\r
-\r
+ int sel = cs.columnAt(i);\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ sel = av.getColumnSelection().findColumnPosition(sel);\r
+ }\r
\r
- if ((sel >= startx) && (sel <= endx))\r
- {\r
- gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,\r
- getSize().height);\r
- }\r
+ if ( (sel >= startx) && (sel <= endx))\r
+ {\r
+ gg.fillRect( (sel - startx) * av.charWidth, 0, av.charWidth,\r
+ getSize().height);\r
+ }\r
}\r
\r
// Draw the scale numbers\r
FontMetrics fm = gg.getFontMetrics(av.getFont());\r
int y = av.charHeight - fm.getDescent();\r
\r
- if ((scalestartx % 10) == 0)\r
+ if ( (scalestartx % 10) == 0)\r
{\r
- scalestartx += 5;\r
+ scalestartx += 5;\r
}\r
\r
String string;\r
- int maxX=0;\r
+ int maxX = 0;\r
\r
for (int i = scalestartx; i < endx; i += 5)\r
{\r
- if ((i % 10) == 0)\r
+ if ( (i % 10) == 0)\r
+ {\r
+ string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(\r
+ i));\r
+ if ( (i - startx - 1) * av.charWidth > maxX)\r
{\r
- string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i));\r
- if ( (i - startx - 1) * av.charWidth > maxX)\r
- {\r
- gg.drawString(string,\r
- (i - startx - 1) * av.charWidth, y);\r
- maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);\r
- }\r
+ gg.drawString(string,\r
+ (i - startx - 1) * av.charWidth, y);\r
+ maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);\r
+ }\r
\r
- gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +\r
- (av.charWidth / 2)), y + 2,\r
- (int) ( ( (i - startx - 1) * av.charWidth) +\r
- (av.charWidth / 2)),\r
- y + (fm.getDescent() * 2));\r
+ gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +\r
+ (av.charWidth / 2)), y + 2,\r
+ (int) ( ( (i - startx - 1) * av.charWidth) +\r
+ (av.charWidth / 2)),\r
+ y + (fm.getDescent() * 2));\r
\r
- }\r
- else\r
- {\r
- gg.drawLine((int) (((i - startx - 1) * av.charWidth) +\r
- (av.charWidth / 2)), y + fm.getDescent(),\r
- (int) (((i - startx - 1) * av.charWidth) +\r
- (av.charWidth / 2)), y + (fm.getDescent() * 2));\r
- }\r
+ }\r
+ else\r
+ {\r
+ gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +\r
+ (av.charWidth / 2)), y + fm.getDescent(),\r
+ (int) ( ( (i - startx - 1) * av.charWidth) +\r
+ (av.charWidth / 2)), y + (fm.getDescent() * 2));\r
+ }\r
}\r
\r
if (av.hasHiddenColumns)\r
{\r
gg.setColor(Color.blue);\r
int res;\r
- if(av.getShowHiddenMarkers())\r
+ if (av.getShowHiddenMarkers())\r
{\r
for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
i++)\r
res = av.getColumnSelection().findHiddenRegionPosition(i) -\r
startx;\r
\r
- if(res < 0 || res > endx-scalestartx)\r
+ if (res < 0 || res > endx - scalestartx)\r
+ {\r
continue;\r
+ }\r
\r
gg.fillPolygon(new int[]\r
{res * av.charWidth - av.charHeight / 4,\r