/*\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
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().getHiddenColumns().size()>1)\r
+ if (av.getColumnSelection().getHiddenColumns().size() > 1)\r
{\r
item = new JMenuItem("Reveal All");\r
item.addActionListener(new ActionListener()\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.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