X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=a96cf526a285ac27b53951b152c92191d6469a6c;hb=577f505f54fe343e89f581461e780ea8308c20ec;hp=c78c0930c87b3ba41bf39eee38078495d7d641f1;hpb=e2d482716f329dc107c79421495718d25cd7070e;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index c78c093..a96cf52 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -1,6 +1,7 @@
 package jalview.gui;
 
 import jalview.jbgui.GUserDefinedColours;
+import jalview.datamodel.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -13,28 +14,42 @@ import java.util.*;
 public class UserDefinedColours extends GUserDefinedColours implements ChangeListener
 {
 
-  SeqPanel seqPanel;
-  ColourSchemeI colourScheme;
+  AlignmentPanel ap;
+  SequenceGroup seqGroup;
   JButton selectedButton;
   Vector oldColours = new Vector();
+  ColourSchemeI oldColourScheme;
   JInternalFrame frame;
 
-  public UserDefinedColours(JInternalFrame f, SeqPanel sp)
+
+  public UserDefinedColours(JInternalFrame f, AlignmentPanel ap, SequenceGroup sg)
   {
     super();
     colorChooser.getSelectionModel().addChangeListener(this);
-    seqPanel = sp;
+    this.ap = ap;
     frame = f;
-    colourScheme = seqPanel.getColourScheme();
-   // colourScheme.
+    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("'.','-',' '", "-");
+
+      if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
+      {
+        loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
+      }
 
-    makeButton("B","B");
-    makeButton("Z","Z");
-    makeButton("X","X");
-    makeButton("'.','-',' '", "-");
 
   }
 
@@ -53,9 +68,17 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
   void makeButton(String label, String aa)
   {
     final JButton button = new JButton();
-    button.setBackground( colourScheme.findColour(null,aa,-1,null) );
-    oldColours.addElement( colourScheme.findColour(null,aa,-1,null) );
+    Color col = Color.white;
+
+
+    try{
+      col = oldColourScheme.findColour(aa, -1, null);
+    }catch(Exception ex){}
+
+    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()
     {
@@ -89,46 +112,59 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 
     ucs.setThreshold(0);
     ucs.setColourScheme( newColours );
-    seqPanel.setColourScheme( ucs, false );
+
+    if(seqGroup!=null)
+      seqGroup.cs = ucs;
+    else
+      ap.av.setGlobalColourScheme(ucs);
+
+    ap.RefreshPanels();
   }
 
   protected void loadbutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);
+    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+    chooser.setFileView(new jalview.io.JalviewFileView());
     chooser.setDialogTitle("Load colour scheme");
     chooser.setToolTipText("Load");
     int value = chooser.showOpenDialog(this);
     if (value == JFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.LAST_DIRECTORY = choice;
+      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);
-        }
+  }
 
+  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);
       }
-      catch(Exception ex)
-      {}
     }
+    catch (Exception ex)
+    {}
 
   }
 
   protected void savebutton_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);
+    JFileChooser chooser = new JFileChooser(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)
     {
       String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.LAST_DIRECTORY = choice;
+      jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);
 
       try{
         PrintWriter out = new PrintWriter(new FileWriter(choice));
@@ -157,7 +193,12 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     }
 
     ucs.setColourScheme( newColours );
-    seqPanel.setColourScheme( ucs, false );
+    if (seqGroup != null)
+      seqGroup.cs = ucs;
+    else
+      ap.av.setGlobalColourScheme(ucs);
+
+    ap.RefreshPanels();
 
   }