X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=cd305436a35c7d9cf68addb95e2be421caa53bee;hb=43e71335be322e9ca4dddc95f5c6fce3c1bbdfcb;hp=a4095493b9fb8212a5c6483fa004367d6d039d31;hpb=3647f2e6c679ed5ef3e673f10a8d1afb2882014e;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index a409549..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.*;
@@ -21,13 +22,21 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   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;
 
 
@@ -43,14 +52,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"));
       }
-
-
   }
 
  public void stateChanged(ChangeEvent evt)
@@ -72,7 +79,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
 
     try{
-      col = oldColourScheme.findColour(aa, -1, null);
+      col = oldColourScheme.findColour(aa, -1);
     }catch(Exception ex){}
 
     button.setBackground(  col );
@@ -88,7 +95,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
       }
     });
 
-    buttonPanel.add(button);
+    buttonPanel.add(button, null);
   }
 
 
@@ -102,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++)
     {
@@ -110,6 +117,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
           newColours[i] = button.getBackground();
     }
 
+    UserColourScheme ucs = new UserColourScheme();
     ucs.setThreshold(0);
     ucs.setColourScheme( newColours );
 
@@ -118,16 +126,18 @@ 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);
@@ -136,6 +146,29 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   }
 
+  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();
+      ucs.setThreshold(0);
+      ucs.setColourScheme(newColours);
+
+    }
+    catch (Exception ex)
+    {}
+
+    return ucs;
+  }
+
   void loadColour(String file)
   {
     try
@@ -147,6 +180,8 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
         Color c = new Color(Integer.parseInt(in.readLine()));
         button.setBackground(c);
       }
+
+      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", file);
     }
     catch (Exception ex)
     {}
@@ -155,11 +190,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
   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("USER_DEFINED_COLOUR", choice);
@@ -196,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){}
   }