JAL-845 fix bug in 3-to-1 scaling of protein from cDNA

[jalview.git] / src / jalview / gui / SplitFrame.java

diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java
index e441371..6042efc 100644 (file)
--- a/src/jalview/gui/SplitFrame.java
+++ b/src/jalview/gui/SplitFrame.java
@@ -1,5 +1,6 @@
 package jalview.gui;
 
+import jalview.api.SplitContainerI;
 import jalview.api.ViewStyleI;
 import jalview.datamodel.AlignmentI;
 import jalview.jbgui.GAlignFrame;
@@ -37,7 +38,7 @@ import javax.swing.event.InternalFrameEvent;
  * @author gmcarstairs
  *
  */
-public class SplitFrame extends GSplitFrame
+public class SplitFrame extends GSplitFrame implements SplitContainerI
 {
   private static final long serialVersionUID = 1L;
 
@@ -52,6 +53,14 @@ public class SplitFrame extends GSplitFrame
    */
   protected void init()
   {
+    getTopFrame().setSplitFrame(this);
+    getBottomFrame().setSplitFrame(this);
+    getTopFrame().setVisible(true);
+    getBottomFrame().setVisible(true);
+
+    ((AlignFrame) getTopFrame()).getViewport().setCodingComplement(
+            ((AlignFrame) getBottomFrame()).getViewport());
+
     setSize(AlignFrame.DEFAULT_WIDTH, Desktop.instance.getHeight() - 20);
 
     adjustLayout();
@@ -61,12 +70,28 @@ public class SplitFrame extends GSplitFrame
     addKeyListener();
 
     addKeyBindings();
+
+    addCommandListeners();
+  }
+
+  /**
+   * Set the top and bottom frames to listen to each others Commands (e.g. Edit,
+   * Order).
+   */
+  protected void addCommandListeners()
+  {
+    // TODO if CommandListener is only ever 1:1 for complementary views,
+    // may change broadcast pattern to direct messaging (more efficient)
+    final StructureSelectionManager ssm = StructureSelectionManager
+            .getStructureSelectionManager(Desktop.instance);
+    ssm.addCommandListener(((AlignFrame) getTopFrame()).getViewport());
+    ssm.addCommandListener(((AlignFrame) getBottomFrame()).getViewport());
   }
 
   /**
    * Do any tweaking and twerking of the layout wanted.
    */
-  private void adjustLayout()
+  public void adjustLayout()
   {
     /*
      * Ensure sequence ids are the same width for good alignment.
@@ -74,25 +99,36 @@ public class SplitFrame extends GSplitFrame
     int w1 = ((AlignFrame) getTopFrame()).getViewport().getIdWidth();
     int w2 = ((AlignFrame) getBottomFrame()).getViewport().getIdWidth();
     int w3 = Math.max(w1, w2);
-    ((AlignFrame) getTopFrame()).getViewport().setIdWidth(w3);
-    ((AlignFrame) getBottomFrame()).getViewport().setIdWidth(w3);
+    if (w1 != w3)
+    {
+      ((AlignFrame) getTopFrame()).getViewport().setIdWidth(w3);
+    }
+    if (w2 != w3)
+    {
+      ((AlignFrame) getBottomFrame()).getViewport().setIdWidth(w3);
+    }
 
     /*
      * Set the character width for protein to 3 times that for dna.
      */
-    final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport;
-    final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport;
-    final AlignmentI topAlignment = topViewport.getAlignment();
-    final AlignmentI bottomAlignment = bottomViewport.getAlignment();
-    AlignmentViewport cdna = topAlignment.isNucleotide() ? topViewport
-            : (bottomAlignment.isNucleotide() ? bottomViewport : null);
-    AlignmentViewport protein = !topAlignment.isNucleotide() ? topViewport
-            : (!bottomAlignment.isNucleotide() ? bottomViewport : null);
-    if (protein != null && cdna != null)
+    boolean scaleThreeToOne = true; // TODO a new Preference option?
+    if (scaleThreeToOne)
     {
-      ViewStyleI vs = cdna.getViewStyle();
-      vs.setCharWidth(3 * vs.getCharWidth());
-      protein.setViewStyle(vs);
+      final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport;
+      final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport;
+      final AlignmentI topAlignment = topViewport.getAlignment();
+      final AlignmentI bottomAlignment = bottomViewport.getAlignment();
+      AlignmentViewport cdna = topAlignment.isNucleotide() ? topViewport
+              : (bottomAlignment.isNucleotide() ? bottomViewport : null);
+      AlignmentViewport protein = !topAlignment.isNucleotide() ? topViewport
+              : (!bottomAlignment.isNucleotide() ? bottomViewport : null);
+      if (protein != null && cdna != null)
+      {
+        ViewStyleI vs = cdna.getViewStyle();
+        ViewStyleI vs2 = protein.getViewStyle();
+        vs2.setCharWidth(3 * vs.getCharWidth());
+        protein.setViewStyle(vs2);
+      }
     }
   }
 
@@ -510,4 +546,59 @@ public class SplitFrame extends GSplitFrame
   {
     Desktop.instance.gatherViews(this);
   }
+
+  /**
+   * Returns the alignment in the complementary frame to the one given.
+   */
+  @Override
+  public AlignmentI getComplement(Object alignFrame)
+  {
+    if (alignFrame == this.getTopFrame())
+    {
+      return ((AlignFrame) getBottomFrame()).viewport.getAlignment();
+    }
+    else if (alignFrame == this.getBottomFrame())
+    {
+      return ((AlignFrame) getTopFrame()).viewport.getAlignment();
+    }
+    return null;
+  }
+
+  /**
+   * Returns the title of the complementary frame to the one given.
+   */
+  @Override
+  public String getComplementTitle(Object alignFrame)
+  {
+    if (alignFrame == this.getTopFrame())
+    {
+      return ((AlignFrame) getBottomFrame()).getTitle();
+    }
+    else if (alignFrame == this.getBottomFrame())
+    {
+      return ((AlignFrame) getTopFrame()).getTitle();
+    }
+    return null;
+  }
+
+  /**
+   * Set the 'other half' to hidden / revealed.
+   */
+  @Override
+  public void setComplementVisible(Object alignFrame, boolean show)
+  {
+    /*
+     * Hiding the AlignPanel suppresses unnecessary repaints
+     */
+    if (alignFrame == getTopFrame())
+    {
+      ((AlignFrame) getBottomFrame()).alignPanel.setVisible(show);
+    }
+    else if (alignFrame == getBottomFrame())
+    {
+      ((AlignFrame) getTopFrame()).alignPanel.setVisible(show);
+    }
+    super.setComplementVisible(alignFrame, show);
+  }
 }
+