/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*/
package jalview.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.event.ActionEvent;
-import jalview.bin.*;
-import jalview.jbgui.*;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
+
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
import jalview.util.MessageManager;
/**
Font oldFont;
+ boolean oldProteinScale;
+
boolean init = true;
JInternalFrame frame;
public FontChooser(AlignmentPanel ap)
{
oldFont = ap.av.getFont();
+ oldProteinScale = ap.av.isScaleProteinAsCdna();
+
this.ap = ap;
init();
}
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);
}
for (int i = 1; i < 51; i++)
{
- fontSize.addItem(i + "");
+ fontSize.addItem(i);
}
fontStyle.addItem("plain");
fontStyle.addItem("italic");
fontName.setSelectedItem(oldFont.getName());
- fontSize.setSelectedItem(oldFont.getSize() + "");
+ fontSize.setSelectedItem(oldFont.getSize());
fontStyle.setSelectedIndex(oldFont.getStyle());
FontMetrics fm = getGraphics().getFontMetrics(oldFont);
public void smoothFont_actionPerformed(ActionEvent e)
{
ap.av.antiAlias = smoothFont.isSelected();
- ap.annotationPanel.image = null;
+ ap.getAnnotationPanel().image = null;
ap.paintAlignment(true);
}
{
if (ap != null)
{
- ap.av.setFont(oldFont);
+ ap.av.setFont(oldFont, true);
+ ap.av.setScaleProteinAsCdna(oldProteinScale);
ap.paintAlignment(true);
}
else if (tp != null)
tp.setTreeFont(oldFont);
}
fontName.setSelectedItem(oldFont.getName());
- fontSize.setSelectedItem(oldFont.getSize() + "");
+ fontSize.setSelectedItem(oldFont.getSize());
fontStyle.setSelectedIndex(oldFont.getStyle());
try
}
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();
{
fontName.setSelectedItem(lastSelected.getName());
fontStyle.setSelectedIndex(lastSelStyle);
- fontSize.setSelectedItem("" + lastSelSize);
+ fontSize.setSelectedItem(lastSelSize);
monospaced.setSelected(lastSelMono);
JOptionPane
.showInternalMessageDialog(
}
else if (ap != null)
{
- ap.av.setFont(newFont);
+ ap.av.setFont(newFont, true);
ap.fontChanged();
}
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);
+ }
}