import jalview.datamodel.*;\r
\r
public class ScalePanel\r
- extends Panel\r
+ extends Panel implements MouseMotionListener, MouseListener\r
{\r
\r
protected int offy = 4;\r
AlignmentPanel ap;\r
\r
boolean stretchingGroup = false;\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
\r
public ScalePanel(AlignViewport av, AlignmentPanel ap)\r
{\r
this.av = av;\r
this.ap = ap;\r
\r
- addMouseListener(new MouseAdapter()\r
+ addMouseListener(this);\r
+ addMouseMotionListener(this);\r
+\r
+ }\r
+\r
+ public void mousePressed(MouseEvent evt)\r
+ {\r
+ int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+ final int res;\r
+\r
+ if (av.hasHiddenColumns)\r
+ res = av.getColumnSelection().adjustForHiddenColumns(x);\r
+ else\r
+ res = x;\r
+\r
+ min = res;\r
+ max = res;\r
+ if (reveal != null\r
+ && (evt.getModifiers() & InputEvent.BUTTON3_MASK)\r
+ == InputEvent.BUTTON3_MASK)\r
{\r
- public void mousePressed(MouseEvent evt)\r
- {\r
- doMousePressed(evt);\r
- }\r
\r
- public void mouseReleased(MouseEvent evt)\r
+ MenuItem item = new MenuItem("Reveal");\r
+ item.addActionListener(new ActionListener()\r
{\r
- doMouseReleased(evt);\r
- }\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ av.showColumn(reveal[0]);\r
+ reveal = null;\r
+ ap.repaint();\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
+ }\r
+ });\r
+ PopupMenu pop = new PopupMenu();\r
+ pop.add(item);\r
\r
- });\r
- addMouseMotionListener(new MouseMotionAdapter()\r
- {\r
- public void mouseDragged(MouseEvent evt)\r
+ if (av.getColumnSelection().getHiddenColumns().size() > 1)\r
{\r
- doMouseDragged(evt);\r
+ item = new MenuItem("Reveal All");\r
+ item.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ av.showAllHiddenColumns();\r
+ reveal = null;\r
+ ap.repaint();\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
+ }\r
+ });\r
+ pop.add(item);\r
}\r
- });\r
-\r
- }\r
-\r
- public void doMousePressed(MouseEvent evt)\r
- {\r
- int x = evt.getX();\r
- int res = x / av.getCharWidth() + av.getStartRes();\r
- SequenceGroup sg = null;\r
\r
+ this.add(pop);\r
+ pop.show(this, evt.getX(), evt.getY());\r
\r
- if (av.getColumnSelection().contains(res))\r
+ }\r
+ else if (av.getColumnSelection().contains(res))\r
{\r
- av.getColumnSelection().removeElement(res);\r
+ if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK)\r
+ == InputEvent.BUTTON3_MASK)\r
+ {\r
+ MenuItem item = new MenuItem("Hide Columns");\r
+ item.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ av.hideColumns(res, res);\r
+ ap.repaint();\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
+ }\r
+ });\r
+ PopupMenu pop = new PopupMenu();\r
+ pop.add(item);\r
+ this.add(pop);\r
+ pop.show(this, evt.getX(), evt.getY());\r
+ }\r
+ else\r
+ {\r
+ av.getColumnSelection().removeElement(res);\r
+ av.setSelectionGroup(null);\r
+ }\r
}\r
else\r
{\r
av.getColumnSelection().addElement(res);\r
+ SequenceGroup sg = new SequenceGroup();\r
\r
- sg = new SequenceGroup();\r
for (int i = 0; i < av.alignment.getSequences().size(); i++)\r
{\r
sg.addSequence(av.alignment.getSequenceAt(i), false);\r
\r
sg.setStartRes(res);\r
sg.setEndRes(res);\r
-\r
- ap.annotationPanel.addEditableColumn(res);\r
+ av.setSelectionGroup(sg);\r
}\r
- av.setSelectionGroup(sg);\r
ap.repaint();\r
}\r
\r
- public void doMouseReleased(MouseEvent evt)\r
+ public void mouseReleased(MouseEvent evt)\r
{\r
- if (!stretchingGroup)\r
- {\r
- return;\r
- }\r
+ mouseDragging = false;\r
\r
- int x = evt.getX();\r
- int res = x / av.getCharWidth() + av.getStartRes();\r
+ int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
if(res> av.alignment.getWidth())\r
{\r
res = av.alignment.getWidth()-1;\r
}\r
\r
- if (!av.getColumnSelection().contains(res))\r
+ if(av.hasHiddenColumns)\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
+ if (!stretchingGroup)\r
{\r
- av.getColumnSelection().addElement(res);\r
+ ap.repaint();\r
+\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
}\r
\r
- public void doMouseDragged(MouseEvent evt)\r
+ public void mouseDragged(MouseEvent evt)\r
{\r
- int x = evt.getX();\r
- int res = x / av.getCharWidth() + av.getStartRes();\r
+ mouseDragging = true;\r
\r
- if(res> av.alignment.getWidth())\r
+ int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+ if (res < 0)\r
+ res = 0;\r
+\r
+ if (av.hasHiddenColumns)\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
+ if (res > av.alignment.getWidth())\r
{\r
- res = av.alignment.getWidth()-1;\r
+ res = av.alignment.getWidth() - 1;\r
+ }\r
+\r
+ if (res < min)\r
+ {\r
+ min = res;\r
+ }\r
+\r
+ if (res > max)\r
+ {\r
+ max = res;\r
}\r
\r
SequenceGroup sg = av.getSelectionGroup();\r
+\r
if (sg != null)\r
{\r
stretchingGroup = true;\r
+\r
+ if (!av.getColumnSelection().contains(res))\r
+ {\r
+ av.getColumnSelection().addElement(res);\r
+ }\r
+\r
if (res > sg.getStartRes())\r
{\r
sg.setEndRes(res);\r
}\r
- else if (res < sg.getStartRes())\r
+ if (res < sg.getStartRes())\r
{\r
sg.setStartRes(res);\r
}\r
\r
- ap.annotationPanel.addEditableColumn(res);\r
+ for (int i = min; i <= max; i++)\r
+ {\r
+ if ( (i < sg.getStartRes()) || (i > sg.getEndRes()))\r
+ {\r
+ av.getColumnSelection().removeElement(i);\r
+ }\r
+ else\r
+ {\r
+ av.getColumnSelection().addElement(i);\r
+ }\r
+ }\r
+\r
ap.repaint();\r
}\r
}\r
\r
+\r
+ public void mouseEntered(MouseEvent evt)\r
+ {\r
+ if (mouseDragging)\r
+ ap.seqPanel.scrollCanvas(null);\r
+ }\r
+\r
+ public void mouseExited(MouseEvent evt)\r
+ {\r
+ if (mouseDragging)\r
+ ap.seqPanel.scrollCanvas(evt);\r
+ }\r
+\r
+ public void mouseClicked(MouseEvent evt)\r
+ {\r
+\r
+ }\r
+\r
+ public void mouseMoved(MouseEvent evt)\r
+ {\r
+ if (!av.hasHiddenColumns)\r
+ return;\r
+\r
+ int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
+ reveal = null;\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)\r
+ {\r
+ int[] region = (int[]) av.getColumnSelection().getHiddenColumns().\r
+ elementAt(i);\r
+ if (res + 1 == region[0] || res - 1 == region[1])\r
+ {\r
+ reveal = region;\r
+ break;\r
+ }\r
+ }\r
+\r
+ repaint();\r
+ }\r
+\r
public void update(Graphics g)\r
{\r
paint(g);\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
//Fill the selected columns\r
ColumnSelection cs = av.getColumnSelection();\r
gg.setColor(new Color(220, 0, 0));\r
+\r
for (int i = 0; i < cs.size(); i++)\r
{\r
- int sel = cs.columnAt(i);\r
- if (sel >= startx && sel <= endx)\r
- {\r
- gg.fillRect( (sel - startx) * av.charWidth, 0, av.charWidth,\r
- getSize().height);\r
- }\r
+ int sel = cs.columnAt(i);\r
+ if(av.hasHiddenColumns)\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
}\r
\r
// Draw the scale numbers\r
gg.setColor(Color.black);\r
+\r
int scalestartx = (startx / 10) * 10;\r
\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
\r
for (int i = scalestartx; i < endx; i += 5)\r
{\r
- if (i % 10 == 0)\r
- {\r
- string = String.valueOf(i);\r
- if ( (i - startx - 1) * av.charWidth > maxX)\r
+ if ((i % 10) == 0)\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
+\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.drawString(string,\r
- (i - startx - 1) * av.charWidth, y);\r
- maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);\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
- gg.drawLine( (int) ( (i - startx - 1) * av.charWidth + av.charWidth / 2),\r
- y + 2,\r
- (int) ( (i - startx - 1) * av.charWidth + av.charWidth / 2),\r
- y + fm.getDescent() * 2);\r
- }\r
- else\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ gg.setColor(Color.blue);\r
+ int res;\r
+ if(av.getShowHiddenMarkers())\r
{\r
- gg.drawLine( (int) ( (i - startx - 1) * av.charWidth + av.charWidth / 2),\r
- y + fm.getDescent(),\r
- (int) ( (i - startx - 1) * av.charWidth + av.charWidth / 2),\r
- y + fm.getDescent() * 2);\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
+ i++)\r
+ {\r
+\r
+ res = av.getColumnSelection().findHiddenRegionPosition(i) -\r
+ startx;\r
+\r
+ if(res < 0 || res > endx-scalestartx)\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
+ y - av.charHeight / 2, y - av.charHeight / 2,\r
+ y + 8\r
+ }, 3);\r
+\r
+ }\r
}\r
\r
+ if (reveal != null && reveal[0] > startx && reveal[0] < endx)\r
+ {\r
+ gg.drawString("Reveal Columns", reveal[0] * av.charWidth, 0);\r
+ }\r
}\r
+\r
}\r
\r
}\r
git://source.jalview.org / jalview.git / blobdiff