X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureColourChooser.java;h=fedcbc5c3c0b7970a191f8b1b817c88e20e625bc;hb=e3d51e28d7989c00473258af20b8999085636fc9;hp=55865dbc729a7fd495806bdb51eb2c8098f052b0;hpb=27926214f361deaf6bd78500fa80ac7dd4478b6b;p=jalview.git

diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java
index 55865db..fedcbc5 100644
--- a/src/jalview/gui/FeatureColourChooser.java
+++ b/src/jalview/gui/FeatureColourChooser.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -103,6 +103,7 @@ public class FeatureColourChooser extends JPanel
       }
       // original colour becomes the maximum colour
       cs = new GraduatedColor(Color.white,bl,mm[0],mm[1]);
+      cs.setColourByLabel(false);
     }
     minColour.setBackground(cs.getMinColor());
     maxColour.setBackground(cs.getMaxColor());
@@ -116,6 +117,7 @@ public class FeatureColourChooser extends JPanel
     }
     // update the gui from threshold state
     thresholdIsMin.setSelected(!cs.isAutoScale());
+    colourByLabel.setSelected(cs.isColourByLabel());
     if (cs.getThreshType()!=AnnotationColourGradient.NO_THRESHOLD)
     {
       // initialise threshold slider and selector
@@ -243,6 +245,15 @@ public class FeatureColourChooser extends JPanel
         thresholdIsMin_actionPerformed(actionEvent);
       }
     });
+    colourByLabel.setBackground(Color.white);
+    colourByLabel.setText("Colour by Label");
+    colourByLabel.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        colourByLabel_actionPerformed(actionEvent);
+      }
+    });
     jPanel1.add(ok);
     jPanel1.add(cancel);
     // jPanel2.add(currentColours);
@@ -253,6 +264,7 @@ public class FeatureColourChooser extends JPanel
     jPanel3.add(slider);
     jPanel3.add(thresholdValue);
     jPanel3.add(thresholdIsMin);
+    jPanel3.add(colourByLabel);
     this.add(jPanel1, java.awt.BorderLayout.SOUTH);
     this.add(jPanel2, java.awt.BorderLayout.NORTH);
   }
@@ -287,6 +299,7 @@ public class FeatureColourChooser extends JPanel
   JCheckBox currentColours = new JCheckBox();
 
   JCheckBox thresholdIsMin = new JCheckBox();
+  JCheckBox colourByLabel = new JCheckBox();
 
   private GraphLine threshline;
 
@@ -383,7 +396,7 @@ public class FeatureColourChooser extends JPanel
     } else {
       acg.setAutoScaled(true);
     }
-    
+    acg.setColourByLabel(colourByLabel.isSelected());
     fr.featureColours.put(type,acg);
     cs = acg;
     ap.paintAlignment(false);
@@ -468,5 +481,9 @@ public class FeatureColourChooser extends JPanel
   {
     changeColour();
   }
+  public void colourByLabel_actionPerformed(ActionEvent actionEvent)
+  {
+    changeColour();
+  }
 
 }