/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 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
min = res;\r
max = res;\r
\r
- /* if(reveal != null && SwingUtilities.isRightMouseButton(evt))\r
+ if (SwingUtilities.isRightMouseButton(evt))\r
+ {\r
+ JPopupMenu pop = new JPopupMenu();\r
+ if (reveal != null)\r
{\r
- JPopupMenu pop = new JPopupMenu();\r
JMenuItem item = new JMenuItem("Reveal");\r
item.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
{\r
- av.getColumnSelection().revealHiddenColumns(reveal[0], av);\r
+ av.showColumn(reveal[0]);\r
reveal = null;\r
ap.repaint();\r
- if(ap.overviewPanel != null)\r
- ap.overviewPanel.updateOverviewImage();\r
+ if (ap.overviewPanel != null)\r
+ ap.overviewPanel.updateOverviewImage();\r
}\r
});\r
pop.add(item);\r
\r
- if(av.getColumnSelection().hiddenColumns.size()>1)\r
+ if (av.getColumnSelection().getHiddenColumns().size() > 1)\r
{\r
item = new JMenuItem("Reveal All");\r
item.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
{\r
- av.getColumnSelection().revealAllHiddenColumns(av);\r
+ av.showAllHiddenColumns();\r
reveal = null;\r
ap.repaint();\r
- if(ap.overviewPanel != null)\r
+ if (ap.overviewPanel != null)\r
ap.overviewPanel.updateOverviewImage();\r
}\r
});\r
pop.add(item);\r
}\r
-\r
pop.show(this, evt.getX(), evt.getY());\r
-\r
}\r
- else*/\r
- if (av.getColumnSelection().contains(res))\r
- {\r
- /* if( SwingUtilities.isRightMouseButton(evt))\r
+ else if (av.getColumnSelection().contains(res))\r
{\r
- JPopupMenu pop = new JPopupMenu();\r
JMenuItem item = new JMenuItem("Hide Columns");\r
item.addActionListener(new ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
{\r
- av.getColumnSelection().hideColumns(res, av);\r
+ av.hideColumns(res, res);\r
+ if(av.getSelectionGroup()!=null\r
+ && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())\r
+ av.setSelectionGroup(null);\r
+\r
ap.repaint();\r
- if(ap.overviewPanel != null)\r
+ if (ap.overviewPanel != null)\r
ap.overviewPanel.updateOverviewImage();\r
}\r
});\r
pop.add(item);\r
pop.show(this, evt.getX(), evt.getY());\r
-\r
- }\r
- else*/\r
- {\r
- av.getColumnSelection().removeElement(res);\r
- av.setSelectionGroup(null);\r
}\r
}\r
- else\r
+ else // LEFT MOUSE TO SELECT\r
{\r
- av.getColumnSelection().addElement(res);\r
- SequenceGroup sg = new SequenceGroup();\r
+ if (!evt.isControlDown() && !evt.isShiftDown())\r
+ {\r
+ av.getColumnSelection().clear();\r
+ }\r
+\r
+ av.getColumnSelection().addElement(res);\r
+ SequenceGroup 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
+\r
+ sg.setStartRes(res);\r
+ sg.setEndRes(res);\r
+ av.setSelectionGroup(sg);\r
\r
- for (int i = 0; i < av.alignment.getSequences().size(); i++)\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
{\r
- sg.addSequence(av.alignment.getSequenceAt(i), false);\r
+ av.getColumnSelection().addElement(i);\r
}\r
+ sg.setStartRes(min);\r
+ sg.setEndRes(max);\r
+ }\r
+\r
\r
- sg.setStartRes(res);\r
- sg.setEndRes(res);\r
- av.setSelectionGroup(sg);\r
}\r
\r
\r
\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.hasHiddenColumns)\r
res = av.getColumnSelection().adjustForHiddenColumns(res);\r
\r
mouseDragging = true;\r
\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
+\r
+ if(res> av.alignment.getWidth())\r
+ {\r
+ res = av.alignment.getWidth()-1;\r
+ }\r
+\r
if (res < min)\r
{\r
min = res;\r
}\r
\r
\r
+\r
SequenceGroup sg = av.getSelectionGroup();\r
\r
if (sg != null)\r
{\r
gg.setColor(Color.blue);\r
int res;\r
- for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)\r
+ if(av.getShowHiddenMarkers())\r
{\r
- res = av.getColumnSelection().findHiddenRegionPosition( i )-startx;\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();\r
+ i++)\r
+ {\r
\r
- gg.fillPolygon(new int[] { 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
+ 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
git://source.jalview.org / jalview.git / blobdiff