X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=3e8166415416344c27ede87174735efa1b1376d7;hb=13f678a057d4bf84c0b7bd0dbf37c42599158d7e;hp=635535c052cdbfe21a5b5429f4300010066c6757;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git
diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index 635535c..3e81664 100755
--- a/src/jalview/appletgui/AnnotationLabels.java
+++ b/src/jalview/appletgui/AnnotationLabels.java
@@ -1,29 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.*;
+import jalview.util.MessageManager;
import jalview.util.ParseHtmlBodyAndLinks;
public class AnnotationLabels extends Panel implements ActionListener,
@@ -92,10 +94,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();
+ }
}
/**
@@ -107,7 +112,8 @@ public class AnnotationLabels extends Panel implements ActionListener,
int getSelectedRow(int y)
{
int row = -2;
- AlignmentAnnotation[] aa = ap.av.getAlignment().getAlignmentAnnotation();
+ AlignmentAnnotation[] aa = ap.av.getAlignment()
+ .getAlignmentAnnotation();
if (aa == null)
{
@@ -228,7 +234,10 @@ public class AnnotationLabels extends Panel implements ActionListener,
if (row > -1)
{
- ParseHtmlBodyAndLinks phb = new ParseHtmlBodyAndLinks(av.getAlignment().getAlignmentAnnotation()[row].getDescription(true), true, "\n");
+ ParseHtmlBodyAndLinks phb = new ParseHtmlBodyAndLinks(
+ av.getAlignment().getAlignmentAnnotation()[row]
+ .getDescription(true),
+ true, "\n");
if (tooltip == null)
{
tooltip = new Tooltip(phb.getNonHtmlContent(), this);
@@ -290,7 +299,7 @@ public class AnnotationLabels extends Panel implements ActionListener,
ap.annotationPanelHolder.setSize(new Dimension(d.width, d.height
- dif));
ap.apvscroll.setValues(ap.apvscroll.getValue(), d.height - dif, 0,
- ap.annotationPanel.calcPanelHeight());
+ av.calcPanelHeight());
f.height += dif;
ap.seqPanelHolder.setPreferredSize(f);
ap.setScrollValues(av.getStartRes(), av.getStartSeq());
@@ -334,7 +343,7 @@ public class AnnotationLabels extends Panel implements ActionListener,
int end = getSelectedRow(evt.getY() + scrollOffset);
- if (start>-1 && start != end)
+ if (start > -1 && start != end)
{
// Swap these annotations
AlignmentAnnotation startAA = ap.av.getAlignment()
@@ -391,17 +400,19 @@ public class AnnotationLabels extends Panel implements ActionListener,
{
return;
}
- dragCancelled=false;
+ dragCancelled = false;
// todo: move below to mouseClicked ?
selectedRow = getSelectedRow(evt.getY() + scrollOffset);
- AlignmentAnnotation[] aa = ap.av.getAlignment().getAlignmentAnnotation();
+ AlignmentAnnotation[] aa = ap.av.getAlignment()
+ .getAlignmentAnnotation();
// DETECT RIGHT MOUSE BUTTON IN AWT
if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
{
- PopupMenu popup = new PopupMenu("Annotations");
+ PopupMenu popup = new PopupMenu(
+ MessageManager.getString("label.annotations"));
MenuItem item = new MenuItem(ADDNEW);
item.addActionListener(this);
@@ -444,7 +455,7 @@ public class AnnotationLabels extends Panel implements ActionListener,
{
popup.addSeparator();
final CheckboxMenuItem cbmi = new CheckboxMenuItem(
- "Ignore Gaps In Consensus",
+ MessageManager.getString("label.ignore_gaps_consensus"),
(aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef
.getIgnoreGapsConsensus() : ap.av
.getIgnoreGapsConsensus());
@@ -469,7 +480,7 @@ public class AnnotationLabels extends Panel implements ActionListener,
if (aaa.groupRef != null)
{
final CheckboxMenuItem chist = new CheckboxMenuItem(
- "Show Group Histogram",
+ MessageManager.getString("label.show_group_histogram"),
aa[selectedRow].groupRef.isShowConsensusHistogram());
chist.addItemListener(new ItemListener()
{
@@ -488,7 +499,7 @@ public class AnnotationLabels extends Panel implements ActionListener,
});
popup.add(chist);
final CheckboxMenuItem cprofl = new CheckboxMenuItem(
- "Show Group Logo",
+ MessageManager.getString("label.show_group_logo"),
aa[selectedRow].groupRef.isShowSequenceLogo());
cprofl.addItemListener(new ItemListener()
{
@@ -505,12 +516,33 @@ public class AnnotationLabels extends Panel implements ActionListener,
// ap.annotationPanel.paint(ap.annotationPanel.getGraphics());
}
});
+
popup.add(cprofl);
+ final CheckboxMenuItem cprofn = new CheckboxMenuItem(
+ MessageManager.getString("label.normalise_group_logo"),
+ aa[selectedRow].groupRef.isNormaliseSequenceLogo());
+ cprofn.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent e)
+ {
+ // TODO: pass on reference
+ // to ap
+ // so the
+ // view
+ // can be
+ // updated.
+ aaa.groupRef.setshowSequenceLogo(true);
+ aaa.groupRef.setNormaliseSequenceLogo(cprofn.getState());
+ ap.repaint();
+ // ap.annotationPanel.paint(ap.annotationPanel.getGraphics());
+ }
+ });
+ popup.add(cprofn);
}
else
{
final CheckboxMenuItem chist = new CheckboxMenuItem(
- "Show Histogram", av.isShowConsensusHistogram());
+ MessageManager.getString("label.show_histogram"), av.isShowConsensusHistogram());
chist.addItemListener(new ItemListener()
{
public void itemStateChanged(ItemEvent e)
@@ -522,13 +554,17 @@ public class AnnotationLabels extends Panel implements ActionListener,
// can be
// updated.
av.setShowConsensusHistogram(chist.getState());
+ ap.alignFrame.showConsensusHistogram.setState(chist
+ .getState()); // TODO: implement
+ // ap.updateGUI()/alignFrame.updateGUI
+ // for applet
ap.repaint();
// ap.annotationPanel.paint(ap.annotationPanel.getGraphics());
}
});
popup.add(chist);
final CheckboxMenuItem cprof = new CheckboxMenuItem(
- "Show Logo", av.isShowSequenceLogo());
+ MessageManager.getString("label.show_logo"), av.isShowSequenceLogo());
cprof.addItemListener(new ItemListener()
{
public void itemStateChanged(ItemEvent e)
@@ -540,11 +576,40 @@ public class AnnotationLabels extends Panel implements ActionListener,
// can be
// updated.
av.setShowSequenceLogo(cprof.getState());
+ ap.alignFrame.showSequenceLogo.setState(cprof.getState()); // TODO:
+ // implement
+ // ap.updateGUI()/alignFrame.updateGUI
+ // for
+ // applet
ap.repaint();
// ap.annotationPanel.paint(ap.annotationPanel.getGraphics());
}
});
popup.add(cprof);
+ final CheckboxMenuItem cprofn = new CheckboxMenuItem(
+ MessageManager.getString("label.normalise_logo"), av.isNormaliseSequenceLogo());
+ cprofn.addItemListener(new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent e)
+ {
+ // TODO: pass on reference
+ // to ap
+ // so the
+ // view
+ // can be
+ // updated.
+ av.setShowSequenceLogo(true);
+ ap.alignFrame.normSequenceLogo.setState(cprofn.getState()); // TODO:
+ // implement
+ // ap.updateGUI()/alignFrame.updateGUI
+ // for
+ // applet
+ av.setNormaliseSequenceLogo(cprofn.getState());
+ ap.repaint();
+ // ap.annotationPanel.paint(ap.annotationPanel.getGraphics());
+ }
+ });
+ popup.add(cprofn);
}
item = new MenuItem(COPYCONS_SEQ);
@@ -583,17 +648,40 @@ public class AnnotationLabels extends Panel implements ActionListener,
}
else if (aa[selectedRow].sequenceRef != null)
{
- Vector sr = new Vector();
- sr.addElement(aa[selectedRow].sequenceRef);
if (evt.getClickCount() == 1)
{
- ap.seqPanel.ap.idPanel.highlightSearchResults(sr);
+ ap.seqPanel.ap.idPanel.highlightSearchResults(Arrays
+ .asList(new SequenceI[]
+ { aa[selectedRow].sequenceRef }));
}
else if (evt.getClickCount() >= 2)
{
ap.seqPanel.ap.idPanel.highlightSearchResults(null);
- SequenceGroup sg = new SequenceGroup();
- sg.addSequence(aa[selectedRow].sequenceRef, false);
+ SequenceGroup sg = ap.av.getSelectionGroup();
+ if (sg!=null)
+ {
+ // we make a copy rather than edit the current selection if no modifiers pressed
+ // see Enhancement JAL-1557
+ if (!(evt.isControlDown() || evt.isShiftDown()))
+ {
+ sg = new SequenceGroup(sg);
+ sg.clear();
+ sg.addSequence(aa[selectedRow].sequenceRef, false);
+ } else {
+ if (evt.isControlDown())
+ {
+ sg.addOrRemove(aa[selectedRow].sequenceRef, true);
+ } else {
+ // notionally, we should also add intermediate sequences from last added sequence ?
+ sg.addSequence(aa[selectedRow].sequenceRef, true);
+ }
+ }
+ } else {
+ sg = new SequenceGroup();
+ sg.setStartRes(0);
+ sg.setEndRes(ap.av.getAlignment().getWidth()-1);
+ sg.addSequence(aa[selectedRow].sequenceRef, false);
+ }
ap.av.setSelectionGroup(sg);
ap.paintAlignment(false);
PaintRefresher.Refresh(ap, ap.av.getSequenceSetId());
@@ -646,7 +734,8 @@ public class AnnotationLabels extends Panel implements ActionListener,
{
int w = getSize().width;
int h = getSize().height;
- if (image == null || w != image.getWidth(this) || h!=image.getHeight(this) )
+ if (image == null || w != image.getWidth(this)
+ || h != image.getHeight(this))
{
image = createImage(w, ap.annotationPanel.getSize().height);
}
@@ -703,11 +792,12 @@ public class AnnotationLabels extends Panel implements ActionListener,
dragEvent.getY());
}
- if ((aa == null) || (aa.length < 1))
+ if (!av.wrapAlignment && ((aa == null) || (aa.length < 1)))
{
g.setColor(Color.black);
- g.drawString("Right click", 2, 8);
- g.drawString("to add annotation", 2, 18);
+ g.drawString(MessageManager.getString("label.right_click"), 2, 8);
+ g.drawString(MessageManager.getString("label.to_add_annotation"), 2,
+ 18);
}
}
}