/*\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
\r
package jalview.appletgui;\r
\r
+import java.util.*;\r
+\r
import java.awt.*;\r
import java.awt.event.*;\r
-import java.util.Vector;\r
\r
import jalview.datamodel.*;\r
\r
AlignViewport av;\r
boolean resizing = false;\r
int oldY, mouseX;\r
- static String ADDNEW = "Add new row";\r
- static String HIDE = "Hide this row";\r
- static String DELETE = "Delete this row";\r
- static String SHOWALL = "Show all hidden rows";\r
+\r
+ static String ADDNEW = "Add New Row";\r
+ static String EDITNAME = "Edit Label/Description";\r
+ static String HIDE = "Hide This Row";\r
+ static String SHOWALL = "Show All Hidden Rows";\r
static String OUTPUT_TEXT = "Show Values In Textbox";\r
static String COPYCONS_SEQ = "Copy Consensus Sequence";\r
\r
- int selectedRow = 0;\r
int scrollOffset = 0;\r
+ int selectedRow = -1;\r
\r
Tooltip tooltip;\r
\r
}\r
\r
public AnnotationLabels(AlignViewport av)\r
-{\r
- this.av = av;\r
-}\r
-\r
+ {\r
+ this.av = av;\r
+ }\r
\r
public void setScrollOffset(int y)\r
{\r
repaint();\r
}\r
\r
- void getSelectedRow(int y)\r
+ int getSelectedRow(int y)\r
{\r
- selectedRow = -1;\r
+ int row = -1;\r
AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
\r
- if(aa==null)\r
- return;\r
+ if (aa == null)\r
+ {\r
+ return row;\r
+ }\r
\r
int height = 0;\r
for (int i = 0; i < aa.length; i++)\r
height += aa[i].height;\r
if (y < height)\r
{\r
- selectedRow = i;\r
+ row = i;\r
break;\r
}\r
}\r
+\r
+ return row;\r
}\r
\r
public void actionPerformed(ActionEvent evt)\r
{\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
\r
- if (evt.getActionCommand().equals(HIDE))\r
+ if (evt.getActionCommand().equals(ADDNEW))\r
+ {\r
+ AlignmentAnnotation newAnnotation = new AlignmentAnnotation("",\r
+ null,\r
+ new Annotation[ap.av.alignment.getWidth()]);\r
+\r
+ if (!editLabelDescription(newAnnotation))\r
+ {\r
+ return;\r
+ }\r
+\r
+ ap.av.alignment.addAnnotation(newAnnotation);\r
+ ap.av.alignment.setAnnotationIndex(newAnnotation, 0);\r
+ }\r
+ else if (evt.getActionCommand().equals(EDITNAME))\r
+ {\r
+ editLabelDescription(aa[selectedRow]);\r
+ }\r
+ else if (evt.getActionCommand().equals(HIDE))\r
{\r
aa[selectedRow].visible = false;\r
}\r
}\r
else if (evt.getActionCommand().equals(COPYCONS_SEQ))\r
{\r
- SequenceI cons=av.getConsensusSeq();\r
- if (cons!=null)\r
+ SequenceI cons = av.getConsensusSeq();\r
+ if (cons != null)\r
+ {\r
copy_annotseqtoclipboard(cons);\r
+ }\r
\r
}\r
ap.annotationPanel.adjustPanelHeight();\r
setSize(getSize().width, ap.annotationPanel.getSize().height);\r
ap.validate();\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
+ }\r
+\r
+ boolean editLabelDescription(AlignmentAnnotation annotation)\r
+ {\r
+ EditNameDialog dialog = new EditNameDialog(\r
+ annotation.label,\r
+ annotation.description,\r
+ " Annotation Label",\r
+ "Annotation Description",\r
+ ap.alignFrame,\r
+ "Edit Annotation Name / Description",\r
+ 500, 100);\r
+\r
+ if (dialog.accept)\r
+ {\r
+ annotation.label = dialog.getName();\r
+ annotation.description = dialog.getDescription();\r
+ repaint();\r
+ return true;\r
+ }\r
+ else\r
+ return false;\r
+\r
}\r
\r
public void mouseMoved(MouseEvent evt)\r
{\r
- getSelectedRow(evt.getY() - scrollOffset);\r
+ int row = getSelectedRow(evt.getY() - scrollOffset);\r
\r
- if (selectedRow > -1)\r
+ if (row > -1)\r
{\r
if (tooltip == null)\r
+ {\r
tooltip = new Tooltip(ap.av.alignment.\r
- getAlignmentAnnotation()[selectedRow].\r
- description,\r
- this);\r
+ getAlignmentAnnotation()[row].\r
+ description,\r
+ this);\r
+ }\r
else\r
+ {\r
tooltip.setTip(ap.av.alignment.\r
- getAlignmentAnnotation()[selectedRow].description);\r
-\r
- tooltip.repaint();\r
-\r
+ getAlignmentAnnotation()[row].description);\r
+ }\r
}\r
else if (tooltip != null)\r
{\r
\r
public void mouseDragged(MouseEvent evt)\r
{}\r
+\r
public void mouseClicked(MouseEvent evt)\r
{}\r
+\r
public void mouseReleased(MouseEvent evt)\r
{}\r
+\r
public void mouseEntered(MouseEvent evt)\r
{}\r
+\r
public void mouseExited(MouseEvent evt)\r
{}\r
+\r
public void mousePressed(MouseEvent evt)\r
{\r
+ selectedRow = getSelectedRow(evt.getY() - scrollOffset);\r
+\r
AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
\r
- PopupMenu pop = new PopupMenu("Annotations");\r
- MenuItem item = new MenuItem(HIDE);\r
+ PopupMenu popup = new PopupMenu("Annotations");\r
+\r
+ MenuItem item = new MenuItem(ADDNEW);\r
+ item.addActionListener(this);\r
+ popup.add(item);\r
+ item = new MenuItem(EDITNAME);\r
item.addActionListener(this);\r
- pop.add(item);\r
+ popup.add(item);\r
+ item = new MenuItem(HIDE);\r
+ item.addActionListener(this);\r
+ popup.add(item);\r
item = new MenuItem(SHOWALL);\r
item.addActionListener(this);\r
- pop.add(item);\r
- this.add(pop);\r
+ popup.add(item);\r
+ this.add(popup);\r
item = new MenuItem(OUTPUT_TEXT);\r
item.addActionListener(this);\r
- pop.add(item);\r
+ popup.add(item);\r
\r
- if (aa[selectedRow].label.equals("Consensus"))\r
+ if (aa[selectedRow] == ap.av.consensus)\r
{\r
- pop.addSeparator();\r
+ popup.addSeparator();\r
final CheckboxMenuItem cbmi = new CheckboxMenuItem(\r
"Ignore Gaps In Consensus",\r
ap.av.getIgnoreGapsConsensus());\r
public void itemStateChanged(ItemEvent e)\r
{\r
ap.av.setIgnoreGapsConsensus(cbmi.getState());\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
}\r
});\r
- pop.add(cbmi);\r
- final MenuItem cpcons=new MenuItem(COPYCONS_SEQ);\r
- cpcons.addActionListener(this);\r
- pop.add(cpcons);\r
+ popup.add(cbmi);\r
+ item = new MenuItem(COPYCONS_SEQ);\r
+ item.addActionListener(this);\r
+ popup.add(item);\r
}\r
\r
- pop.show(this, evt.getX(), evt.getY());\r
+ popup.show(this, evt.getX(), evt.getY());\r
\r
}\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @param e DOCUMENT ME!\r
- */\r
- protected void copy_annotseqtoclipboard(SequenceI sq)\r
+\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param e DOCUMENT ME!\r
+ */\r
+ protected void copy_annotseqtoclipboard(SequenceI sq)\r
+ {\r
+ if (sq == null || sq.getLength() < 1)\r
{\r
- if (sq==null || sq.getLength()<1)\r
- return;\r
- jalview.appletgui.AlignFrame.copiedSequences = new StringBuffer();\r
- jalview.appletgui.AlignFrame.copiedSequences.append(sq.getName() + "\t" +\r
- sq.getStart() + "\t" +\r
- sq.getEnd() + "\t" +\r
- sq.getSequenceAsString() + "\n");\r
- if (av.hasHiddenColumns)\r
+ return;\r
+ }\r
+ jalview.appletgui.AlignFrame.copiedSequences = new StringBuffer();\r
+ jalview.appletgui.AlignFrame.copiedSequences.append(sq.getName() + "\t" +\r
+ sq.getStart() + "\t" +\r
+ sq.getEnd() + "\t" +\r
+ sq.getSequenceAsString() + "\n");\r
+ if (av.hasHiddenColumns)\r
+ {\r
+ jalview.appletgui.AlignFrame.copiedHiddenColumns = new Vector();\r
+ for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)\r
{\r
- jalview.appletgui.AlignFrame.copiedHiddenColumns=new Vector();\r
- for(int i=0; i<av.getColumnSelection().getHiddenColumns().size(); i++)\r
- {\r
- int[] region = (int[])\r
- av.getColumnSelection().getHiddenColumns().elementAt(i);\r
+ int[] region = (int[])\r
+ av.getColumnSelection().getHiddenColumns().elementAt(i);\r
\r
- jalview.appletgui.AlignFrame.copiedHiddenColumns.addElement(new int[]{region[0],\r
- region[1]});\r
- }\r
+ jalview.appletgui.AlignFrame.copiedHiddenColumns.addElement(new int[]\r
+ {region[0],\r
+ region[1]});\r
}\r
}\r
+ }\r
\r
- public void update(Graphics g)\r
- {\r
- paint(g);\r
- }\r
+ public void update(Graphics g)\r
+ {\r
+ paint(g);\r
+ }\r
\r
public void paint(Graphics g)\r
{\r
}\r
\r
drawComponent(image.getGraphics(), w);\r
- g.drawImage(image,0,0,this);\r
+ g.drawImage(image, 0, 0, this);\r
}\r
\r
public void drawComponent(Graphics g, int width)\r
\r
x = width - fm.stringWidth(aa[i].label) - 3;\r
\r
- if (aa[i].graph>0)\r
+ if (aa[i].graph > 0)\r
{\r
y += (aa[i].height / 3);\r
}\r
\r
g.drawString(aa[i].label, x, y);\r
\r
- if (aa[i].graph>0)\r
+ if (aa[i].graph > 0)\r
{\r
y += (2 * aa[i].height / 3);\r
}\r
git://source.jalview.org / jalview.git / blobdiff