X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=ec4ad5526196ea40068f3f33e2ae59039709102b;hb=32ce9ddb7ce1a68add53dd81785ae428ca136a83;hp=8398643c3bede3aca4e031f245c3f790e3d56103;hpb=9e896372d111e5b6090ce211e06c6c6e5c4a75fa;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 8398643..ec4ad55 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -1,208 +1,604 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
-import jalview.jbgui.GUserDefinedColours;
 import jalview.datamodel.*;
+
 import jalview.io.*;
-import javax.swing.*;
+
+import jalview.jbgui.*;
+
+import jalview.schemes.*;
+
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.event.*;
-import jalview.schemes.*;
+
 import java.io.*;
+
 import java.util.*;
 
+import javax.swing.*;
+import javax.swing.event.*;
+
 
-public class UserDefinedColours extends GUserDefinedColours implements ChangeListener
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class UserDefinedColours extends GUserDefinedColours
+    implements ChangeListener
 {
+    AlignmentPanel ap;
+    SequenceGroup seqGroup;
+    Vector selectedButtons;
+    ColourSchemeI oldColourScheme;
+    JInternalFrame frame;
+
+    /**
+     * Creates a new UserDefinedColours object.
+     *
+     * @param ap DOCUMENT ME!
+     * @param sg DOCUMENT ME!
+     */
+    public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
+    {
+        super();
+        frame = new JInternalFrame();
+        frame.setContentPane(this);
+        Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true);
 
-  AlignmentPanel ap;
-  SequenceGroup seqGroup;
-  JButton selectedButton;
-  Vector oldColours = new Vector();
-  ColourSchemeI oldColourScheme;
-  JInternalFrame frame;
+        if (System.getProperty("os.name").startsWith("Mac"))
+        {
+            frame.setSize(760, 370);
+        }
 
+        if (sg != null)
+        {
+            frame.setTitle(frame.getTitle() + " (" + sg.getName() + ")");
+        }
 
-  public UserDefinedColours(JInternalFrame f, AlignmentPanel ap, SequenceGroup sg)
-  {
-    super();
-    colorChooser.getSelectionModel().addChangeListener(this);
-    this.ap = ap;
-    frame = f;
-    seqGroup = sg;
+        colorChooser.getSelectionModel().addChangeListener(this);
 
+        this.ap = ap;
+        seqGroup = sg;
 
-      if (seqGroup != null)
-        oldColourScheme = seqGroup.cs;
-      else
-        oldColourScheme = ap.av.getGlobalColourScheme();
+        if (seqGroup != null)
+        {
+            oldColourScheme = seqGroup.cs;
+        }
+        else
+        {
+            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]) +
+                "", ResidueProperties.aa[i]);
+        }
+
+        makeButton("B", "B");
+        makeButton("Z", "Z");
+        makeButton("X", "X");
+        makeButton("Gap", "-");
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void stateChanged(ChangeEvent evt)
+    {
+        if (selectedButtons != null)
+        {
+          JButton button;
+          for(int i=0; i<selectedButtons.size(); i++)
+          {
+            button = (JButton)selectedButtons.elementAt(i);
+            button.setBackground(colorChooser.getColor());
+            button.setForeground( button.getBackground().brighter().brighter().brighter());
+          }
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void colourButtonPressed(MouseEvent e)
+    {
+      if(selectedButtons == null)
+        selectedButtons = new Vector();
+
+      JButton pressed = (JButton) e.getSource();
 
-      for (int i = 0; i < 20; i++)
-        makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) +
-                   "", ResidueProperties.aa[i]);
+      if(e.isShiftDown())
+      {
+        JButton start, end = (JButton) e.getSource();
+        if(selectedButtons.size()>1)
+          start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
+        else
+          start = (JButton) e.getSource();
+
+        int startIndex=0, endIndex=0;
+        for(int b=0; b<buttonPanel.getComponentCount(); b++)
+        {
+          if(buttonPanel.getComponent(b)==start)
+            startIndex = b;
+          if(buttonPanel.getComponent(b)==end)
+            endIndex = b;
+        }
+
+        if(startIndex > endIndex)
+        {
+          int temp = startIndex;
+          startIndex = endIndex;
+          endIndex = temp;
+        }
 
-      makeButton("B", "B");
-      makeButton("Z", "Z");
-      makeButton("X", "X");
-      makeButton("'.','-',' '", "-");
+        for(int b=startIndex; b<=endIndex; b++)
+        {
+          JButton button = (JButton)buttonPanel.getComponent(b);
+          if(!selectedButtons.contains(button))
+          {
+            button.setForeground(button.getBackground().brighter().brighter());
+            selectedButtons.add(button);
+          }
+        }
+      }
+      else if(!e.isControlDown())
+      {
+        for(int b=0; b<selectedButtons.size(); b++)
+        {
+          JButton button = (JButton)selectedButtons.elementAt(b);
+          button.setForeground(button.getBackground().darker().darker());
+        }
+        selectedButtons.clear();
+        pressed.setForeground( pressed.getBackground().brighter().brighter());
+        selectedButtons.addElement(pressed);
 
-      if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
+      }
+      else if(e.isControlDown())
       {
-        loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+        if(selectedButtons.contains(pressed))
+        {
+          pressed.setForeground(pressed.getBackground().darker().darker());
+          selectedButtons.remove(pressed);
+        }
+        else
+        {
+          pressed.setForeground( pressed.getBackground().brighter().brighter());
+          selectedButtons.addElement(pressed);
+        }
       }
 
+      if(selectedButtons.size()>0)
+      colorChooser.setColor( ((JButton)selectedButtons.elementAt(0)).getBackground());
+    }
 
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param label DOCUMENT ME!
+     * @param aa DOCUMENT ME!
+     */
+    void makeButton(String label, String aa)
+    {
+        final JButton button = new JButton();
+        Color col = Color.white;
 
- public void stateChanged(ChangeEvent evt)
- {
-   if(selectedButton!=null)
-     selectedButton.setBackground( colorChooser.getColor() );
- }
+        try
+        {
+            col = oldColourScheme.findColour(aa, -1);
+        }
+        catch (Exception ex)
+        {
+        //  ex.printStackTrace();
+        }
 
-  public void colourButtonPressed(MouseEvent e)
-  {
-     selectedButton = (JButton)e.getSource();
-     colorChooser.setColor(selectedButton.getBackground());
-  }
+        button.setBackground(col);
+        button.setText(label);
+        button.setForeground(col.darker().darker().darker());
+        button.setFont(new java.awt.Font("Verdana", 1, 10));
+        button.addMouseListener(new java.awt.event.MouseAdapter()
+            {
+                public void mouseClicked(MouseEvent e)
+                {
+                    colourButtonPressed(e);
+                }
+            });
+
+        buttonPanel.add(button, null);
+    }
 
-  void makeButton(String label, String aa)
-  {
-    final JButton button = new JButton();
-    Color col = Color.white;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void okButton_actionPerformed(ActionEvent e)
+    {
+        applyButton_actionPerformed(null);
 
+        try
+        {
+            frame.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+        }
+    }
 
-    try{
-      col = oldColourScheme.findColour(aa, -1, null);
-    }catch(Exception ex){}
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void applyButton_actionPerformed(ActionEvent e)
+    {
+        UserColourScheme ucs = getSchemeFromGUI();
+        ucs.setName(schemeName.getText());
 
-    button.setBackground(  col );
-    oldColours.addElement( col );
-    button.setText( label );
-    button.setForeground( col.darker().darker().darker() );
-    button.setFont(new java.awt.Font("Verdana", 1, 10));
-    button.addMouseListener(new java.awt.event.MouseAdapter()
+        if (seqGroup != null)
+        {
+            seqGroup.cs = ucs;
+            ap.repaint();
+        }
+        else
+        {
+            ap.alignFrame.changeColour(ucs);
+        }
+    }
+
+    UserColourScheme getSchemeFromGUI()
     {
-      public void mouseClicked(MouseEvent e)
+      Color[] newColours = new Color[24];
+
+      for (int i = 0; i < 24; i++)
       {
-        colourButtonPressed(e);
+        JButton button = (JButton) buttonPanel.getComponent(i);
+        newColours[i] = button.getBackground();
       }
-    });
 
-    buttonPanel.add(button);
-  }
+      UserColourScheme ucs = new UserColourScheme(newColours);
+      ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
+
+      return ucs;
+    }
 
 
-  protected void okButton_actionPerformed(ActionEvent e)
-  {
-    applyButton_actionPerformed(null);
-    try{
-      frame.setClosed(true);
-    }catch(Exception ex){}
-  }
 
-  protected void applyButton_actionPerformed(ActionEvent e)
-  {
-    UserColourScheme ucs = new UserColourScheme();
-    Color [] newColours = new Color[24];
-    for(int i=0; i<24; i++)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void loadbutton_actionPerformed(ActionEvent e)
     {
-          JButton button = (JButton)buttonPanel.getComponent(i);
-          newColours[i] = button.getBackground();
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(
+                    "LAST_DIRECTORY"), new String[] { "jc" },
+                new String[] { "Jalview User Colours" }, "Jalview User Colours");
+        chooser.setFileView(new jalview.io.JalviewFileView());
+        chooser.setDialogTitle("Load colour scheme");
+        chooser.setToolTipText("Load");
+
+        int value = chooser.showOpenDialog(this);
+
+        if (value == JalviewFileChooser.APPROVE_OPTION)
+        {
+            File choice = chooser.getSelectedFile();
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
+            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);
+
+
+            UserColourScheme ucs = loadColours(choice.getAbsolutePath());
+            Color[] colors = ucs.getColours();
+            schemeName.setText(ucs.getName());
+
+            for (int i = 0; i < colors.length; i++)
+            {
+                JButton button = (JButton) buttonPanel.getComponent(i);
+                button.setBackground(colors[i]);
+            }
+        }
     }
 
-    ucs.setThreshold(0);
-    ucs.setColourScheme( newColours );
-
-    if(seqGroup!=null)
-      seqGroup.cs = ucs;
-    else
-      ap.av.setGlobalColourScheme(ucs);
-
-    ap.RefreshPanels();
-  }
-
-  protected void loadbutton_actionPerformed(ActionEvent e)
-  {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-        new String[]{".jvuc"}, "Jalview User Colours");
-    chooser.setFileView(new jalview.io.JalviewFileView());
-    chooser.setDialogTitle("Load colour scheme");
-    chooser.setToolTipText("Load");
-    int value = chooser.showOpenDialog(this);
-    if (value == JalviewFileChooser.APPROVE_OPTION)
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public static UserColourScheme loadDefaultColours()
     {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
-      loadColour(choice);
+        UserColourScheme ret = null;
+
+        String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
+        if ( colours != null )
+        {
+          if(colours.indexOf("|")>-1)
+            colours = colours.substring(0, colours.indexOf("|"));
+
+          ret = loadColours(colours);
+        }
+
+        if(ret == null)
+        {
+          Color[] newColours = new Color[24];
+          for (int i = 0; i < 24; i++)
+          {
+            newColours[i] = Color.white;
+          }
+          ret =  new UserColourScheme(newColours);
+        }
+
+        return ret;
     }
 
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param file DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    static UserColourScheme loadColours(String file)
+    {
+         UserColourScheme ucs = null;
+         Color[]  newColours = null;
 
-  void loadColour(String file)
-  {
-    try
+        try
+        {
+            InputStreamReader in = new InputStreamReader(new FileInputStream(
+                        file), "UTF-8");
+
+            jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours();
+            jucs = (jalview.binding.JalviewUserColours) jucs.unmarshal(in);
+
+            newColours = new Color[jucs.getColourCount()];
+
+            for (int i = 0; i < 24; i++)
+            {
+              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 User ColourFile\n"+ex);
+        }
+
+
+       return ucs;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void savebutton_actionPerformed(ActionEvent e)
     {
-      BufferedReader in = new BufferedReader(new FileReader(file));
-      for (int i = 0; i < 24; i++)
+      if(schemeName.getText().trim().length()<1)
       {
-        JButton button = (JButton) buttonPanel.getComponent(i);
-        Color c = new Color(Integer.parseInt(in.readLine()));
-        button.setBackground(c);
+        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");
+
+        chooser.setFileView(new jalview.io.JalviewFileView());
+        chooser.setDialogTitle("Save colour scheme");
+        chooser.setToolTipText("Save");
+
+        int value = chooser.showSaveDialog(this);
+
+        if (value == JalviewFileChooser.APPROVE_OPTION)
+        {
+            String choice = chooser.getSelectedFile().getPath();
+            String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS", choice);
+            if(defaultColours.indexOf(choice)==-1)
+            {
+              if(defaultColours.length()>0)
+                defaultColours = defaultColours.concat("|");
+              defaultColours = defaultColours.concat(choice);
+            }
+
+            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(
+                            new FileOutputStream(choice), "UTF-8"));
+
+                for (int i = 0; i < 24; i++)
+                {
+                    JButton button = (JButton) buttonPanel.getComponent(i);
+                    jalview.binding.Colour col = new jalview.binding.Colour();
+                    col.setName(button.getText());
+                    col.setRGB(jalview.util.Format.getHexString(
+                            button.getBackground()));
+                    ucs.addColour(col);
+                }
+
+                ucs.marshal(out);
+                out.close();
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
     }
-    catch (Exception ex)
-    {}
-
-  }
-
-  protected void savebutton_actionPerformed(ActionEvent e)
-  {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
-    chooser.setFileView(new jalview.io.JalviewFileView());
-    chooser.setDialogTitle("Save colour scheme");
-    chooser.setToolTipText("Save");
-    int value = chooser.showSaveDialog(this);
-    if (value == JalviewFileChooser.APPROVE_OPTION)
-    {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
 
-      try{
-        PrintWriter out = new PrintWriter(new FileWriter(choice));
-        for(int i=0; i<24; i++)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void cancelButton_actionPerformed(ActionEvent e)
+    {
+        if (seqGroup != null)
+        {
+            seqGroup.cs = oldColourScheme;
+        }
+        else
         {
-          JButton button = (JButton)buttonPanel.getComponent(i);
-          out.println(button.getBackground().getRGB() + "");
+            ap.av.setGlobalColourScheme(oldColourScheme);
         }
 
-        out.close();
-      }
-      catch(Exception ex)
-      {ex.printStackTrace();}
+        ap.repaint();
+
+        try
+        {
+            frame.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+        }
     }
 
-  }
 
-  protected void cancelButton_actionPerformed(ActionEvent e)
-  {
-    UserColourScheme ucs = new UserColourScheme();
-    Color [] newColours = new Color[24];
-    for(int i=0; i<24; i++)
+    static Hashtable userColourSchemes;
+
+    public static Hashtable getUserColourSchemes()
     {
-          newColours[i] = (Color)oldColours.elementAt(i);
-          buttonPanel.getComponent(i).setBackground(newColours[i]);
+      return userColourSchemes;
     }
 
-    ucs.setColourScheme( newColours );
-    if (seqGroup != null)
-      seqGroup.cs = ucs;
-    else
-      ap.av.setGlobalColourScheme(ucs);
+    public static void initUserColourSchemes(String files)
+    {
+      userColourSchemes = new Hashtable();
 
-    ap.RefreshPanels();
+      if(files==null || files.length()==0)
+        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()))
+      {
+        if (coloursFound.toString().length() > 1)
+          jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+                                        coloursFound.toString());
+        else
+          jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+      }
+    }
 
+    public static void removeColourFromDefaults(String target)
+    {
+      // The only way to find colours by name is to load them in
+      // In case colours can't be loaded, we'll remove them
+      // from the default list here.
+
+      userColourSchemes = new Hashtable();
+
+      StringBuffer coloursFound = new StringBuffer();
+      StringTokenizer st = new StringTokenizer(
+           jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
+
+      while (st.hasMoreElements())
+      {
+        String file = st.nextToken();
+        try
+        {
+          UserColourScheme ucs = loadColours(file);
+          if (ucs != null && !ucs.getName().equals(target))
+          {
+            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 (coloursFound.toString().length() > 1)
+        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+      else
+        jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+
+    }
 }