From 781d3373ab65e86fdd2ab1566137dcc587776923 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 24 Apr 2014 17:39:58 +0100 Subject: [PATCH] JAL-1232 fix - ensure display all columns flag is set if an RNA helix is created on an annotation row. --- src/jalview/appletgui/AnnotationPanel.java | 4 ++++ src/jalview/gui/AnnotationPanel.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java index f33f627..250d222 100755 --- a/src/jalview/appletgui/AnnotationPanel.java +++ b/src/jalview/appletgui/AnnotationPanel.java @@ -236,6 +236,10 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, if ((label.length() > 0) && !aa[activeRow].hasText) { aa[activeRow].hasText = true; + if (evt.getActionCommand().equals(STEM)) + { + aa[activeRow].showAllColLabels=true; + } } for (int i = 0; i < av.getColumnSelection().size(); i++) diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index e587586..3e9b38e 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -361,8 +361,11 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, if ((label.length() > 0) && !aa[activeRow].hasText) { aa[activeRow].hasText = true; + if (evt.getActionCommand().equals(STEM)) + { + aa[activeRow].showAllColLabels=true; + } } - for (int i = 0; i < av.getColumnSelection().size(); i++) { int index = av.getColumnSelection().columnAt(i); @@ -377,6 +380,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, anot[index].secondaryStructure = type; anot[index].displayCharacter = label; + } } av.getAlignment().validateAnnotation(aa[activeRow]); -- 1.7.10.2