X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=a35180b3efad8968459c4b8d65075a95cafffad3;hb=d9e49c675fff2fabba281a6bfecaa0d65ce23c35;hp=077a2683e5a866fed21e4477ce740666d2cb2453;hpb=10764f0aed2b33ca4620c457c5a31b780af5c663;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 077a268..a35180b 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -22,6 +22,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   ColourSchemeI oldColourScheme;
   JInternalFrame frame;
 
+
   public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
   {
     super();
@@ -56,7 +57,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
       if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
       {
-        loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+        loadColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
       }
   }
 
@@ -109,7 +110,6 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void applyButton_actionPerformed(ActionEvent e)
   {
-
     Color [] newColours = new Color[24];
     for(int i=0; i<24; i++)
     {
@@ -117,16 +117,17 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
           newColours[i] = button.getBackground();
     }
 
-    UserColourScheme ucs = new UserColourScheme();
+    UserColourScheme ucs = new UserColourScheme(newColours);
     ucs.setThreshold(0);
-    ucs.setColourScheme( newColours );
 
     if(seqGroup!=null)
+    {
       seqGroup.cs = ucs;
+      ap.repaint();
+    }
     else
-      ap.av.setGlobalColourScheme(ucs);
+      ap.alignFrame.changeColour(ucs);
 
-    ap.repaint();
   }
 
   protected void loadbutton_actionPerformed(ActionEvent e)
@@ -144,51 +145,52 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     {
       File choice = chooser.getSelectedFile();
       jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice.getParent());
-      loadColour(choice.getAbsolutePath());
+      Color[] colors = loadColours(choice.getAbsolutePath());
+      for (int i = 0; i < colors.length; i++)
+      {
+        JButton button = (JButton) buttonPanel.getComponent(i);
+        button.setBackground(colors[i]);
+      }
+
     }
+  }
 
+  public static UserColourScheme loadDefaultColours()
+  {
+    if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
+      return loadDefaultColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+    else
+      return null;
   }
 
   public static UserColourScheme loadDefaultColours(String file)
   {
-    UserColourScheme ucs = null;
-    try
-    {
-      BufferedReader in = new BufferedReader(new FileReader(file));
-      Color [] newColours = new Color[24];
-      for (int i = 0; i < 24; i++)
-      {
-        newColours[i] = new Color(Integer.parseInt(in.readLine()));
-      }
-
-      ucs = new UserColourScheme();
+      UserColourScheme ucs = null;
+      ucs = new UserColourScheme(loadColours(file));
       ucs.setThreshold(0);
-      ucs.setColourScheme(newColours);
-
-    }
-    catch (Exception ex)
-    {}
-
-    return ucs;
+      return ucs;
   }
 
-  void loadColour(String file)
+  static Color [] loadColours(String file)
   {
+    Color [] newColours=null;
     try
     {
-      BufferedReader in = new BufferedReader(new FileReader(file));
+      InputStreamReader in = new InputStreamReader(
+          new FileInputStream(file), "UTF-8");
+
+      jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours();
+      ucs = (jalview.binding.JalviewUserColours)ucs.unmarshal(in);
+
+      newColours = new Color[ucs.getColourCount()];
       for (int i = 0; i < 24; i++)
-      {
-        JButton button = (JButton) buttonPanel.getComponent(i);
-        Color c = new Color(Integer.parseInt(in.readLine()));
-        button.setBackground(c);
-      }
+        newColours[i] = new Color(Integer.parseInt(ucs.getColour(i).getRGB(), 16));
 
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", file);
     }
     catch (Exception ex)
-    {}
+    {ex.printStackTrace();}
 
+    return newColours;
   }
 
   protected void savebutton_actionPerformed(ActionEvent e)
@@ -207,15 +209,21 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     {
       String choice = chooser.getSelectedFile().getPath();
       jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
+      jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours();
 
       try{
-        PrintWriter out = new PrintWriter(new FileWriter(choice));
+        PrintWriter out = new PrintWriter(new OutputStreamWriter(
+                                     new FileOutputStream(choice), "UTF-8"));
         for(int i=0; i<24; i++)
         {
-          JButton button = (JButton)buttonPanel.getComponent(i);
-          out.println(button.getBackground().getRGB() + "");
+         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)
@@ -226,7 +234,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void cancelButton_actionPerformed(ActionEvent e)
   {
-    UserColourScheme ucs = new UserColourScheme();
+
     Color [] newColours = new Color[24];
     for(int i=0; i<24; i++)
     {
@@ -234,7 +242,8 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
           buttonPanel.getComponent(i).setBackground(newColours[i]);
     }
 
-    ucs.setColourScheme( newColours );
+    UserColourScheme ucs = new UserColourScheme( newColours );
+
     if (seqGroup != null)
       seqGroup.cs = ucs;
     else