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
Use ACCESSION_ID for database accession id, and SEQUENCE_ID for sequence
[jalview.git]
/
src
/
jalview
/
appletgui
/
SeqPanel.java
diff --git
a/src/jalview/appletgui/SeqPanel.java
b/src/jalview/appletgui/SeqPanel.java
index
02172d6
..
6ca9499
100644
(file)
--- a/
src/jalview/appletgui/SeqPanel.java
+++ b/
src/jalview/appletgui/SeqPanel.java
@@
-927,13
+927,6
@@
public class SeqPanel extends Panel implements MouseMotionListener,
*/
private boolean needOverviewUpdate; // TODO: refactor to avcontroller
*/
private boolean needOverviewUpdate; // TODO: refactor to avcontroller
- /**
- * 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
-
@Override
public void mouseDragged(MouseEvent evt)
{
@Override
public void mouseDragged(MouseEvent evt)
{
@@
-1436,12
+1429,10
@@
public class SeqPanel extends Panel implements MouseMotionListener,
&& res < stretchGroup.getEndRes())
{
av.setSelectionGroup(stretchGroup);
&& res < stretchGroup.getEndRes())
{
av.setSelectionGroup(stretchGroup);
- editingDefinedGroup = true;
}
else
{
stretchGroup = null;
}
else
{
stretchGroup = null;
- editingDefinedGroup = false;
}
}
}
}
@@
-1461,7
+1452,6
@@
public class SeqPanel extends Panel implements MouseMotionListener,
&& allGroups[i].getEndRes() >= res)
{
stretchGroup = allGroups[i];
&& allGroups[i].getEndRes() >= res)
{
stretchGroup = allGroups[i];
- editingDefinedGroup = true;
break;
}
}
break;
}
}
@@
-1517,7
+1507,6
@@
public class SeqPanel extends Panel implements MouseMotionListener,
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())
@@
-1543,7
+1532,8
@@
public class SeqPanel extends Panel implements MouseMotionListener,
// 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;
+ // here we rely on stretchGroup == av.getSelection()
+ needOverviewUpdate |= vischange && av.isSelectionDefinedGroup();
if (stretchGroup.cs != null)
{
stretchGroup.cs.alignmentChanged(stretchGroup,
if (stretchGroup.cs != null)
{
stretchGroup.cs.alignmentChanged(stretchGroup,
@@
-1562,8
+1552,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
}
PaintRefresher.Refresh(ap, av.getSequenceSetId());
ap.paintAlignment(needOverviewUpdate);
}
PaintRefresher.Refresh(ap, av.getSequenceSetId());
ap.paintAlignment(needOverviewUpdate);
- needOverviewUpdate =false;
- editingDefinedGroup = false;
+ needOverviewUpdate = false;
changeEndRes = false;
changeStartRes = false;
stretchGroup = null;
changeEndRes = false;
changeStartRes = false;
stretchGroup = null;
@@
-1618,7
+1607,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
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)
@@
-1626,7
+1615,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
if (res < (stretchGroup.getEndRes() + 1))
{
stretchGroup.setStartRes(res);
if (res < (stretchGroup.getEndRes() + 1))
{
stretchGroup.setStartRes(res);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
}
}
}
@@
-1660,7
+1649,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
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
{
@@
-1670,7
+1659,7
@@
public class SeqPanel extends Panel implements MouseMotionListener,
}
stretchGroup.addSequence(nextSeq, false);
}
stretchGroup.addSequence(nextSeq, false);
- needOverviewUpdate |= editingDefinedGroup;
+ needOverviewUpdate |= av.isSelectionDefinedGroup();
}
}
}
}