X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=cd305436a35c7d9cf68addb95e2be421caa53bee;hb=43e71335be322e9ca4dddc95f5c6fce3c1bbdfcb;hp=1a3fa8604c0de1af8884d46c75f2622e37d4cc73;hpb=6f3fc393f90ea0460caeca7e229e505741c51bd4;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 1a3fa86..cd30543 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -2,6 +2,7 @@ package jalview.gui;
 
 import jalview.jbgui.GUserDefinedColours;
 import jalview.datamodel.*;
+import jalview.io.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -18,24 +19,45 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   SequenceGroup seqGroup;
   JButton selectedButton;
   Vector oldColours = new Vector();
+  ColourSchemeI oldColourScheme;
   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;
+    seqGroup = sg;
+
+
+      if (seqGroup != null)
+        oldColourScheme = seqGroup.cs;
+      else
+        oldColourScheme = ap.av.getGlobalColourScheme();
 
-    for(int i=0; i<20; i++)
-      makeButton(ResidueProperties.aa2Triplet.get( ResidueProperties.aa[i] )+"", ResidueProperties.aa[i]);
+      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("'.','-',' '", "-");
+      makeButton("B", "B");
+      makeButton("Z", "Z");
+      makeButton("X", "X");
+      makeButton("Gap", "'.','-',' '");
 
+      if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
+      {
+        loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+      }
   }
 
  public void stateChanged(ChangeEvent evt)
@@ -54,14 +76,11 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   {
     final JButton button = new JButton();
     Color col = Color.white;
-    ColourSchemeI cs = null;
-    if(seqGroup!=null)
-      cs = seqGroup.cs;
-    else
-      cs = ap.av.getGlobalColourScheme();
 
-    if(cs!=null)
-      col = cs.findColour( aa, -1, null);
+
+    try{
+      col = oldColourScheme.findColour(aa, -1);
+    }catch(Exception ex){}
 
     button.setBackground(  col );
     oldColours.addElement( col );
@@ -76,7 +95,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
       }
     });
 
-    buttonPanel.add(button);
+    buttonPanel.add(button, null);
   }
 
 
@@ -90,7 +109,7 @@ 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++)
     {
@@ -98,6 +117,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
           newColours[i] = button.getBackground();
     }
 
+    UserColourScheme ucs = new UserColourScheme();
     ucs.setThreshold(0);
     ucs.setColourScheme( newColours );
 
@@ -106,46 +126,79 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     else
       ap.av.setGlobalColourScheme(ucs);
 
-    ap.RefreshPanels();
+    ap.repaint();
   }
 
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    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 == JFileChooser.APPROVE_OPTION)
+    if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
       jalview.bin.Cache.setProperty("LAST_DIRECTORY",  choice);
+      loadColour(choice);
+    }
 
-      try{
-        BufferedReader in = new BufferedReader(new FileReader(choice));
-        for(int i=0; i<24; i++)
-        {
-          JButton button = (JButton)buttonPanel.getComponent(i);
-          Color c = new Color(Integer.parseInt(in.readLine()));
-          button.setBackground(c);
-        }
+  }
 
+  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()));
       }
-      catch(Exception ex)
-      {}
+
+      ucs = new UserColourScheme();
+      ucs.setThreshold(0);
+      ucs.setColourScheme(newColours);
+
+    }
+    catch (Exception ex)
+    {}
+
+    return ucs;
+  }
+
+  void loadColour(String file)
+  {
+    try
+    {
+      BufferedReader in = new BufferedReader(new FileReader(file));
+      for (int i = 0; i < 24; i++)
+      {
+        JButton button = (JButton) buttonPanel.getComponent(i);
+        Color c = new Color(Integer.parseInt(in.readLine()));
+        button.setBackground(c);
+      }
+
+      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", file);
     }
+    catch (Exception ex)
+    {}
 
   }
 
   protected void savebutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    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 == JFileChooser.APPROVE_OPTION)
+    if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
+      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
 
       try{
         PrintWriter out = new PrintWriter(new FileWriter(choice));
@@ -179,8 +232,11 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     else
       ap.av.setGlobalColourScheme(ucs);
 
-    ap.RefreshPanels();
+    ap.repaint();
 
+    try{
+      frame.setClosed(true);
+    }catch(Exception ex){}
   }