X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=80ac189eaf1f0c4263b427e11223feea1b8ea5bf;hb=106a3890f956e2aa7780b2985f4326655912a558;hp=b03d7a5e40d2e9662d2d09daf63763577ba2a413;hpb=4772c2b206c62f3e26e66cca8396ba031ff48b3e;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index b03d7a5..80ac189 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -26,7 +26,6 @@ import jalview.util.MessageManager; import java.awt.Font; import java.awt.FontMetrics; -import java.awt.event.ActionEvent; import java.awt.geom.Rectangle2D; import javax.swing.JInternalFrame; @@ -49,8 +48,22 @@ public class FontChooser extends GFontChooser */ Font oldFont; + /* + * The font on opening the dialog (to be restored on Cancel) + * on the other half of a split frame (if applicable) + */ + Font oldComplementFont; + + /* + * the state of 'scale protein as cDNA' on opening the dialog + */ boolean oldProteinScale; + /* + * the state of 'same font for protein and cDNA' on opening the dialog + */ + boolean oldMirrorFont; + boolean init = true; JInternalFrame frame; @@ -62,34 +75,37 @@ public class FontChooser extends GFontChooser private boolean lastSelMono = false; + private boolean oldSmoothFont; + + private boolean oldComplementSmooth; + /** - * Creates a new FontChooser object. + * Creates a new FontChooser for a tree panel * - * @param ap - * DOCUMENT ME! + * @param treePanel */ - public FontChooser(TreePanel tp) + public FontChooser(TreePanel treePanel) { - this.tp = tp; - ap = tp.treeCanvas.ap; - oldFont = tp.getTreeFont(); + this.tp = treePanel; + ap = treePanel.treeCanvas.ap; + oldFont = treePanel.getTreeFont(); defaultButton.setVisible(false); smoothFont.setEnabled(false); init(); } /** - * Creates a new FontChooser object. + * Creates a new FontChooser for an alignment panel * - * @param ap - * DOCUMENT ME! + * @param alignPanel */ - public FontChooser(AlignmentPanel ap) + public FontChooser(AlignmentPanel alignPanel) { - oldFont = ap.av.getFont(); - oldProteinScale = ap.av.isScaleProteinAsCdna(); - - this.ap = ap; + oldFont = alignPanel.av.getFont(); + oldProteinScale = alignPanel.av.isScaleProteinAsCdna(); + oldMirrorFont = alignPanel.av.isProteinFontAsCdna(); + oldSmoothFont = alignPanel.av.antiAlias; + this.ap = alignPanel; init(); } @@ -108,10 +124,14 @@ public class FontChooser extends GFontChooser boolean inSplitFrame = ap.av.getCodingComplement() != null; if (inSplitFrame) { + oldComplementFont = ((AlignViewport) ap.av.getCodingComplement()) + .getFont(); + oldComplementSmooth = ((AlignViewport) ap.av + .getCodingComplement()).antiAlias; scaleAsCdna.setVisible(true); scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna()); fontAsCdna.setVisible(true); - fontAsCdna.setSelected(true); + fontAsCdna.setSelected(ap.av.isProteinFontAsCdna()); } if (tp != null) @@ -151,19 +171,28 @@ public class FontChooser extends GFontChooser fontStyle.setSelectedIndex(oldFont.getStyle()); FontMetrics fm = getGraphics().getFontMetrics(oldFont); - monospaced.setSelected(fm.getStringBounds("M", getGraphics()) - .getWidth() == fm.getStringBounds("|", getGraphics()) - .getWidth()); + monospaced.setSelected( + fm.getStringBounds("M", getGraphics()).getWidth() == fm + .getStringBounds("|", getGraphics()).getWidth()); init = false; } @Override - public void smoothFont_actionPerformed(ActionEvent e) + protected void smoothFont_actionPerformed() { ap.av.antiAlias = smoothFont.isSelected(); ap.getAnnotationPanel().image = null; - ap.paintAlignment(true); + ap.paintAlignment(true, false); + if (ap.av.getCodingComplement() != null && ap.av.isProteinFontAsCdna()) + { + ((AlignViewport) ap.av + .getCodingComplement()).antiAlias = ap.av.antiAlias; + SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer(); + sv.adjustLayout(); + sv.repaint(); + } + } /** @@ -173,7 +202,7 @@ public class FontChooser extends GFontChooser * DOCUMENT ME! */ @Override - protected void ok_actionPerformed(ActionEvent e) + protected void ok_actionPerformed() { try { @@ -198,26 +227,33 @@ public class FontChooser extends GFontChooser * DOCUMENT ME! */ @Override - protected void cancel_actionPerformed(ActionEvent e) + protected void cancel_actionPerformed() { if (ap != null) { ap.av.setFont(oldFont, true); ap.av.setScaleProteinAsCdna(oldProteinScale); - ap.paintAlignment(true); + ap.av.setProteinFontAsCdna(oldMirrorFont); + ap.av.antiAlias = oldSmoothFont; + ap.paintAlignment(true, false); + if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled()) { ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale); - ap.av.getCodingComplement().setFont(oldFont, true); + ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont); + ((AlignViewport) ap.av + .getCodingComplement()).antiAlias = oldComplementSmooth; + ap.av.getCodingComplement().setFont(oldComplementFont, true); + SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); } } else if (tp != null) { tp.setTreeFont(oldFont); } - fontName.setSelectedItem(oldFont.getName()); - fontSize.setSelectedItem(oldFont.getSize()); - fontStyle.setSelectedIndex(oldFont.getStyle()); try { @@ -251,8 +287,9 @@ public class FontChooser extends GFontChooser double iw = iBounds.getWidth(); if (mw < 1 || iw < 1) { - String message = iBounds.getHeight() < 1 ? MessageManager - .getString("label.font_doesnt_have_letters_defined") + String message = iBounds.getHeight() < 1 + ? MessageManager + .getString("label.font_doesnt_have_letters_defined") : MessageManager.getString("label.font_too_small"); JvOptionPane.showInternalMessageDialog(this, message, MessageManager.getString("label.invalid_font"), @@ -265,8 +302,8 @@ public class FontChooser extends GFontChooser { fontSize.setSelectedItem(lastSelected.getSize()); } - if (!lastSelected.getName().equals( - fontName.getSelectedItem().toString())) + if (!lastSelected.getName() + .equals(fontName.getSelectedItem().toString())) { fontName.setSelectedItem(lastSelected.getName()); } @@ -290,13 +327,20 @@ public class FontChooser extends GFontChooser ap.fontChanged(); /* - * and change font in other half of split frame if any + * adjust other half of split frame if present, whether or not same font or + * scale to cDNA is selected, because a font change may affect character + * width, and this is kept the same in both panels */ - if (fontAsCdna.isEnabled() && fontAsCdna.isSelected()) + if (fontAsCdna.isVisible()) { - ap.av.getCodingComplement().setFont(newFont, true); + if (fontAsCdna.isSelected()) + { + ap.av.getCodingComplement().setFont(newFont, true); + } + SplitFrame splitFrame = (SplitFrame) ap.alignFrame .getSplitViewContainer(); + splitFrame.adjustLayout(); splitFrame.repaint(); } } @@ -311,13 +355,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font name */ @Override - protected void fontName_actionPerformed(ActionEvent e) + protected void fontName_actionPerformed() { if (init) { @@ -328,13 +369,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font size */ @Override - protected void fontSize_actionPerformed(ActionEvent e) + protected void fontSize_actionPerformed() { if (init) { @@ -345,13 +383,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font style */ @Override - protected void fontStyle_actionPerformed(ActionEvent e) + protected void fontStyle_actionPerformed() { if (init) { @@ -364,11 +399,9 @@ public class FontChooser extends GFontChooser /** * Make selected settings the defaults by storing them (via Cache class) in * the .jalview_properties file (the file is only written when Jalview exits) - * - * @param e */ @Override - public void defaultButton_actionPerformed(ActionEvent e) + public void defaultButton_actionPerformed() { Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString()); Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex() + ""); @@ -384,14 +417,37 @@ public class FontChooser extends GFontChooser * characters */ @Override - protected void scaleAsCdna_actionPerformed(ActionEvent e) + protected void scaleAsCdna_actionPerformed() { ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected()); - ap.av.getCodingComplement().setScaleProteinAsCdna( - scaleAsCdna.isSelected()); + ap.av.getCodingComplement() + .setScaleProteinAsCdna(scaleAsCdna.isSelected()); final SplitFrame splitFrame = (SplitFrame) ap.alignFrame .getSplitViewContainer(); splitFrame.adjustLayout(); splitFrame.repaint(); } + + /** + * Turn on/off mirroring of font across split frame. If turning on, also + * copies the current font across the split frame. If turning off, restores + * the other half of the split frame to its initial font. + */ + @Override + protected void mirrorFonts_actionPerformed() + { + boolean selected = fontAsCdna.isSelected(); + ap.av.setProteinFontAsCdna(selected); + ap.av.getCodingComplement().setProteinFontAsCdna(selected); + + /* + * reset other half of split frame if turning option off + */ + if (!selected) + { + ap.av.getCodingComplement().setFont(oldComplementFont, true); + } + + changeFont(); + } }