X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=a0102b9d0f4046564b624f8b9b7b2dcd965a06de;hb=453fa24ab502aaca4ffccf3590f97c897b9580b3;hp=cef84ccd25edb687b97bdaabdb65ebc5a6992099;hpb=dca8d7b5caa5c263b01d7750098da075c892c9f4;p=jalview.git
diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index cef84cc..a0102b9 100755
--- a/src/jalview/appletgui/AnnotationLabels.java
+++ b/src/jalview/appletgui/AnnotationLabels.java
@@ -1,35 +1,73 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.BufferedImage;
-
-import jalview.datamodel.*;
-
-public class AnnotationLabels extends Panel implements ActionListener,
- MouseListener, MouseMotionListener
+import jalview.analysis.AlignmentUtils;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+import jalview.util.ParseHtmlBodyAndLinks;
+
+import java.awt.Checkbox;
+import java.awt.CheckboxMenuItem;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MenuItem;
+import java.awt.Panel;
+import java.awt.PopupMenu;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class AnnotationLabels extends Panel
+ implements ActionListener, MouseListener, MouseMotionListener
{
Image image;
+ /**
+ * width in pixels within which height adjuster arrows are shown and active
+ */
+ private static final int HEIGHT_ADJUSTER_WIDTH = 50;
+
+ /**
+ * height in pixels for allowing height adjuster to be active
+ */
+ private static int HEIGHT_ADJUSTER_HEIGHT = 10;
+
boolean active = false;
AlignmentPanel ap;
@@ -65,33 +103,6 @@ public class AnnotationLabels extends Panel implements ActionListener,
this.ap = ap;
this.av = ap.av;
setLayout(null);
-
- /**
- * this retrieves the adjustable height glyph from resources. we don't use it at the moment.
- java.net.URL url = getClass().getResource("/images/idwidth.gif");
- Image temp = null;
-
- if (url != null)
- {
- temp = java.awt.Toolkit.getDefaultToolkit().createImage(url);
- }
-
- try
- {
- MediaTracker mt = new MediaTracker(this);
- mt.addImage(temp, 0);
- mt.waitForID(0);
- } catch (Exception ex)
- {
- }
-
- BufferedImage bi = new BufferedImage(temp.getHeight(this),
- temp.getWidth(this), BufferedImage.TYPE_INT_RGB);
- Graphics2D g = (Graphics2D) bi.getGraphics();
- g.rotate(Math.toRadians(90));
- g.drawImage(temp, 0, -bi.getWidth(this), this);
- image = (Image) bi;
-*/
addMouseListener(this);
addMouseMotionListener(this);
}
@@ -101,10 +112,13 @@ public class AnnotationLabels extends Panel implements ActionListener,
this.av = av;
}
- public void setScrollOffset(int y)
+ public void setScrollOffset(int y, boolean repaint)
{
scrollOffset = y;
- repaint();
+ if (repaint)
+ {
+ repaint();
+ }
}
/**
@@ -116,7 +130,8 @@ public class AnnotationLabels extends Panel implements ActionListener,
int getSelectedRow(int y)
{
int row = -2;
- AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
+ AlignmentAnnotation[] aa = ap.av.getAlignment()
+ .getAlignmentAnnotation();
if (aa == null)
{
@@ -141,22 +156,23 @@ public class AnnotationLabels extends Panel implements ActionListener,
return row;
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
- AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
+ AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
if (evt.getActionCommand().equals(ADDNEW))
{
AlignmentAnnotation newAnnotation = new AlignmentAnnotation("", null,
- new Annotation[ap.av.alignment.getWidth()]);
+ new Annotation[ap.av.getAlignment().getWidth()]);
if (!editLabelDescription(newAnnotation))
{
return;
}
- ap.av.alignment.addAnnotation(newAnnotation);
- ap.av.alignment.setAnnotationIndex(newAnnotation, 0);
+ ap.av.getAlignment().addAnnotation(newAnnotation);
+ ap.av.getAlignment().setAnnotationIndex(newAnnotation, 0);
}
else if (evt.getActionCommand().equals(EDITNAME))
{
@@ -179,29 +195,42 @@ public class AnnotationLabels extends Panel implements ActionListener,
ap.alignFrame);
Frame frame = new Frame();
frame.add(cap);
- jalview.bin.JalviewLite.addFrame(frame, ap.alignFrame.getTitle()
- + " - " + aa[selectedRow].label, 500, 100);
+ jalview.bin.JalviewLite.addFrame(frame,
+ ap.alignFrame.getTitle() + " - " + aa[selectedRow].label, 500,
+ 100);
cap.setText(aa[selectedRow].toString());
}
else if (evt.getActionCommand().equals(COPYCONS_SEQ))
{
- SequenceI cons = av.getConsensusSeq();
+ SequenceGroup group = aa[selectedRow].groupRef;
+ SequenceI cons = group == null ? av.getConsensusSeq()
+ : group.getConsensusSeq();
if (cons != null)
{
copy_annotseqtoclipboard(cons);
}
}
+ refresh();
+ }
+
+ /**
+ * Adjust size and repaint
+ */
+ protected void refresh()
+ {
ap.annotationPanel.adjustPanelHeight();
setSize(getSize().width, ap.annotationPanel.getSize().height);
ap.validate();
- ap.paintAlignment(true);
+ // TODO: only paint if we needed to
+ ap.paintAlignment(true, true);
}
boolean editLabelDescription(AlignmentAnnotation annotation)
{
- Checkbox padGaps = new Checkbox("Fill Empty Gaps With \""
- + ap.av.getGapCharacter() + "\"", annotation.padGaps);
+ Checkbox padGaps = new Checkbox(
+ "Fill Empty Gaps With \"" + ap.av.getGapCharacter() + "\"",
+ annotation.padGaps);
EditNameDialog dialog = new EditNameDialog(annotation.label,
annotation.description, " Annotation Label",
@@ -224,97 +253,179 @@ public class AnnotationLabels extends Panel implements ActionListener,
return true;
}
else
+ {
return false;
+ }
}
boolean resizePanel = false;
+ @Override
public void mouseMoved(MouseEvent evt)
{
- resizePanel = evt.getY() < 10;
-
+ resizePanel = evt.getY() < HEIGHT_ADJUSTER_HEIGHT
+ && evt.getX() < HEIGHT_ADJUSTER_WIDTH;
+ setCursor(Cursor.getPredefinedCursor(
+ resizePanel ? Cursor.S_RESIZE_CURSOR : Cursor.DEFAULT_CURSOR));
int row = getSelectedRow(evt.getY() + scrollOffset);
if (row > -1)
{
+ ParseHtmlBodyAndLinks phb = new ParseHtmlBodyAndLinks(
+ av.getAlignment().getAlignmentAnnotation()[row]
+ .getDescription(true),
+ true, "\n");
if (tooltip == null)
{
- tooltip = new Tooltip(
- ap.av.alignment.getAlignmentAnnotation()[row]
- .getDescription(true),
- this);
+ tooltip = new Tooltip(phb.getNonHtmlContent(), this);
}
else
{
- tooltip.setTip(ap.av.alignment.getAlignmentAnnotation()[row]
- .getDescription(true));
+ tooltip.setTip(phb.getNonHtmlContent());
}
}
else if (tooltip != null)
{
tooltip.setTip("");
}
-
}
+ /**
+ * curent drag position
+ */
MouseEvent dragEvent = null;
+ /**
+ * flag to indicate drag events should be ignored
+ */
+ private boolean dragCancelled = false;
+
+ /**
+ * clear any drag events in progress
+ */
+ public void cancelDrag()
+ {
+ dragEvent = null;
+ dragCancelled = true;
+ }
+
+ @Override
public void mouseDragged(MouseEvent evt)
{
+ if (dragCancelled)
+ {
+ return;
+ }
+ ;
dragEvent = evt;
if (resizePanel)
{
- Dimension d = ap.annotationPanelHolder.getSize(),e = ap.annotationSpaceFillerHolder.getSize();;
+ Dimension d = ap.annotationPanelHolder.getSize(),
+ e = ap.annotationSpaceFillerHolder.getSize(),
+ f = ap.seqPanelHolder.getSize();
int dif = evt.getY() - oldY;
- dif /= ap.av.charHeight;
- dif *= ap.av.charHeight;
+ dif /= ap.av.getCharHeight();
+ dif *= ap.av.getCharHeight();
- if ((d.height - dif) > 20)
+ if ((d.height - dif) > 20 && (f.height + dif) > 20)
{
-
- setSize(new Dimension(e.width,d.height-dif));
- ap.annotationSpaceFillerHolder.setSize(new Dimension(e.width, d.height - dif));
- ap.annotationPanelHolder.setSize(new Dimension(d.width, d.height - dif));
- ap.apvscroll.setValues(ap.apvscroll.getValue(), d.height-dif, 0, ap.annotationPanel.adjustPanelHeight(false));
-
+ ap.annotationPanel.setSize(d.width, d.height - dif);
+ setSize(new Dimension(e.width, d.height - dif));
+ ap.annotationSpaceFillerHolder
+ .setSize(new Dimension(e.width, d.height - dif));
+ ap.annotationPanelHolder
+ .setSize(new Dimension(d.width, d.height - dif));
+ ap.apvscroll.setValues(ap.apvscroll.getValue(), d.height - dif, 0,
+ av.calcPanelHeight());
+ f.height += dif;
+ ap.seqPanelHolder.setPreferredSize(f);
+ ap.setScrollValues(av.getRanges().getStartRes(),
+ av.getRanges().getStartSeq());
ap.validate();
- //ap.paintAlignment(true);
+ // ap.paintAlignment(true);
+ ap.addNotify();
}
- ap.addNotify();
}
else
{
+ int diff;
+ if ((diff = 6 - evt.getY()) > 0)
+ {
+ // nudge scroll up
+ ap.apvscroll.setValue(ap.apvscroll.getValue() - diff);
+ ap.adjustmentValueChanged(null);
+
+ }
+ else if ((0 < (diff = 6
+ - ap.annotationSpaceFillerHolder.getSize().height
+ + evt.getY())))
+ {
+ // nudge scroll down
+ ap.apvscroll.setValue(ap.apvscroll.getValue() + diff);
+ ap.adjustmentValueChanged(null);
+ }
repaint();
}
}
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
+ if (!resizePanel && !dragCancelled)
+ {
+ int start = selectedRow;
+
+ int end = getSelectedRow(evt.getY() + scrollOffset);
+
+ if (start > -1 && start != end)
+ {
+ // Swap these annotations
+ AlignmentAnnotation startAA = ap.av.getAlignment()
+ .getAlignmentAnnotation()[start];
+ if (end == -1)
+ {
+ end = ap.av.getAlignment().getAlignmentAnnotation().length - 1;
+ }
+ AlignmentAnnotation endAA = ap.av.getAlignment()
+ .getAlignmentAnnotation()[end];
+
+ ap.av.getAlignment().getAlignmentAnnotation()[end] = startAA;
+ ap.av.getAlignment().getAlignmentAnnotation()[start] = endAA;
+ }
+ }
resizePanel = false;
dragEvent = null;
+ dragCancelled = false;
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
repaint();
ap.annotationPanel.repaint();
}
+ @Override
public void mouseEntered(MouseEvent evt)
{
- if (evt.getY() < 10)
+ if (evt.getY() < 10 && evt.getX() < 14)
{
resizePanel = true;
repaint();
}
+ setCursor(Cursor.getPredefinedCursor(
+ resizePanel ? Cursor.S_RESIZE_CURSOR : Cursor.DEFAULT_CURSOR));
}
+ @Override
public void mouseExited(MouseEvent evt)
{
+ dragCancelled = false;
if (dragEvent == null)
{
@@ -330,19 +441,28 @@ public class AnnotationLabels extends Panel implements ActionListener,
repaint();
}
+ @Override
public void mousePressed(MouseEvent evt)
{
oldY = evt.getY();
+ if (resizePanel)
+ {
+ return;
+ }
+ dragCancelled = false;
// todo: move below to mouseClicked ?
selectedRow = getSelectedRow(evt.getY() + scrollOffset);
- AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
+ AlignmentAnnotation[] aa = ap.av.getAlignment()
+ .getAlignmentAnnotation();
// DETECT RIGHT MOUSE BUTTON IN AWT
- if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+ if ((evt.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
{
- PopupMenu popup = new PopupMenu("Annotations");
+ PopupMenu popup = new PopupMenu(
+ MessageManager.getString("label.annotations"));
MenuItem item = new MenuItem(ADDNEW);
item.addActionListener(this);
@@ -367,6 +487,32 @@ public class AnnotationLabels extends Panel implements ActionListener,
item = new MenuItem(HIDE);
item.addActionListener(this);
popup.add(item);
+
+ /*
+ * Hide all