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
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignFrame.java
diff --git
a/src/jalview/appletgui/AlignFrame.java
b/src/jalview/appletgui/AlignFrame.java
index
a14da77
..
eaf93c2
100644
(file)
--- a/
src/jalview/appletgui/AlignFrame.java
+++ b/
src/jalview/appletgui/AlignFrame.java
@@
-210,7
+210,6
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
if (hiddenSeqs != null && hiddenSeqs.length > 0)
{
viewport.hideSequence(hiddenSeqs);
if (hiddenSeqs != null && hiddenSeqs.length > 0)
{
viewport.hideSequence(hiddenSeqs);
- viewport.setHasHiddenRows(true);
}
if (columnSelection != null)
{
}
if (columnSelection != null)
{
@@
-928,7
+927,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
: showForSequences);
aa.visible = visible;
}
: showForSequences);
aa.visible = visible;
}
- alignPanel.validateAnnotationDimensions(false);
+ alignPanel.validateAnnotationDimensions(true);
}
private void setAnnotationSortOrder(SequenceAnnotationOrder order)
}
private void setAnnotationSortOrder(SequenceAnnotationOrder order)
@@
-1341,9
+1340,7
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
{ e.getActionCommand() }), 600, 500);
FeatureRenderer fr = this.alignPanel.cloneFeatureRenderer();
{ e.getActionCommand() }), 600, 500);
FeatureRenderer fr = this.alignPanel.cloneFeatureRenderer();
- viewport.setFeatureRenderer(fr);
- viewport.setIncludeHiddenRegion(false);
- cap.setText(new AppletFormatAdapter(viewport).formatSequences(
+ cap.setText(new AppletFormatAdapter(alignPanel).formatSequences(
e.getActionCommand(), viewport.getAlignment(),
viewport.getShowJVSuffix()));
}
e.getActionCommand(), viewport.getAlignment(),
viewport.getShowJVSuffix()));
}