X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=04c1efe535818a8401b53e58c7ced7a8c5708cd4;hb=0a1d49ccc421184b23bcb45cee901f5313913aa1;hp=f5e0f2f261a596d7d4bf76032f871775d4d8ccaa;hpb=4094ee69e0b9b6f231effaca4b314b288e4ea4ac;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index f5e0f2f..04c1efe 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -69,23 +69,16 @@ 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(sequence.getDisplayId(true)); - if (av.alignment.getSequenceAt(seq).getDescription() != null) + if (sequence.getDescription() != null) { tip.append("
"); - tip.append(av.alignment.getSequenceAt(seq).getDescription()); + tip.append(sequence.getDescription()); //ADD NON POSITIONAL SEQUENCE INFO SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures(); @@ -122,16 +115,6 @@ public class IdPanel extends JPanel implements MouseListener, } - int getWrappedY(int y) - { - int hgap = av.charHeight; - if (av.scaleAboveWrapped) - hgap += av.charHeight; - - return y - hgap; - } - - /** * DOCUMENT ME! * @@ -141,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) { @@ -183,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) @@ -269,49 +232,20 @@ public class IdPanel extends JPanel implements MouseListener, return; } - int y = e.getY(); - - if (av.getWrapAlignment()) - { - y = getWrappedY(y); - } - - int seq = av.getIndex(y); + int seq = alignPanel.seqPanel.findSeq(e); - if (seq == -1) - { - return; - } if (javax.swing.SwingUtilities.isRightMouseButton(e)) { jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, (Sequence) av.getAlignment().getSequenceAt(seq), Preferences.sequenceURLLinks); - pop.show(this, e.getX(), y); + pop.show(this, e.getX(), e.getY()); return; } - /* if (!e.isControlDown() && !e.isShiftDown() && - (av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null)) - { - System.out.println("no modifiers"); - 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() && !e.isShiftDown()) && av.getSelectionGroup() != null)) @@ -322,7 +256,6 @@ public class IdPanel extends JPanel implements MouseListener, } - if (e.isShiftDown() && (lastid != -1)) { selectSeqs(lastid, seq); @@ -356,9 +289,14 @@ public class IdPanel extends JPanel implements MouseListener, */ void selectSeqs(int start, int end) { - if(av.getSelectionGroup()==null) + if(av.getSelectionGroup()==null) return; + if (end >= av.getAlignment().getHeight()) + { + end = av.getAlignment().getHeight() - 1; + } + lastid = start; if (end < start) @@ -389,7 +327,7 @@ public class IdPanel extends JPanel implements MouseListener, } mouseDragging = false; - PaintRefresher.Refresh(av.alignment); + PaintRefresher.Refresh(this, av.getSequenceSetId()); } /**