JAL-1690 'scale protein as cDNA' options in Preferences, FontChooser

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

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index fc66965..72b7bd6 100755 (executable)
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -20,10 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.bin.Cache;
-import jalview.jbgui.GFontChooser;
-import jalview.util.MessageManager;
-
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
@@ -32,6 +28,10 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
 import javax.swing.JOptionPane;
 
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
+import jalview.util.MessageManager;
+
 /**
  * DOCUMENT ME!
  * 
@@ -46,6 +46,8 @@ public class FontChooser extends GFontChooser
 
   Font oldFont;
 
+  boolean oldProteinScale;
+
   boolean init = true;
 
   JInternalFrame frame;
@@ -75,6 +77,8 @@ public class FontChooser extends GFontChooser
   public FontChooser(AlignmentPanel ap)
   {
     oldFont = ap.av.getFont();
+    oldProteinScale = ap.av.isScaleProteinAsCdna();
+
     this.ap = ap;
     init();
   }
@@ -86,16 +90,27 @@ public class FontChooser extends GFontChooser
 
     smoothFont.setSelected(ap.av.antiAlias);
 
+    /*
+     * Enable 'scale protein as cDNA' in protein half of a SplitFrame view. The
+     * selection is stored in the ViewStyle of the Viewport
+     */
+    if (ap.av.getCodingComplement() != null
+            && !ap.av.getAlignment().isNucleotide())
+    {
+      scaleAsCdna.setVisible(true);
+      scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
+    }
+
     if (tp != null)
     {
       Desktop.addInternalFrame(frame,
               MessageManager.getString("action.change_font_tree_panel"),
-              340, 170, false);
+              400, 200, false);
     }
     else
     {
       Desktop.addInternalFrame(frame,
-              MessageManager.getString("action.change_font"), 340, 170,
+              MessageManager.getString("action.change_font"), 380, 200,
               false);
     }
 
@@ -111,7 +126,7 @@ public class FontChooser extends GFontChooser
 
     for (int i = 1; i < 51; i++)
     {
-      fontSize.addItem(i + "");
+      fontSize.addItem(i);
     }
 
     fontStyle.addItem("plain");
@@ -119,7 +134,7 @@ public class FontChooser extends GFontChooser
     fontStyle.addItem("italic");
 
     fontName.setSelectedItem(oldFont.getName());
-    fontSize.setSelectedItem(oldFont.getSize() + "");
+    fontSize.setSelectedItem(oldFont.getSize());
     fontStyle.setSelectedIndex(oldFont.getStyle());
 
     FontMetrics fm = getGraphics().getFontMetrics(oldFont);
@@ -172,6 +187,7 @@ public class FontChooser extends GFontChooser
     if (ap != null)
     {
       ap.av.setFont(oldFont, true);
+      ap.av.setScaleProteinAsCdna(oldProteinScale);
       ap.paintAlignment(true);
     }
     else if (tp != null)
@@ -179,7 +195,7 @@ public class FontChooser extends GFontChooser
       tp.setTreeFont(oldFont);
     }
     fontName.setSelectedItem(oldFont.getName());
-    fontSize.setSelectedItem(oldFont.getSize() + "");
+    fontSize.setSelectedItem(oldFont.getSize());
     fontStyle.setSelectedIndex(oldFont.getStyle());
 
     try
@@ -216,8 +232,8 @@ public class FontChooser extends GFontChooser
     }
 
     Font newFont = new Font(fontName.getSelectedItem().toString(),
-            fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
-                    .getSelectedItem().toString()));
+            fontStyle.getSelectedIndex(),
+            (Integer) fontSize.getSelectedItem());
     FontMetrics fm = getGraphics().getFontMetrics(newFont);
     double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
             .getStringBounds("I", getGraphics()).getWidth();
@@ -225,7 +241,7 @@ public class FontChooser extends GFontChooser
     {
       fontName.setSelectedItem(lastSelected.getName());
       fontStyle.setSelectedIndex(lastSelStyle);
-      fontSize.setSelectedItem("" + lastSelSize);
+      fontSize.setSelectedItem(lastSelSize);
       monospaced.setSelected(lastSelMono);
       JOptionPane
               .showInternalMessageDialog(
@@ -311,4 +327,16 @@ public class FontChooser extends GFontChooser
     Cache.setProperty("ANTI_ALIAS",
             Boolean.toString(smoothFont.isSelected()));
   }
+
+  /**
+   * Turn on/off scaling of protein characters to 3 times the width of cDNA
+   * characters
+   */
+  @Override
+  protected void scaleAsCdna_actionPerformed(ActionEvent e)
+  {
+    ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected());
+    ((SplitFrame) ap.alignFrame.getSplitViewContainer()).adjustLayout();
+    ap.paintAlignment(true);
+  }
 }