From 3b20f512421e707431c326189dbf7d8755968baa Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 29 Jan 2007 11:33:02 +0000 Subject: [PATCH] ID_ITALICS option in preferences --- src/jalview/gui/AlignViewport.java | 3 +++ src/jalview/gui/AlignmentPanel.java | 14 ++++++-------- src/jalview/gui/IdCanvas.java | 14 ++++++++------ src/jalview/gui/Preferences.java | 4 ++++ src/jalview/jbgui/GPreferences.java | 32 +++++++++++++++++++------------- 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 8b929c7..6c8e0e4 100755 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -61,6 +61,7 @@ public class AlignViewport boolean validCharWidth; int wrappedWidth; Font font; + boolean seqNameItalics; AlignmentI alignment; ColumnSelection colSel = new ColumnSelection(); int threshold; @@ -170,6 +171,8 @@ public class AlignViewport String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ; String fontSize = Cache.getDefault("FONT_SIZE", "10"); + seqNameItalics = Cache.getDefault("ID_ITALICS", true); + int style = 0; if (fontStyle.equals("bold")) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 4047ac8..4a21781 100755 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -711,9 +711,8 @@ public class AlignmentPanel extends GAlignmentPanel Color currentColor = null; Color currentTextColor = null; - pg.setFont(new Font(av.getFont().getName(), - Font.ITALIC, - av.getFont().getSize())); + pg.setFont(idPanel.idCanvas.idfont); + SequenceI seq; for (int i = startSeq; i < endSeq; i++) { @@ -827,20 +826,20 @@ public class AlignmentPanel extends GAlignmentPanel pg.setClip(0, pi * pheight, pwidth, pheight); int ypos = hgap; - Font italic = new Font(av.getFont().getName(), Font.ITALIC, - av.getFont().getSize()); - pg.setFont(italic); + + do { for (int i = 0; i < av.alignment.getHeight(); i++) { + pg.setFont(idPanel.idCanvas.idfont); SequenceI s = av.alignment.getSequenceAt(i); String string = s.getDisplayId( av.getShowJVSuffix()); int xPos = 0; if (av.rightAlignIds) { - FontMetrics fm = getFontMetrics(italic); + FontMetrics fm = getFontMetrics(idPanel.idCanvas.idfont); xPos = idWidth - fm.stringWidth( string ) - 4; } pg.drawString(string, xPos, @@ -855,7 +854,6 @@ public class AlignmentPanel extends GAlignmentPanel pg.setFont(av.getFont()); labels.drawComponent(pg, idWidth); - pg.setFont(italic); pg.translate(+3, -ypos - (av.getAlignment().getHeight() * av.charHeight)); diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 168b50d..71cc483 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -46,6 +46,7 @@ public class IdCanvas extends JPanel FontMetrics fm; AnnotationLabels labels = null; AnnotationPanel ap; + Font idfont; /** * Creates a new IdCanvas object. @@ -219,10 +220,13 @@ public class IdCanvas extends JPanel */ void drawIds(int starty, int endy) { - Font italic = new Font(av.getFont().getName(), Font.ITALIC, + if(av.seqNameItalics) + idfont = new Font(av.getFont().getName(), Font.ITALIC, av.getFont().getSize()); + else + idfont = av.getFont(); - gg.setFont(italic); + gg.setFont(idfont); fm = gg.getFontMetrics(); if (av.antiAlias) @@ -277,7 +281,7 @@ public class IdCanvas extends JPanel setHiddenFont(s); } else - gg.setFont(italic); + gg.setFont(idfont); drawIdString(gg, s, i, 0, ypos); } @@ -421,8 +425,6 @@ public class IdCanvas extends JPanel void setHiddenFont(SequenceI seq) { - Font italic = new Font(av.getFont().getName(), Font.ITALIC, - av.getFont().getSize()); Font bold = new Font(av.getFont().getName(), Font.BOLD, av.getFont().getSize()); @@ -431,7 +433,7 @@ public class IdCanvas extends JPanel av.hiddenRepSequences.containsKey(seq)) gg.setFont(bold); else - gg.setFont(italic); + gg.setFont(idfont); } /** diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 840598b..b58c72d 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -136,6 +136,8 @@ public class Preferences extends GPreferences smoothFont.setSelected(Cache.getDefault("ANTI_ALIAS", false)); + idItalics.setSelected(Cache.getDefault("ID_ITALICS", true)); + wrap.setSelected(Cache.getDefault("WRAP_ALIGNMENT", false)); gapSymbolCB.addItem("-"); @@ -227,6 +229,8 @@ public class Preferences extends GPreferences Cache.applicationProperties.setProperty("FONT_STYLE", fontStyleCB.getSelectedItem().toString()); Cache.applicationProperties.setProperty("FONT_SIZE", fontSizeCB.getSelectedItem().toString()); + Cache.applicationProperties.setProperty("ID_ITALICS", Boolean.toString(idItalics.isSelected())); + Cache.applicationProperties.setProperty("ANTI_ALIAS", Boolean.toString(smoothFont.isSelected())); Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", Boolean.toString(wrap.isSelected())); diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index bc4a37b..2b194bf 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -114,6 +114,7 @@ public class GPreferences extends JPanel BorderLayout borderLayout4 = new BorderLayout(); protected JCheckBox wrap = new JCheckBox(); protected JCheckBox rightAlign = new JCheckBox(); + protected JCheckBox idItalics = new JCheckBox(); /** * Creates a new GPreferences object. */ @@ -193,7 +194,7 @@ public class GPreferences extends JPanel gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); gapLabel.setText("Gap Symbol "); colour.setFont(verdana11); - colour.setBounds(new Rectangle(172, 203, 155, 21)); + colour.setBounds(new Rectangle(172, 225, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); colourLabel.setText("Colour "); @@ -207,14 +208,14 @@ public class GPreferences extends JPanel fontNameCB.setFont(verdana11); fontNameCB.setBounds(new Rectangle(172, 111, 147, 21)); gapSymbolCB.setFont(verdana11); - gapSymbolCB.setBounds(new Rectangle(172, 179, 69, 21)); + gapSymbolCB.setBounds(new Rectangle(172, 204, 69, 21)); startupCheckbox.setText("Open file"); startupCheckbox.setFont(verdana11); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT); startupCheckbox.setSelected(true); startupFileTextfield.setFont(verdana11); - startupFileTextfield.setBounds(new Rectangle(172, 249, 270, 20)); + startupFileTextfield.setBounds(new Rectangle(172, 273, 270, 20)); startupFileTextfield.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) @@ -312,14 +313,14 @@ public class GPreferences extends JPanel jPanel1.setBorder(titledBorder1); jPanel1.setLayout(gridBagLayout1); sortby.setFont(verdana11); - sortby.setBounds(new Rectangle(172, 225, 155, 21)); + sortby.setBounds(new Rectangle(172, 249, 155, 21)); sortLabel.setFont(verdana11); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); sortLabel.setText("Sort by "); - jPanel2.setBounds(new Rectangle(7, 17, 158, 257)); + jPanel2.setBounds(new Rectangle(7, 17, 158, 278)); jPanel2.setLayout(gridLayout2); - gridLayout2.setRows(11); - jPanel3.setBounds(new Rectangle(169, 39, 274, 26)); + gridLayout2.setRows(12); + jPanel3.setBounds(new Rectangle(173, 35, 274, 26)); exportTab.setLayout(null); epsLabel.setFont(verdana11); epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); @@ -385,26 +386,30 @@ public class GPreferences extends JPanel rightAlign.setHorizontalAlignment(SwingConstants.RIGHT); rightAlign.setHorizontalTextPosition(SwingConstants.LEFT); rightAlign.setText("Right Align Ids"); + idItalics.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + idItalics.setHorizontalAlignment(SwingConstants.RIGHT); + idItalics.setHorizontalTextPosition(SwingConstants.LEADING); + idItalics.setText("Sequence Name Italics"); jPanel2.add(fullScreen); - jPanel2.add(annotations); jPanel2.add(seqLimit); jPanel2.add(rightAlign); jPanel2.add(fontLabel); + jPanel2.add(idItalics); jPanel2.add(smoothFont); jPanel2.add(wrap); jPanel2.add(gapLabel); jPanel2.add(colourLabel); jPanel2.add(sortLabel); jPanel2.add(startupCheckbox); - visualTab.add(fontNameCB); - visualTab.add(fontSizeCB); - visualTab.add(fontStyleCB); visualTab.add(startupFileTextfield); - visualTab.add(gapSymbolCB); - visualTab.add(colour); visualTab.add(sortby); + visualTab.add(colour); + visualTab.add(gapSymbolCB); visualTab.add(jPanel3); + visualTab.add(fontNameCB); + visualTab.add(fontSizeCB); + visualTab.add(fontStyleCB); jPanel3.add(conservation); jPanel3.add(identity); jPanel3.add(quality); @@ -543,4 +548,5 @@ public class GPreferences extends JPanel proxyServerTB.setEnabled(useProxy.isSelected()); proxyPortTB.setEnabled(useProxy.isSelected()); } + } -- 1.7.10.2