git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2321 use configured values for structure derived annotation
[jalview.git]
/
src
/
jalview
/
gui
/
IdPanel.java
diff --git
a/src/jalview/gui/IdPanel.java
b/src/jalview/gui/IdPanel.java
index
6097089
..
f2761ab
100755
(executable)
--- a/
src/jalview/gui/IdPanel.java
+++ b/
src/jalview/gui/IdPanel.java
@@
-48,8
+48,8
@@
import javax.swing.ToolTipManager;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class IdPanel extends JPanel implements MouseListener,
- MouseMotionListener, MouseWheelListener
+public class IdPanel extends JPanel
+ implements MouseListener, MouseMotionListener, MouseWheelListener
{
private IdCanvas idCanvas;
{
private IdCanvas idCanvas;
@@
-138,7
+138,7
@@
public class IdPanel extends JPanel implements MouseListener,
}
lastid = seq;
}
lastid = seq;
- alignPanel.paintAlignment(true);
+ alignPanel.paintAlignment(false, false);
}
/**
}
/**
@@
-148,7
+148,8
@@
public class IdPanel extends JPanel implements MouseListener,
public void mouseWheelMoved(MouseWheelEvent e)
{
e.consume();
public void mouseWheelMoved(MouseWheelEvent e)
{
e.consume();
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
if (e.isShiftDown())
{
{
if (e.isShiftDown())
{
@@
-159,7
+160,7
@@
public class IdPanel extends JPanel implements MouseListener,
av.getRanges().scrollUp(false);
}
}
av.getRanges().scrollUp(false);
}
}
- else
+ else if (wheelRotation < 0)
{
if (e.isShiftDown())
{
{
if (e.isShiftDown())
{
@@
-293,8
+294,8
@@
public class IdPanel extends JPanel implements MouseListener,
}
if ((av.getSelectionGroup() == null)
}
if ((av.getSelectionGroup() == null)
- || (!jalview.util.Platform.isControlDown(e) && !e.isShiftDown() && av
- .getSelectionGroup() != null))
+ || (!jalview.util.Platform.isControlDown(e) && !e.isShiftDown()
+ && av.getSelectionGroup() != null))
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().setStartRes(0);
@@
-313,7
+314,7
@@
public class IdPanel extends JPanel implements MouseListener,
av.isSelectionGroupChanged(true);
av.isSelectionGroupChanged(true);
- alignPanel.paintAlignment(true);
+ alignPanel.paintAlignment(false, false);
}
/**
}
/**
@@
-325,23
+326,19
@@
public class IdPanel extends JPanel implements MouseListener,
{
int seq2 = alignPanel.getSeqPanel().findSeq(e);
Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq2);
{
int seq2 = alignPanel.getSeqPanel().findSeq(e);
Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq2);
- // build a new links menu based on the current links + any non-positional
- // features
+
+ /*
+ * build a new links menu based on the current links
+ * and any non-positional features
+ */
List<String> nlinks = Preferences.sequenceUrlLinks.getLinksForMenu();
List<String> nlinks = Preferences.sequenceUrlLinks.getLinksForMenu();
- SequenceFeature sfs[] = sq == null ? null : sq.getSequenceFeatures();
- if (sfs != null)
+ for (SequenceFeature sf : sq.getFeatures().getNonPositionalFeatures())
{
{
- for (SequenceFeature sf : sfs)
+ if (sf.links != null)
{
{
- if (sf.begin == sf.end && sf.begin == 0)
+ for (String link : sf.links)
{
{
- if (sf.links != null && sf.links.size() > 0)
- {
- for (int l = 0, lSize = sf.links.size(); l < lSize; l++)
- {
- nlinks.add(sf.links.elementAt(l));
- }
- }
+ nlinks.add(link);
}
}
}
}
}
}
@@
-395,8
+392,8
@@
public class IdPanel extends JPanel implements MouseListener,
for (int i = start; i <= end; i++)
{
for (int i = start; i <= end; i++)
{
- av.getSelectionGroup().addSequence(
- av.getAlignment().getSequenceAt(i), i == end);
+ av.getSelectionGroup().addSequence(av.getAlignment().getSequenceAt(i),
+ i == end);
}
}
}
}
@@
-511,7
+508,7
@@
public class IdPanel extends JPanel implements MouseListener,
running = false;
}
running = false;
}
- alignPanel.paintAlignment(false);
+ alignPanel.paintAlignment(false, false);
try
{
try
{