From 4fe5e959d104419f1f313f493e00d683b6b5cd0a Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 17 Aug 2005 09:10:06 +0000 Subject: [PATCH] User colours have scheme name --- src/jalview/gui/UserDefinedColours.java | 199 +++++++++++++++++++--------- src/jalview/jbgui/GUserDefinedColours.java | 88 +++++++++--- 2 files changed, 211 insertions(+), 76 deletions(-) diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java index 4ad129b..0477391 100755 --- a/src/jalview/gui/UserDefinedColours.java +++ b/src/jalview/gui/UserDefinedColours.java @@ -37,6 +37,7 @@ import javax.swing.*; import javax.swing.event.*; + /** * DOCUMENT ME! * @@ -49,7 +50,6 @@ public class UserDefinedColours extends GUserDefinedColours AlignmentPanel ap; SequenceGroup seqGroup; Vector selectedButtons; - Vector oldColours = new Vector(); ColourSchemeI oldColourScheme; JInternalFrame frame; @@ -64,7 +64,7 @@ public class UserDefinedColours extends GUserDefinedColours super(); frame = new JInternalFrame(); frame.setContentPane(this); - Desktop.addInternalFrame(frame, "User Defined Colours", 450, 530, false); + Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true); if (System.getProperty("os.name").startsWith("Mac")) { @@ -90,6 +90,10 @@ public class UserDefinedColours extends GUserDefinedColours oldColourScheme = ap.av.getGlobalColourScheme(); } + if (oldColourScheme instanceof UserColourScheme) + { + schemeName.setText( ( (UserColourScheme) oldColourScheme).getName()); + } for (int i = 0; i < 20; i++) { makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) + @@ -99,12 +103,7 @@ public class UserDefinedColours extends GUserDefinedColours makeButton("B", "B"); makeButton("Z", "Z"); makeButton("X", "X"); - makeButton("Gap", "'.','-',' '"); - - if (jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR") != null) - { - loadColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")); - } + makeButton("Gap", "-"); } /** @@ -215,10 +214,10 @@ public class UserDefinedColours extends GUserDefinedColours } catch (Exception ex) { + // ex.printStackTrace(); } button.setBackground(col); - oldColours.addElement(col); button.setText(label); button.setForeground(col.darker().darker().darker()); button.setFont(new java.awt.Font("Verdana", 1, 10)); @@ -258,16 +257,8 @@ public class UserDefinedColours extends GUserDefinedColours */ protected void applyButton_actionPerformed(ActionEvent e) { - Color[] newColours = new Color[24]; - - for (int i = 0; i < 24; i++) - { - JButton button = (JButton) buttonPanel.getComponent(i); - newColours[i] = button.getBackground(); - } - - UserColourScheme ucs = new UserColourScheme(newColours); - ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); + UserColourScheme ucs = getSchemeFromGUI(); + ucs.setName(schemeName.getText()); if (seqGroup != null) { @@ -280,6 +271,24 @@ public class UserDefinedColours extends GUserDefinedColours } } + UserColourScheme getSchemeFromGUI() + { + Color[] newColours = new Color[24]; + + for (int i = 0; i < 24; i++) + { + JButton button = (JButton) buttonPanel.getComponent(i); + newColours[i] = button.getBackground(); + } + + UserColourScheme ucs = new UserColourScheme(newColours); + ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus()); + + return ucs; + } + + + /** * DOCUMENT ME! * @@ -300,10 +309,17 @@ public class UserDefinedColours extends GUserDefinedColours { File choice = chooser.getSelectedFile(); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); - jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", + String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS", choice.getPath()); + if (defaultColours.indexOf(choice.getPath()) == -1) + defaultColours = defaultColours.concat("|").concat(choice.getPath()); + + jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours); + - Color[] colors = loadColours(choice.getAbsolutePath()); + UserColourScheme ucs = loadColours(choice.getAbsolutePath()); + Color[] colors = ucs.getColours(); + schemeName.setText(ucs.getName()); for (int i = 0; i < colors.length; i++) { @@ -320,10 +336,13 @@ public class UserDefinedColours extends GUserDefinedColours */ public static UserColourScheme loadDefaultColours() { - if (jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR") != null) + String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"); + if ( colours != null) { - return loadDefaultColours(jalview.bin.Cache.getProperty( - "USER_DEFINED_COLOUR")); + if(colours.indexOf("|")>-1) + colours = colours.substring(0, colours.indexOf("|")); + + return loadColours(colours); } else { @@ -338,45 +357,40 @@ public class UserDefinedColours extends GUserDefinedColours * * @return DOCUMENT ME! */ - public static UserColourScheme loadDefaultColours(String file) + public static UserColourScheme loadColours(String file) { - UserColourScheme ucs = null; - Color[] cols = loadColours(file); - - if (cols != null) - { - ucs = new UserColourScheme(cols); - } - - return ucs; - } - - static Color[] loadColours(String file) - { - Color[] newColours = null; + UserColourScheme ucs = null; + Color[] newColours = null; try { InputStreamReader in = new InputStreamReader(new FileInputStream( file), "UTF-8"); - jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours(); - ucs = (jalview.binding.JalviewUserColours) ucs.unmarshal(in); + jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours(); + jucs = (jalview.binding.JalviewUserColours) jucs.unmarshal(in); - newColours = new Color[ucs.getColourCount()]; + newColours = new Color[jucs.getColourCount()]; for (int i = 0; i < 24; i++) { - newColours[i] = new Color(Integer.parseInt( - ucs.getColour(i).getRGB(), 16)); + newColours[i] = new Color(Integer.parseInt( + jucs.getColour(i).getRGB(), 16)); } + if (newColours != null) + { + ucs = new UserColourScheme(newColours); + ucs.setName( jucs.getSchemeName() ); + } + } catch (Exception ex) { - System.out.println("Error loading UserColourFile " + file); + System.out.println("Error loading User ColourFile\n"+ex); } - return newColours; + + return ucs; } /** @@ -386,6 +400,25 @@ public class UserDefinedColours extends GUserDefinedColours */ protected void savebutton_actionPerformed(ActionEvent e) { + if(schemeName.getText().trim().length()<1) + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "User colour scheme must have a name!", + "No name for colour scheme", + JOptionPane.WARNING_MESSAGE); + return; + } + + if(userColourSchemes!=null && userColourSchemes.containsKey(schemeName.getText()) ) + { + int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop, "Colour scheme "+schemeName.getText()+ " exists." + +"\nContinue saving colour scheme as "+schemeName.getText()+"?", + "Duplicate scheme name", JOptionPane.YES_NO_OPTION); + if(reply != JOptionPane.YES_OPTION) + return; + + userColourSchemes.remove(schemeName.getText()); + } JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty( "LAST_DIRECTORY"), new String[] { "jc" }, new String[] { "Jalview User Colours" }, "Jalview User Colours"); @@ -399,10 +432,22 @@ public class UserDefinedColours extends GUserDefinedColours if (value == JalviewFileChooser.APPROVE_OPTION) { String choice = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice); + String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS", choice); + if(defaultColours.indexOf(choice)==-1) + { + if(defaultColours.length()<1) + defaultColours = defaultColours.concat("|"); + defaultColours = defaultColours.concat(choice); + } - jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours(); + userColourSchemes.put(schemeName.getText(), getSchemeFromGUI()); + + ap.alignFrame.updateUserColourMenu(); + + jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours); + jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours(); + ucs.setSchemeName(schemeName.getText()); try { PrintWriter out = new PrintWriter(new OutputStreamWriter( @@ -435,23 +480,13 @@ public class UserDefinedColours extends GUserDefinedColours */ protected void cancelButton_actionPerformed(ActionEvent e) { - Color[] newColours = new Color[24]; - - for (int i = 0; i < 24; i++) - { - newColours[i] = (Color) oldColours.elementAt(i); - buttonPanel.getComponent(i).setBackground(newColours[i]); - } - - UserColourScheme ucs = new UserColourScheme(newColours); - if (seqGroup != null) { - seqGroup.cs = ucs; + seqGroup.cs = oldColourScheme; } else { - ap.av.setGlobalColourScheme(ucs); + ap.av.setGlobalColourScheme(oldColourScheme); } ap.repaint(); @@ -464,4 +499,48 @@ public class UserDefinedColours extends GUserDefinedColours { } } + + + static Hashtable userColourSchemes; + + public static Hashtable getUserColourSchemes() + { + return userColourSchemes; + } + + public static void initUserColourSchemes(String files) + { + userColourSchemes = new Hashtable(); + + if(files==null) + return; + + // In case colours can't be loaded, we'll remove them + // from the default list here. + StringBuffer coloursFound = new StringBuffer(); + StringTokenizer st = new StringTokenizer(files, "|"); + while (st.hasMoreElements()) + { + String file = st.nextToken(); + try + { + UserColourScheme ucs = loadColours(file); + if (ucs != null) + { + if (coloursFound.length() > 0) + coloursFound.append("|"); + coloursFound.append(file); + userColourSchemes.put(ucs.getName(), ucs); + } + } + catch (Exception ex) + { + System.out.println("Error loading User ColourFile\n" + ex); + } + } + if (!files.equals(coloursFound.toString())) + { + jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString()); + } + } } diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java index 49174a0..131f202 100755 --- a/src/jalview/jbgui/GUserDefinedColours.java +++ b/src/jalview/jbgui/GUserDefinedColours.java @@ -41,9 +41,23 @@ public class GUserDefinedColours extends JPanel protected JButton loadbutton = new JButton(); protected JButton savebutton = new JButton(); protected JButton cancelButton = new JButton(); - FlowLayout flowLayout1 = new FlowLayout(); - - /** + JPanel namePanel = new JPanel(); + JLabel jLabel1 = new JLabel(); + protected JTextField schemeName = new JTextField(); + BorderLayout borderLayout1 = new BorderLayout(); + JPanel panel1 = new JPanel(); + JPanel jPanel1 = new JPanel(); + JPanel jPanel3 = new JPanel(); + BorderLayout borderLayout3 = new BorderLayout(); + GridBagLayout gridBagLayout1 = new GridBagLayout(); + BorderLayout borderLayout2 = new BorderLayout(); + FlowLayout flowLayout1 = new FlowLayout(); + BorderLayout borderLayout4 = new BorderLayout(); + JPanel jPanel4 = new JPanel(); + BorderLayout borderLayout5 = new BorderLayout(); + JPanel jPanel6 = new JPanel(); + JTextArea jTextArea1 = new JTextArea(); + /** * Creates a new GUserDefinedColours object. */ public GUserDefinedColours() @@ -65,10 +79,10 @@ public class GUserDefinedColours extends JPanel */ private void jbInit() throws Exception { - this.setLayout(flowLayout1); + this.setLayout(borderLayout4); buttonPanel.setLayout(gridLayout); - gridLayout.setColumns(6); - gridLayout.setRows(4); + gridLayout.setColumns(4); + gridLayout.setRows(6); okButton.setFont(new java.awt.Font("Verdana", 0, 11)); okButton.setText("OK"); okButton.addActionListener(new java.awt.event.ActionListener() @@ -116,16 +130,58 @@ public class GUserDefinedColours extends JPanel }); this.setBackground(new Color(212, 208, 223)); jPanel2.setOpaque(false); - colorChooser.setOpaque(false); - this.add(colorChooser, null); - this.add(buttonPanel, null); - this.add(jPanel2, null); - jPanel2.add(okButton, null); - jPanel2.add(applyButton, null); - jPanel2.add(loadbutton, null); - jPanel2.add(savebutton, null); - jPanel2.add(cancelButton, null); - } + jPanel2.setLayout(borderLayout3); + colorChooser.setOpaque(false); + jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + jLabel1.setText("Name"); + namePanel.setMinimumSize(new Dimension(300, 31)); + namePanel.setOpaque(false); + namePanel.setPreferredSize(new Dimension(240, 25)); + namePanel.setToolTipText(""); + namePanel.setLayout(borderLayout1); + schemeName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + schemeName.setPreferredSize(new Dimension(105, 21)); + schemeName.setText(""); + schemeName.setHorizontalAlignment(SwingConstants.CENTER); + panel1.setLayout(flowLayout1); + panel1.setOpaque(false); + jPanel1.setOpaque(false); + jPanel3.setOpaque(false); + jPanel4.setLayout(borderLayout5); + jPanel6.setBackground(Color.pink); + jPanel6.setMinimumSize(new Dimension(10, 70)); + jPanel6.setOpaque(false); + jPanel6.setPreferredSize(new Dimension(10, 45)); + jPanel6.setLayout(null); + jTextArea1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10)); + jTextArea1.setOpaque(false); + jTextArea1.setPreferredSize(new Dimension(260, 34)); + jTextArea1.setText( + "Save your colour scheme with a unique name and it will be added " + + "to the Colour menu."); + jTextArea1.setLineWrap(true); + jTextArea1.setRows(2); + jTextArea1.setWrapStyleWord(true); + jPanel3.add(savebutton); + jPanel3.add(loadbutton); + jPanel1.add(applyButton); + jPanel1.add(okButton); + jPanel1.add(cancelButton); + jPanel2.add(jPanel3, java.awt.BorderLayout.NORTH); + jPanel2.add(jPanel1, java.awt.BorderLayout.SOUTH); + + namePanel.add(schemeName, java.awt.BorderLayout.CENTER); + namePanel.add(jLabel1, java.awt.BorderLayout.WEST); + panel1.add(namePanel, null); + panel1.add(buttonPanel, null); + panel1.add(jPanel2, null); + panel1.add(jTextArea1); + + jPanel4.add(panel1, java.awt.BorderLayout.CENTER); + jPanel4.add(jPanel6, java.awt.BorderLayout.NORTH); + this.add(jPanel4, java.awt.BorderLayout.CENTER); + this.add(colorChooser, java.awt.BorderLayout.EAST); + } /** * DOCUMENT ME! -- 1.7.10.2