From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 24 Apr 2014 16:39:58 +0000 (+0100)
Subject: JAL-1232 fix - ensure display all columns flag is set if an RNA helix is created... 
X-Git-Tag: Jalview_2_9~195^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=781d3373ab65e86fdd2ab1566137dcc587776923;p=jalview.git

JAL-1232 fix - ensure display all columns flag is set if an RNA helix is created on an annotation row.
---

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]);