graduated feature color editing

[jalview.git] / src / jalview / appletgui / UserDefinedColours.java

diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java
index 825cfd3..5da1fbf 100755 (executable)
--- a/src/jalview/appletgui/UserDefinedColours.java
+++ b/src/jalview/appletgui/UserDefinedColours.java
@@ -100,13 +100,16 @@ public class UserDefinedColours extends Panel implements ActionListener,
     setTargetColour(fr.colourPanel.getBackground());
     dialog.setVisible(true);
   }
-
   public UserDefinedColours(Component caller, Color col1, Frame alignframe)
   {
+    this(caller, col1, alignframe, "Select Colour");
+  }
+  public UserDefinedColours(Component caller, Color col1, Container alignframe, String title)
+  {
     this.caller = caller;
     originalColour = col1;
-    originalLabel = "Select Colour";
-    setForDialog("Select Colour", alignframe);
+    originalLabel = title;
+    setForDialog(title, alignframe);
     setTargetColour(col1);
     dialog.setVisible(true);
   }
@@ -126,12 +129,21 @@ public class UserDefinedColours extends Panel implements ActionListener,
     frame.setSize(420, 200);
   }
 
-  void setForDialog(String title, Frame alignframe)
+  void setForDialog(String title, Container alignframe)
   {
     init();
     frame.setVisible(false);
     remove(buttonPanel);
-    dialog = new Dialog(alignframe, title, true);
+    if (alignframe instanceof Frame)
+    {
+      dialog = new Dialog((Frame)alignframe, title, true);
+    }
+    else 
+    if (alignframe instanceof JVDialog){
+      dialog = new Dialog(((JVDialog)alignframe), title, true);
+    } else {
+      throw new Error("Unsupported owner for User Colour scheme dialog.");
+    }
 
     dialog.add(this);
     this.setSize(400, 123);
@@ -320,14 +332,15 @@ public class UserDefinedColours extends Panel implements ActionListener,
   {
     final Button button = new Button();
     Color col = Color.white;
-
+    if (oldColourScheme!=null)
+    {
     try
     {
       col = oldColourScheme.findColour(aa.charAt(0), -1);
     } catch (Exception ex)
     {
     }
-
+    }
     button.setBackground(col);
     oldColours.addElement(col);
     button.setLabel(label);
@@ -381,7 +394,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
       }
       else if (caller instanceof FeatureRenderer)
       {
-        ((FeatureRenderer) caller).colourPanel.setBackground(getColor());
+        ((FeatureRenderer) caller).colourPanel.updateColor(getColor());
       }
       else if (caller instanceof FeatureColourChooser)
       {
@@ -456,11 +469,19 @@ public class UserDefinedColours extends Panel implements ActionListener,
       }
       else if (caller instanceof FeatureRenderer)
       {
-        ((FeatureRenderer) caller).colourPanel
-                .setBackground(originalColour);
+        ((FeatureRenderer) caller).colourPanel.updateColor(originalColour);
 
       }
 
+      else if (caller instanceof FeatureColourChooser)
+      {
+        if (originalLabel.indexOf("inimum")>-1)
+        {
+          ((FeatureColourChooser) caller).minColour_actionPerformed(originalColour);
+        } else {
+          ((FeatureColourChooser) caller).maxColour_actionPerformed(originalColour);
+        }
+      }
       if (dialog != null)
         dialog.setVisible(false);