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-2423 refactored method to build panel title for tree either
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
abb8f63
..
0c470fe
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-626,9
+626,6
@@
public abstract class AlignmentViewport implements AlignViewportI,
if (cs != null)
{
if (cs != null)
{
- // if (getConservationSelected() || getAbovePIDThreshold()
- // || cs instanceof PIDColourScheme
- // || cs instanceof Blosum62ColourScheme)
if (getConservationSelected())
{
residueShading.setConservation(hconservation);
if (getConservationSelected())
{
residueShading.setConservation(hconservation);
@@
-1076,7
+1073,8
@@
public abstract class AlignmentViewport implements AlignViewportI,
}
/**
}
/**
- * Set the selection group for this window.
+ * Set the selection group for this window. Also sets the current alignment as
+ * the context for the group, if it does not already have one.
*
* @param sg
* - group holding references to sequences in this alignment view
*
* @param sg
* - group holding references to sequences in this alignment view
@@
-1086,6
+1084,10
@@
public abstract class AlignmentViewport implements AlignViewportI,
public void setSelectionGroup(SequenceGroup sg)
{
selectionGroup = sg;
public void setSelectionGroup(SequenceGroup sg)
{
selectionGroup = sg;
+ if (sg != null && sg.getContext() == null)
+ {
+ sg.setContext(alignment);
+ }
}
public void setHiddenColumns(ColumnSelection colsel)
}
public void setHiddenColumns(ColumnSelection colsel)
@@
-2428,6
+2430,11
@@
public abstract class AlignmentViewport implements AlignViewportI,
public void setViewStyle(ViewStyleI settingsForView)
{
viewStyle = new ViewStyle(settingsForView);
public void setViewStyle(ViewStyleI settingsForView)
{
viewStyle = new ViewStyle(settingsForView);
+ if (residueShading != null)
+ {
+ residueShading.setConservationApplied(settingsForView
+ .isConservationColourSelected());
+ }
}
@Override
}
@Override