X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FRNAHelicesColourChooser.java;fp=src%2Fjalview%2Fschemes%2FRNAHelicesColourChooser.java;h=1a13bbe8589326ef2264702dd7458e60acf21085;hb=9623cea766a766683243235557ad48e6f7659e6a;hp=ee9792a36efd356180025a13fcef7cd1357ff224;hpb=6066400ed6b0fe288ebbea82389f59838a534706;p=jalview.git diff --git a/src/jalview/schemes/RNAHelicesColourChooser.java b/src/jalview/schemes/RNAHelicesColourChooser.java index ee9792a..1a13bbe 100644 --- a/src/jalview/schemes/RNAHelicesColourChooser.java +++ b/src/jalview/schemes/RNAHelicesColourChooser.java @@ -20,13 +20,13 @@ */ package jalview.schemes; -import java.util.*; -import java.awt.event.*; - import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.datamodel.SequenceGroup; + +import java.awt.event.ActionEvent; +import java.util.Hashtable; +import java.util.Vector; /** * Helps generate the colors for RNA secondary structure. Future: add option to @@ -81,9 +81,13 @@ public class RNAHelicesColourChooser { String label = av.getAlignment().getAlignmentAnnotation()[i].label; if (!list.contains(label)) + { list.addElement(label); + } else + { list.addElement(label + "_" + (index++)); + } } adjusting = false; @@ -105,21 +109,7 @@ public class RNAHelicesColourChooser av.setGlobalColourScheme(rhc); - if (av.getAlignment().getGroups() != null) - { - for (SequenceGroup sg : ap.getAlignment().getGroups()) - { - if (sg.cs == null) - { - continue; - } - - sg.cs = new RNAHelicesColour(sg); - - } - } - - ap.paintAlignment(false); + ap.paintAlignment(true); } void reset()