New feature type, new colour set
authoramwaterhouse <Andrew Waterhouse>
Mon, 27 Nov 2006 11:14:28 +0000 (11:14 +0000)
committeramwaterhouse <Andrew Waterhouse>
Mon, 27 Nov 2006 11:14:28 +0000 (11:14 +0000)
src/jalview/gui/FeatureRenderer.java

index 7804bbd..beef70c 100755 (executable)
@@ -531,12 +531,10 @@ public class FeatureRenderer
         if (getColour(lastFeatureAdded) != null)\r
         {\r
           colour.setBackground(getColour(lastFeatureAdded));\r
-          colour.setForeground(getColour(lastFeatureAdded));\r
         }\r
         else\r
         {\r
           colour.setBackground(new Color(60, 160, 115));\r
-          colour.setForeground(new Color(60, 160, 115));\r
         }\r
 \r
       }\r
@@ -568,8 +566,6 @@ public class FeatureRenderer
               end.setValue(new Integer(features[index].getEnd()));\r
               colour.setBackground(\r
                   getColour(name.getSelectedItem().toString()));\r
-              colour.setForeground(\r
-                  getColour(name.getSelectedItem().toString()));\r
 \r
               SearchResults highlight = new SearchResults();\r
               highlight.addResult(sequences[0],\r
@@ -579,6 +575,13 @@ public class FeatureRenderer
               ap.seqPanel.seqCanvas.highlightSearchResults(highlight);\r
 \r
             }\r
+            Color col = getColour(name.getSelectedItem().toString());\r
+            if (col == null)\r
+              col = new\r
+                  jalview.schemes.UserColourScheme()\r
+                  .createColourFromName(name.getSelectedItem().toString());\r
+\r
+            colour.setBackground(col);\r
           }\r
         });\r
 \r