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-2388 Finished split of hidden columns and selected columns
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
282e826
..
063ab7d
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-1956,8
+1956,7
@@
public class SeqPanel extends JPanel implements MouseListener,
*/
@Override
public void selection(SequenceGroup seqsel, ColumnSelection colsel,
*/
@Override
public void selection(SequenceGroup seqsel, ColumnSelection colsel,
- HiddenColumns hidden,
- SelectionSource source)
+ HiddenColumns hidden, SelectionSource source)
{
// TODO: fix this hack - source of messages is align viewport, but SeqPanel
// handles selection messages...
{
// TODO: fix this hack - source of messages is align viewport, but SeqPanel
// handles selection messages...
@@
-1982,7
+1981,7
@@
public class SeqPanel extends JPanel implements MouseListener,
* Check for selection in a view of which this one is a dna/protein
* complement.
*/
* Check for selection in a view of which this one is a dna/protein
* complement.
*/
- if (selectionFromTranslation(seqsel, colsel, source))
+ if (selectionFromTranslation(seqsel, colsel, hidden, source))
{
return;
}
{
return;
}
@@
-2077,7
+2076,8
@@
public class SeqPanel extends JPanel implements MouseListener,
* @param source
*/
protected boolean selectionFromTranslation(SequenceGroup seqsel,
* @param source
*/
protected boolean selectionFromTranslation(SequenceGroup seqsel,
- ColumnSelection colsel, SelectionSource source)
+ ColumnSelection colsel, HiddenColumns hidden,
+ SelectionSource source)
{
if (!(source instanceof AlignViewportI))
{
{
if (!(source instanceof AlignViewportI))
{
@@
-2100,9
+2100,13
@@
public class SeqPanel extends JPanel implements MouseListener,
/*
* Map column selection
*/
/*
* Map column selection
*/
- ColumnSelection cs = MappingUtils.mapColumnSelection(colsel, sourceAv,
- av);
+ // ColumnSelection cs = MappingUtils.mapColumnSelection(colsel, sourceAv,
+ // av);
+ ColumnSelection cs = new ColumnSelection();
+ HiddenColumns hs = new HiddenColumns();
+ MappingUtils.mapColumnSelection(colsel, hidden, sourceAv, av, cs, hs);
av.setColumnSelection(cs);
av.setColumnSelection(cs);
+ av.getAlignment().setHiddenColumns(hs);
PaintRefresher.Refresh(this, av.getSequenceSetId());
PaintRefresher.Refresh(this, av.getSequenceSetId());