From: Jim Procter Date: Sun, 23 Jun 2013 18:05:42 +0000 (+0100) Subject: JAL-1230 update alignment state for annotation edits, and validate annotation panel... X-Git-Tag: Jalview_2_9~230^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=11528cae3c2e759a2a55ae1f9e748b13b32f4f75;hp=6b2f5111b04caf7ee23fad5312187b1783c26b7d;p=jalview.git JAL-1230 update alignment state for annotation edits, and validate annotation panel height to ensure any autocalculated annotation is made visible --- diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java index f63cb76..154652d 100755 --- a/src/jalview/appletgui/AnnotationPanel.java +++ b/src/jalview/appletgui/AnnotationPanel.java @@ -253,10 +253,10 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, } } - aa[activeRow].validateRangeAndDisplay(); + av.getAlignment().validateAnnotation(aa[activeRow]); - adjustPanelHeight(); ap.alignmentChanged(); + adjustPanelHeight(); repaint(); return; diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 169bff1..ed899b1 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -376,10 +376,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, anot[index].displayCharacter = label; } } - aa[activeRow].validateRangeAndDisplay(); - - adjustPanelHeight(); + av.getAlignment().validateAnnotation(aa[activeRow]); ap.alignmentChanged(); + + adjustPanelHeight(); repaint(); return;