From 06faf90ba52bfcdc4547a68cb3df86c14a5c6e05 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 26 Aug 2015 12:06:35 +0100 Subject: [PATCH] JAL-1840 correct setting status bar for structure mouseover --- src/jalview/appletgui/SeqPanel.java | 32 ++++---------------------------- src/jalview/gui/SeqPanel.java | 4 ++++ 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index 700f82d..10db71a 100644 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -446,36 +446,8 @@ public class SeqPanel extends Panel implements MouseMotionListener, pos = sequence.findPosition(res); text.append(" (").append(Integer.toString(pos)).append(")"); } - // Object obj = null; - // if (av.getAlignment().isNucleotide()) - // { - // obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) - // + ""); - // if (obj != null) - // { - // text.append(" Nucleotide: "); - // } - // } - // else - // { - // obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + ""); - // if (obj != null) - // { - // text.append(" Residue: "); - // } - // } - // - // if (obj != null) - // { - // - // if (obj != "") - // { - // text.append(obj + " (" + sequence.findPosition(res) + ")"); - // } - // } ap.alignFrame.statusBar.setText(text.toString()); - } /** @@ -497,6 +469,10 @@ public class SeqPanel extends Panel implements MouseMotionListener, for (Match m : results.getResults()) { SequenceI seq = m.getSequence(); + if (seq.getDatasetSequence() != null) + { + seq = seq.getDatasetSequence(); + } if (seq == ds) { diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 41c3ce1..44b537b 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -892,6 +892,10 @@ public class SeqPanel extends JPanel implements MouseListener, for (Match m : results.getResults()) { SequenceI seq = m.getSequence(); + if (seq.getDatasetSequence() != null) + { + seq = seq.getDatasetSequence(); + } if (seq == ds) { -- 1.7.10.2