X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=2f77959611f9b741dba1bea97a585de7e8494c53;hb=refs%2Fheads%2Ftask%2FJAL-3763_newDatasetForCds;hp=8a37952d68e363dea01d81db84cf8b9f2574d854;hpb=0b573ed90b14079f7326281f50c0c9cffdace586;p=jalview.git diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 8a37952..2f77959 100644 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -20,6 +20,35 @@ */ package jalview.gui; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Collection; +import java.util.Collections; +import java.util.Hashtable; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.Vector; + +import javax.swing.ButtonGroup; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JScrollPane; + import jalview.analysis.AAFrequency; import jalview.analysis.AlignmentAnnotationUtils; import jalview.analysis.AlignmentUtils; @@ -58,35 +87,6 @@ import jalview.util.StringUtils; import jalview.util.UrlLink; import jalview.viewmodel.seqfeatures.FeatureRendererModel; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.BitSet; -import java.util.Collection; -import java.util.Collections; -import java.util.Hashtable; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.Vector; - -import javax.swing.ButtonGroup; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JInternalFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.JScrollPane; - /** * The popup menu that is displayed on right-click on a sequence id, or in the * sequence alignment. @@ -94,6 +94,11 @@ import javax.swing.JScrollPane; public class PopupMenu extends JPopupMenu implements ColourChangeListener { /* + * maximum length of feature description to include in popup menu item text + */ + private static final int FEATURE_DESC_MAX = 40; + + /* * true for ID Panel menu, false for alignment panel menu */ private final boolean forIdPanel; @@ -756,14 +761,16 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener } /** - * Add a link to show feature details for each sequence feature + * Add a menu item to show feature details for each sequence feature. Any + * linked 'virtual' features (CDS/protein) are also optionally found and + * included. * * @param features - * @param column * @param seq + * @param column */ protected void addFeatureDetails(List features, - SequenceI seq, int column) + final SequenceI seq, final int column) { /* * add features in CDS/protein complement at the corresponding @@ -798,82 +805,99 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener String name = seq.getName(); for (final SequenceFeature sf : features) { - addFeatureDetailsMenuItem(details, name, sf); + addFeatureDetailsMenuItem(details, name, sf, null); } if (mf != null) { - name = mf.fromSeq == seq ? mf.mapping.getTo().getName() - : mf.fromSeq.getName(); for (final SequenceFeature sf : mf.features) { - addFeatureDetailsMenuItem(details, name, sf); + addFeatureDetailsMenuItem(details, name, sf, mf); } } } /** - * A helper method to add one menu item whose action is to show details for one - * feature + * A helper method to add one menu item whose action is to show details for + * one feature. The menu text includes feature description, but this may be + * truncated. * * @param details * @param seqName * @param sf + * @param mf */ void addFeatureDetailsMenuItem(JMenu details, final String seqName, - final SequenceFeature sf) + final SequenceFeature sf, MappedFeatures mf) { int start = sf.getBegin(); int end = sf.getEnd(); - String desc = null; - if (start == end) + if (mf != null) { - desc = String.format("%s %d", sf.getType(), start); + /* + * show local rather than linked feature coordinates + */ + int[] beginRange = mf.getMappedPositions(start, start); + int[] endRange = mf.getMappedPositions(end, end); + if (beginRange == null || endRange == null) + { + // e.g. variant extending to stop codon so not mappable + return; + } + start = beginRange[0]; + end = endRange[endRange.length - 1]; } - else + StringBuilder desc = new StringBuilder(); + desc.append(sf.getType()).append(" ").append(String.valueOf(start)); + if (start != end) { - desc = String.format("%s %d-%d", sf.getType(), start, end); + desc.append(sf.isContactFeature() ? ":" : "-"); + desc.append(String.valueOf(end)); } - String tooltip = desc; String description = sf.getDescription(); if (description != null) { + desc.append(" "); description = StringUtils.stripHtmlTags(description); - if (description.length() > 12) - { - desc = desc + " " + description.substring(0, 12) + ".."; - } - else + + /* + * truncate overlong descriptions unless they contain an href + * (as truncation could leave corrupted html) + */ + boolean hasLink = description.indexOf("a href") > -1; + if (description.length() > FEATURE_DESC_MAX && !hasLink) { - desc = desc + " " + description; + description = description.substring(0, FEATURE_DESC_MAX) + "..."; } - tooltip = tooltip + " " + description; + desc.append(description); } - if (sf.getFeatureGroup() != null) + String featureGroup = sf.getFeatureGroup(); + if (featureGroup != null) { - tooltip = tooltip + (" (" + sf.getFeatureGroup() + ")"); + desc.append(" (").append(featureGroup).append(")"); } - JMenuItem item = new JMenuItem(desc); - item.setToolTipText(tooltip); + String htmlText = JvSwingUtils.wrapTooltip(true, desc.toString()); + JMenuItem item = new JMenuItem(htmlText); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - showFeatureDetails(seqName, sf); + showFeatureDetails(sf, seqName, mf); } }); details.add(item); } /** - * Opens a panel showing a text report of feature dteails - * - * @param seqName + * Opens a panel showing a text report of feature details * * @param sf + * @param seqName + * @param mf */ - protected void showFeatureDetails(String seqName, SequenceFeature sf) + protected void showFeatureDetails(SequenceFeature sf, String seqName, + MappedFeatures mf) { JInternalFrame details; if (Platform.isJS()) @@ -885,7 +909,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener // TODO JAL-3026 set style of table correctly for feature details JLabel reprt = new JLabel(MessageManager .formatMessage("label.html_content", new Object[] - { sf.getDetailsReport(seqName) })); + { sf.getDetailsReport(seqName, mf) })); reprt.setBackground(Color.WHITE); reprt.setOpaque(true); panel.add(reprt, BorderLayout.CENTER); @@ -900,10 +924,10 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener */ { CutAndPasteHtmlTransfer cap = new CutAndPasteHtmlTransfer(); - // it appears Java's CSS does not support border-collaps :-( + // it appears Java's CSS does not support border-collapse :-( cap.addStylesheetRule("table { border-collapse: collapse;}"); cap.addStylesheetRule("table, td, th {border: 1px solid black;}"); - cap.setText(sf.getDetailsReport(seqName)); + cap.setText(sf.getDetailsReport(seqName, mf)); details = cap; } Desktop.addInternalFrame(details, @@ -1789,7 +1813,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener "label.create_sequence_details_report_annotation_for", new Object[] { seq.getDisplayId(true) }) + "

"); - new SequenceAnnotationReport(null).createSequenceAnnotationReport( + new SequenceAnnotationReport(false).createSequenceAnnotationReport( contents, seq, true, true, ap.getSeqPanel().seqCanvas.fr); contents.append("

"); }