X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=27ceb278145ee65200c20ff1c244827ebd1a4a16;hb=97f3e2d00c3d8e671474e012b7db56bb58a6c468;hp=6bc1ad8ee880c33b4cd2507f03aed30a338fbe3b;hpb=3cdfc5e46776dbb8127f0a5b64df3545b988e3d9;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 6bc1ad8..27ceb27 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -20,6 +20,24 @@ */ package jalview.gui; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Point; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import javax.swing.ToolTipManager; + import jalview.api.AlignViewportI; import jalview.bin.Cache; import jalview.commands.EditCommand; @@ -29,6 +47,7 @@ import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; import jalview.datamodel.HiddenColumns; +import jalview.datamodel.MappedFeatures; import jalview.datamodel.SearchResultMatchI; import jalview.datamodel.SearchResults; import jalview.datamodel.SearchResultsI; @@ -50,23 +69,7 @@ import jalview.util.MessageManager; import jalview.util.Platform; import jalview.viewmodel.AlignmentViewport; import jalview.viewmodel.ViewportRanges; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Point; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; -import java.util.Collections; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingUtilities; -import javax.swing.ToolTipManager; +import jalview.viewmodel.seqfeatures.FeatureRendererModel; /** * DOCUMENT ME! @@ -255,11 +258,6 @@ public class SeqPanel extends JPanel int wrappedBlock = -1; - MousePos findMousePosition(MouseEvent evt) - { - return findMousePosition(evt, null); - } - /** * Computes the column and sequence row (and possibly annotation row when in * wrapped mode) for the given mouse position @@ -267,22 +265,15 @@ public class SeqPanel extends JPanel * @param evt * @return */ - MousePos findMousePosition(MouseEvent evt, String debug) + MousePos findMousePosition(MouseEvent evt) { - int col = findColumn(evt, debug); + int col = findColumn(evt); int seqIndex = -1; int annIndex = -1; int y = evt.getY(); int charHeight = av.getCharHeight(); int alignmentHeight = av.getAlignment().getHeight(); - if (debug != null) - { - System.out.println(String.format( - "%s: charHeight %d alHeight %d canvasWidth %d canvasHeight %d", - debug, charHeight, alignmentHeight, seqCanvas.getWidth(), - seqCanvas.getHeight())); - } if (av.getWrapAlignment()) { seqCanvas.calculateWrappedGeometry(seqCanvas.getWidth(), @@ -343,11 +334,6 @@ public class SeqPanel extends JPanel */ int findColumn(MouseEvent evt) { - return findColumn(evt, null); - } - - int findColumn(MouseEvent evt, String debug) - { int res = 0; int x = evt.getX(); @@ -368,14 +354,6 @@ public class SeqPanel extends JPanel int y = evt.getY(); y = Math.max(0, y - hgap); x -= seqCanvas.getLabelWidthWest(); - if (debug != null) - { - System.out.println( - String.format("%s: %s %d x %d labelWest %d charWidth %d ", - debug, Thread.currentThread().getName(), - System.currentTimeMillis(), x, - seqCanvas.getLabelWidthWest(), charWidth)); - } if (x < 0) { // mouse is over left scale @@ -389,10 +367,6 @@ public class SeqPanel extends JPanel } if (x >= cwidth * charWidth) { - if (debug != null) - { - System.out.println(debug + ": cwidth = " + cwidth); - } // mouse is over right scale return -1; } @@ -861,11 +835,11 @@ public class SeqPanel extends JPanel * the start of the highlighted region. */ @Override - public void highlightSequence(SearchResultsI results) + public String highlightSequence(SearchResultsI results) { if (results == null || results.equals(lastSearchResults)) { - return; + return null; } lastSearchResults = results; @@ -891,6 +865,77 @@ public class SeqPanel extends JPanel { setStatusMessage(results); } + return results.isEmpty() ? null : getHighlightInfo(results); + } + + /** + * temporary hack: answers a message suitable to show on structure hover + * label. This is normally null. It is a peptide variation description if + *