X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=47f43d598ac4eb7341ab4ced55e331f5a57049b8;hb=89a0b775abfaa90242a171ca8133784a424a3d7b;hp=cb13692444af52aca625250adeec02b2353caa56;hpb=4263dac5b885f760215fa599eb453e1221767d04;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index cb13692..47f43d5 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -69,59 +69,49 @@ public class IdPanel extends JPanel implements MouseListener, */ public void mouseMoved(MouseEvent e) { - int y = e.getY(); - - if (av.getWrapAlignment()) - { - y = getWrappedY(y); - } - - final int seq = av.getIndex(y); - if(seq!=-1) + int seq = Math.max(0, alignPanel.seqPanel.findSeq(e)); + if(seq>-1 && seq"); - tip.append(av.alignment.getSequenceAt(seq).getDisplayId(true)); + tip.append(sequence.getDisplayId(true)); if (av.alignment.getSequenceAt(seq).getDescription() != null) { tip.append("
"); tip.append(av.alignment.getSequenceAt(seq).getDescription()); - tip.append("
"); - } - tip.append(""); - setToolTipText(tip.toString()); - } - if(av.hasHiddenRows) - { - if(av.adjustForHiddenSeqs(seq) - - av.adjustForHiddenSeqs(seq-1)>1) - { - JPopupMenu pop = new JPopupMenu(); - JMenuItem item = new JMenuItem("Reveal"); - item.addActionListener(new ActionListener() + //ADD NON POSITIONAL SEQUENCE INFO + SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures(); + if(features!=null) { - public void actionPerformed(ActionEvent e) + for(int i=0; i"+features[i].featureGroup + +" "+ features[i].getType()+" "+features[i].description); + } } - }); - pop.add(item); - pop.show(this, e.getX(), e.getY()); + } + tip.append(""); } - } - } - - int getWrappedY(int y) - { - int hgap = av.charHeight; - if (av.scaleAboveWrapped) - hgap += av.charHeight; + DBRefEntry[] dbrefs = sequence.getDatasetSequence().getDBRef(); + if (dbrefs != null) + { + tip.append(""); + for (int i = 0; i < dbrefs.length; i++) + { + tip.append("
"); + tip.append(dbrefs[i].getSource() + " " + + dbrefs[i].getAccessionId()); + } + tip.append(""); + } - return y - hgap; + tip.append(""); + setToolTipText(tip.toString()); + } } @@ -134,19 +124,7 @@ public class IdPanel extends JPanel implements MouseListener, { mouseDragging = true; - int y = e.getY(); - - if (av.getWrapAlignment()) - { - y = getWrappedY(y); - } - - int seq = av.getIndex(y); - - if (seq < 0) - { - return; - } + int seq = Math.max(0, alignPanel.seqPanel.findSeq(e)); if (seq < lastid) { @@ -176,17 +154,9 @@ public class IdPanel extends JPanel implements MouseListener, if (links == null || links.size() < 1) return; - int y = e.getY(); - - if (av.getWrapAlignment()) - { - y = getWrappedY(y); - } + int seq = alignPanel.seqPanel.findSeq(e); //DEFAULT LINK IS FIRST IN THE LINK LIST - int seq = av.getIndex(y); - if(seq==-1) - return; String id = av.getAlignment().getSequenceAt(seq).getName(); if (id.indexOf("|") > -1) @@ -262,56 +232,29 @@ public class IdPanel extends JPanel implements MouseListener, return; } - int y = e.getY(); + int seq = alignPanel.seqPanel.findSeq(e); - if (av.getWrapAlignment()) - { - y = getWrappedY(y); - } - - int seq = av.getIndex(y); - - if (seq == -1) - { - return; - } if (javax.swing.SwingUtilities.isRightMouseButton(e)) { jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, - (Sequence) av.getAlignment().getSequenceAt(seq)); - pop.show(this, e.getX(), y); + (Sequence) av.getAlignment().getSequenceAt(seq), + Preferences.sequenceURLLinks); + pop.show(this, e.getX(), e.getY()); return; } - if (!e.isControlDown() && !e.isShiftDown() && - (av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null)) - { - SequenceGroup selection = new SequenceGroup(); - SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt( - seq)); - selection.setStartRes(0); - selection.setEndRes(av.alignment.getWidth() - 1); - - for (int i = 0; i < sg.getSize(); i++) - { - selection.addSequence(sg.getSequenceAt(i), true); - } - - av.setSelectionGroup(selection); - return; - } if ((av.getSelectionGroup() == null) || - (!e.isControlDown() && (av.getSelectionGroup() != null))) + ((!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null)) { - av.setSelectionGroup(new SequenceGroup()); + av.setSelectionGroup(new SequenceGroup()); + av.getSelectionGroup().setStartRes(0); + av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1); } - av.getSelectionGroup().setStartRes(0); - av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1); if (e.isShiftDown() && (lastid != -1)) {