From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 30 Jan 2006 15:33:08 +0000 (+0000)
Subject: No need for apply button, just update colours when events occur
X-Git-Tag: Root_VamJalview_2_07b+~194
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=452198e86b03d40c83d0492ab04ab2f6d52e8f5e;p=jalview.git

No need for apply button, just update colours when events occur
---

diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java
index 71cf688..71582e5 100755
--- a/src/jalview/gui/AnnotationColourChooser.java
+++ b/src/jalview/gui/AnnotationColourChooser.java
@@ -42,7 +42,7 @@ public class AnnotationColourChooser
     frame = new JInternalFrame();
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "Colour by Annotation", 480, 110);
+    Desktop.addInternalFrame(frame, "Colour by Annotation", 470, 110, false);
 
     try{
       jbInit();
@@ -51,20 +51,23 @@ public class AnnotationColourChooser
     if(av.alignment.getAlignmentAnnotation()==null)
       return;
 
-    for(int i=0; i<av.alignment.getAlignmentAnnotation().length; i++)
+    if(oldcs instanceof AnnotationColourGradient)
     {
-      annotations.addItem(av.alignment.getAlignmentAnnotation()[i].label);
-    }
-
-  //  if(av.getGlobalColourScheme() instanceof AnnotationColourGradient)
-    {
-    //  minColour.
+      AnnotationColourGradient acg = (AnnotationColourGradient)oldcs;
+      minColour.setBackground( acg.getMinColour() );
+      maxColour.setBackground( acg.getMaxColour() );
     }
-  //  else
+    else
     {
       minColour.setBackground(Color.orange);
       maxColour.setBackground(Color.red);
     }
+
+    for (int i = 0; i < av.alignment.getAlignmentAnnotation().length; i++)
+    {
+      annotations.addItem(av.alignment.getAlignmentAnnotation()[i].label);
+    }
+
   }
 
   public AnnotationColourChooser()
@@ -108,14 +111,11 @@ public class AnnotationColourChooser
     thresholdCheck.setSelectedIcon(null);
     thresholdCheck.setText("Above Threshold");
     thresholdCheck.setBounds(new Rectangle(329, 6, 109, 23));
-    apply.setOpaque(false);
-    apply.setSelectedIcon(null);
-    apply.setText("Apply");
-    apply.addActionListener(new ActionListener()
+    thresholdCheck.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        apply_actionPerformed(e);
+        thresholdCheck_actionPerformed(e);
       }
     });
     ok.setOpaque(false);
@@ -139,9 +139,15 @@ public class AnnotationColourChooser
     this.setLayout(borderLayout1);
     jPanel2.setLayout(null);
     annotations.setBounds(new Rectangle(5, 7, 135, 21));
+    annotations.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        annotations_actionPerformed(e);
+      }
+    });
     jPanel1.setBackground(Color.white);
     jPanel2.setBackground(Color.white);
-    jPanel1.add(apply);
     jPanel1.add(ok);
     jPanel1.add(cancel);
     jPanel2.add(annotations);
@@ -156,16 +162,12 @@ public class AnnotationColourChooser
   JButton minColour = new JButton();
   JButton maxColour = new JButton();
   JCheckBox thresholdCheck = new JCheckBox();
-  JButton apply = new JButton();
   JButton ok = new JButton();
   JButton cancel = new JButton();
   JPanel jPanel1 = new JPanel();
   JPanel jPanel2 = new JPanel();
   BorderLayout borderLayout1 = new BorderLayout();
-  public void apply_actionPerformed(ActionEvent e)
-  {
-    changeColour();
-  }
+
 
   public void minColour_actionPerformed(ActionEvent e)
   {
@@ -175,6 +177,7 @@ public class AnnotationColourChooser
     if (col != null)
       minColour.setBackground(col);
     minColour.repaint();
+    changeColour();
   }
 
   public void maxColour_actionPerformed(ActionEvent e)
@@ -185,6 +188,7 @@ public class AnnotationColourChooser
     if (col != null)
       maxColour.setBackground(col);
     maxColour.repaint();
+    changeColour();
   }
 
   void changeColour()
@@ -222,4 +226,14 @@ public class AnnotationColourChooser
     }catch(Exception ex){}
   }
 
+  public void thresholdCheck_actionPerformed(ActionEvent e)
+  {
+    changeColour();
+  }
+
+  public void annotations_actionPerformed(ActionEvent e)
+  {
+    changeColour();
+  }
+
 }