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-1723 ellipsis in tooltip if xrefs to more than 40 db sources
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
bd8959d
..
73ed744
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-124,7
+124,7
@@
public class SeqPanel extends JPanel implements MouseListener,
private final SequenceAnnotationReport seqARep;
private final SequenceAnnotationReport seqARep;
- StringBuffer tooltipText = new StringBuffer();
+ StringBuilder tooltipText = new StringBuilder();
String tmpString;
String tmpString;
@@
-616,13
+616,14
@@
public class SeqPanel extends JPanel implements MouseListener,
return;
}
return;
}
- if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
+ boolean isControlDown = Platform.isControlDown(evt);
+ if (evt.isShiftDown() || isControlDown)
{
{
- if (evt.isAltDown() || evt.isControlDown())
+ editingSeqs = true;
+ if (isControlDown)
{
groupEditing = true;
}
{
groupEditing = true;
}
- editingSeqs = true;
}
else
{
}
else
{
@@
-784,7
+785,7
@@
public class SeqPanel extends JPanel implements MouseListener,
seqARep.appendFeatures(tooltipText, rpos, features,
this.ap.getSeqPanel().seqCanvas.fr.getMinMax());
}
seqARep.appendFeatures(tooltipText, rpos, features,
this.ap.getSeqPanel().seqCanvas.fr.getMinMax());
}
- if (tooltipText.length() == 6) // <html></html>
+ if (tooltipText.length() == 6) // <html>
{
setToolTipText(null);
lastTooltip = null;
{
setToolTipText(null);
lastTooltip = null;
@@
-844,7
+845,8
@@
public class SeqPanel extends JPanel implements MouseListener,
* set if av.getSelectionGroup() refers to a group that is defined on the
* alignment view, rather than a transient selection
*/
* set if av.getSelectionGroup() refers to a group that is defined on the
* alignment view, rather than a transient selection
*/
- private boolean editingDefinedGroup = false; // TODO: refactor to avcontroller or viewModel
+ // private boolean editingDefinedGroup = false; // TODO: refactor to
+ // avcontroller or viewModel
/**
* Set status message in alignment panel
/**
* Set status message in alignment panel
@@
-1557,6
+1559,7
@@
public class SeqPanel extends JPanel implements MouseListener,
final int res = findRes(evt);
final int seq = findSeq(evt);
oldSeq = seq;
final int res = findRes(evt);
final int seq = findSeq(evt);
oldSeq = seq;
+ needOverviewUpdate = false;
startWrapBlock = wrappedBlock;
startWrapBlock = wrappedBlock;
@@
-1591,12
+1594,10
@@
public class SeqPanel extends JPanel implements MouseListener,
&& (res < stretchGroup.getEndRes()))
{
av.setSelectionGroup(stretchGroup);
&& (res < stretchGroup.getEndRes()))
{
av.setSelectionGroup(stretchGroup);
- editingDefinedGroup = true;
}
else
{
stretchGroup = null;
}
else
{
stretchGroup = null;
- editingDefinedGroup = false;
}
}
else if (!stretchGroup.getSequences(null).contains(sequence)
}
}
else if (!stretchGroup.getSequences(null).contains(sequence)
@@
-1615,14
+1616,12
@@
public class SeqPanel extends JPanel implements MouseListener,
&& (allGroups[i].getEndRes() >= res))
{
stretchGroup = allGroups[i];
&& (allGroups[i].getEndRes() >= res))
{
stretchGroup = allGroups[i];
- editingDefinedGroup = true;
break;
}
}
}
av.setSelectionGroup(stretchGroup);
break;
}
}
}
av.setSelectionGroup(stretchGroup);
-
}
if (evt.isPopupTrigger()) // Mac: mousePressed
}
if (evt.isPopupTrigger()) // Mac: mousePressed
@@
-1659,7
+1658,6
@@
public class SeqPanel extends JPanel implements MouseListener,
sg.setEndRes(res);
sg.addSequence(sequence, false);
av.setSelectionGroup(sg);
sg.setEndRes(res);
sg.addSequence(sequence, false);
av.setSelectionGroup(sg);
- editingDefinedGroup = false;
stretchGroup = sg;
if (av.getConservationSelected())
stretchGroup = sg;
if (av.getConservationSelected())
@@
-1736,7
+1734,7
@@
public class SeqPanel extends JPanel implements MouseListener,
// always do this - annotation has own state
// but defer colourscheme update until hidden sequences are passed in
boolean vischange = stretchGroup.recalcConservation(true);
// always do this - annotation has own state
// but defer colourscheme update until hidden sequences are passed in
boolean vischange = stretchGroup.recalcConservation(true);
- needOverviewUpdate |= vischange && editingDefinedGroup;
+ needOverviewUpdate |= vischange && av.isSelectionDefinedGroup();
if (stretchGroup.cs != null)
{
stretchGroup.cs.alignmentChanged(stretchGroup,
if (stretchGroup.cs != null)
{
stretchGroup.cs.alignmentChanged(stretchGroup,
@@
-1755,8
+1753,7
@@
public class SeqPanel extends JPanel implements MouseListener,
}
PaintRefresher.Refresh(this, av.getSequenceSetId());
ap.paintAlignment(needOverviewUpdate);
}
PaintRefresher.Refresh(this, av.getSequenceSetId());
ap.paintAlignment(needOverviewUpdate);
- needOverviewUpdate =false;
- editingDefinedGroup = false;
+ needOverviewUpdate = false;
changeEndRes = false;
changeStartRes = false;
stretchGroup = null;
changeEndRes = false;
changeStartRes = false;
stretchGroup = null;
@@
-1810,7
+1807,7
@@
public class SeqPanel extends JPanel implements MouseListener,
if (res > (stretchGroup.getStartRes() - 1))
{
stretchGroup.setEndRes(res);
if (res > (stretchGroup.getStartRes() - 1))
{
stretchGroup.setEndRes(res);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
}
else if (changeStartRes)
}
}
else if (changeStartRes)
@@
-1818,7
+1815,7
@@
public class SeqPanel extends JPanel implements MouseListener,
if (res < (stretchGroup.getEndRes() + 1))
{
stretchGroup.setStartRes(res);
if (res < (stretchGroup.getEndRes() + 1))
{
stretchGroup.setStartRes(res);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
}
}
}
@@
-1852,7
+1849,7
@@
public class SeqPanel extends JPanel implements MouseListener,
if (stretchGroup.getSequences(null).contains(nextSeq))
{
stretchGroup.deleteSequence(seq, false);
if (stretchGroup.getSequences(null).contains(nextSeq))
{
stretchGroup.deleteSequence(seq, false);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
else
{
}
else
{
@@
-1862,7
+1859,7
@@
public class SeqPanel extends JPanel implements MouseListener,
}
stretchGroup.addSequence(nextSeq, false);
}
stretchGroup.addSequence(nextSeq, false);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
}
}
}
@@
-2016,8
+2013,8
@@
public class SeqPanel extends JPanel implements MouseListener,
{
if (av.getAlignment() == null)
{
{
if (av.getAlignment() == null)
{
- Cache.log.warn("alignviewport av SeqSetId="
- + av.getSequenceSetId() + " ViewId=" + av.getViewId()
+ Cache.log.warn("alignviewport av SeqSetId=" + av.getSequenceSetId()
+ + " ViewId=" + av.getViewId()
+ " 's alignment is NULL! returning immediately.");
return;
}
+ " 's alignment is NULL! returning immediately.");
return;
}