X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=92cc4c61529d81f2ad1c691d37d1347e058dfb4e;hb=7e82e1fed011077e5cd4cc40ac8ad3519d7c47a8;hp=381fbe36f50b4532537f097b388a1cd0eba73170;hpb=af4672ad3ed5b549ac78488e4e0aa9d2cde04ce9;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 381fbe3..92cc4c6 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -20,17 +20,16 @@ */ 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; +import java.awt.geom.Rectangle2D; 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! @@ -44,42 +43,69 @@ public class FontChooser extends GFontChooser TreePanel tp; + /* + * The font on opening the dialog (to be restored on Cancel) + */ 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; + /* + * The last font settings selected in the dialog + */ + private Font lastSelected = null; + + 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.getTreeCanvas().getAssociatedPanel(); + 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(); } @@ -92,17 +118,23 @@ public class FontChooser extends GFontChooser /* * Enable 'scale protein as cDNA' in a SplitFrame view. The selection is - * stored in the ViewStyle of both dna and protein Viewport + * stored in the ViewStyle of both dna and protein Viewport. Also enable + * checkbox for copy font changes to other half of split frame. */ - scaleAsCdna.setEnabled(false); - if (ap.av.getCodingComplement() != null) + boolean inSplitFrame = ap.av.getCodingComplement() != null; + if (inSplitFrame) { - scaleAsCdna.setEnabled(true); + 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(ap.av.isProteinFontAsCdna()); } - if (tp != null) + if (isTreeFont()) { Desktop.addInternalFrame(frame, MessageManager.getString("action.change_font_tree_panel"), @@ -111,7 +143,7 @@ public class FontChooser extends GFontChooser else { Desktop.addInternalFrame(frame, - MessageManager.getString("action.change_font"), 380, 200, + MessageManager.getString("action.change_font"), 380, 220, false); } @@ -139,18 +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; } - public void smoothFont_actionPerformed(ActionEvent e) + @Override + 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(); + } + } /** @@ -159,7 +201,8 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ - protected void ok_actionPerformed(ActionEvent e) + @Override + protected void ok_actionPerformed() { try { @@ -183,26 +226,34 @@ public class FontChooser extends GFontChooser * @param e * DOCUMENT ME! */ - protected void cancel_actionPerformed(ActionEvent e) + @Override + protected void cancel_actionPerformed() { - if (ap != null) + if (isTreeFont()) + { + tp.setTreeFont(oldFont); + } + else if (ap != null) { ap.av.setFont(oldFont, true); ap.av.setScaleProteinAsCdna(oldProteinScale); - ap.paintAlignment(true); - if (scaleAsCdna.isEnabled()) + ap.av.setProteinFontAsCdna(oldMirrorFont); + ap.av.antiAlias = oldSmoothFont; + ap.fontChanged(); + + if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled()) { - ap.av.setScaleProteinAsCdna(oldProteinScale); ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale); + 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 { @@ -212,13 +263,10 @@ public class FontChooser extends GFontChooser } } - private Font lastSelected = null; - - private int lastSelStyle = 0; - - private int lastSelSize = 0; - - private boolean lastSelMono = false; + private boolean isTreeFont() + { + return tp != null; + } /** * DOCUMENT ME! @@ -229,38 +277,52 @@ public class FontChooser extends GFontChooser { // initialise with original font lastSelected = oldFont; - lastSelSize = oldFont.getSize(); - lastSelStyle = oldFont.getStyle(); FontMetrics fm = getGraphics().getFontMetrics(oldFont); - double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm - .getStringBounds("I", getGraphics()).getWidth(); - lastSelMono = mw == iw; + double mw = fm.getStringBounds("M", getGraphics()).getWidth(); + double iw = fm.getStringBounds("I", getGraphics()).getWidth(); + lastSelMono = (mw == iw); // == on double - flaky? } Font newFont = new Font(fontName.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(); + double mw = fm.getStringBounds("M", getGraphics()).getWidth(); + final Rectangle2D iBounds = fm.getStringBounds("I", getGraphics()); + double iw = iBounds.getWidth(); if (mw < 1 || iw < 1) { - JOptionPane - .showInternalMessageDialog( - this, - MessageManager.getString("label.font_doesnt_have_letters_defined"), - MessageManager.getString("label.invalid_font"), JOptionPane.WARNING_MESSAGE); + 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"), + JvOptionPane.WARNING_MESSAGE); /* - * Restore previous values - size first to avoid recursive calls to this - * point! + * Restore the changed value - note this will reinvoke this method via the + * ActionListener, but now validation should pass */ - fontSize.setSelectedItem(lastSelSize); - fontName.setSelectedItem(lastSelected.getName()); - fontStyle.setSelectedIndex(lastSelStyle); - monospaced.setSelected(lastSelMono); + if (lastSelected.getSize() != (Integer) fontSize.getSelectedItem()) // autoboxing + { + fontSize.setSelectedItem(lastSelected.getSize()); + } + if (!lastSelected.getName() + .equals(fontName.getSelectedItem().toString())) + { + fontName.setSelectedItem(lastSelected.getName()); + } + if (lastSelected.getStyle() != fontStyle.getSelectedIndex()) + { + fontStyle.setSelectedIndex(lastSelected.getStyle()); + } + if (lastSelMono != monospaced.isSelected()) + { + monospaced.setSelected(lastSelMono); + } return; } - if (tp != null) + if (isTreeFont()) { tp.setTreeFont(newFont); } @@ -268,20 +330,40 @@ public class FontChooser extends GFontChooser { ap.av.setFont(newFont, true); ap.fontChanged(); + + /* + * 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.isVisible()) + { + if (fontAsCdna.isSelected()) + { + ap.av.getCodingComplement().setFont(newFont, true); + } + + SplitFrame splitFrame = (SplitFrame) ap.alignFrame + .getSplitViewContainer(); + splitFrame.adjustLayout(); + splitFrame.repaint(); + } } monospaced.setSelected(mw == iw); - // remember last selected + + /* + * Remember latest valid selection, so it can be restored if followed by an + * invalid one + */ lastSelected = newFont; } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font name */ - protected void fontName_actionPerformed(ActionEvent e) + @Override + protected void fontName_actionPerformed() { if (init) { @@ -292,12 +374,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font size */ - protected void fontSize_actionPerformed(ActionEvent e) + @Override + protected void fontSize_actionPerformed() { if (init) { @@ -308,12 +388,10 @@ public class FontChooser extends GFontChooser } /** - * DOCUMENT ME! - * - * @param e - * DOCUMENT ME! + * Updates on change of selected font style */ - protected void fontStyle_actionPerformed(ActionEvent e) + @Override + protected void fontStyle_actionPerformed() { if (init) { @@ -326,10 +404,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 */ - public void defaultButton_actionPerformed(ActionEvent e) + @Override + public void defaultButton_actionPerformed() { Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString()); Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex() + ""); @@ -345,16 +422,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(); - // ap.paintAlignment(true); - // TODO would like to 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(); } }