X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=5fdcdf807f3d79c09e2e1ac1afe9b12c1064a83f;hb=12d96b44faa3d26fa4f75212d371be69e1ed1199;hp=05edac538869178c56a28ffd8bcdd70038bd8f9f;hpb=c300ec003b843d3166983a893effc1f4faafed08;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 05edac5..5fdcdf8 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -23,12 +23,21 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   JInternalFrame frame;
 
 
-  public UserDefinedColours(JInternalFrame f, AlignmentPanel ap, SequenceGroup sg)
+  public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
   {
     super();
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "User Defined Colours", 450,530, false );
+    if(System.getProperty("os.name").startsWith("Mac"))
+      frame.setSize(450,560);
+
+    if(sg!=null)
+        frame.setTitle( frame.getTitle()+ " ("+sg.getName()+")");
+
     colorChooser.getSelectionModel().addChangeListener(this);
+
     this.ap = ap;
-    frame = f;
     seqGroup = sg;
 
 
@@ -44,14 +53,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
       makeButton("B", "B");
       makeButton("Z", "Z");
       makeButton("X", "X");
-      makeButton("'.','-',' '", "-");
+      makeButton("Gap", "'.','-',' '");
 
       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"));
       }
-
-
   }
 
  public void stateChanged(ChangeEvent evt)
@@ -89,7 +96,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
       }
     });
 
-    buttonPanel.add(button);
+    buttonPanel.add(button, null);
   }
 
 
@@ -103,7 +110,6 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   protected void applyButton_actionPerformed(ActionEvent e)
   {
-    UserColourScheme ucs = new UserColourScheme();
     Color [] newColours = new Color[24];
     for(int i=0; i<24; i++)
     {
@@ -111,54 +117,95 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
           newColours[i] = button.getBackground();
     }
 
+    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.RefreshPanels();
   }
 
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-        new String[]{".jvuc"}, "Jalview User Colours");
+    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)
     {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
-      loadColour(choice);
+      File choice = chooser.getSelectedFile();
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice.getParent());
+      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice.getPath());
+      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;
+      Color cols[] = loadColours(file);
+      if(cols!=null)
+      {
+        ucs = new UserColourScheme(cols);
+        ucs.setThreshold(0);
+      }
+      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));
+
     }
     catch (Exception ex)
-    {}
+    {System.out.println("Error loading UserColourFile "+file);}
 
+    return newColours;
   }
 
   protected void savebutton_actionPerformed(ActionEvent e)
   {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    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");
@@ -167,15 +214,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)
@@ -186,7 +239,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++)
     {
@@ -194,14 +247,18 @@ 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
       ap.av.setGlobalColourScheme(ucs);
 
-    ap.RefreshPanels();
+    ap.repaint();
 
+    try{
+      frame.setClosed(true);
+    }catch(Exception ex){}
   }