X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColourChooser.java;h=0b6f8d8fcc6fc033605ccb70526889940e511958;hb=76b6b31c53b099a3034e0622ec78d4c2b455a309;hp=d49a4b6e70277e24eb7d9cd6863ab6b749c3c043;hpb=59c22b05925dd3b4d148c1ce0e43eea12bc64ba7;p=jalview.git diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index d49a4b6..0b6f8d8 100755 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -49,7 +49,8 @@ public class AnnotationColourChooser for (int g = 0; g < allGroups.size(); g++) { sg = (SequenceGroup) allGroups.get(g); - oldgroupColours.put(sg, sg.cs); + if(sg.cs!=null) + oldgroupColours.put(sg, sg.cs); } } this.av = av; @@ -319,7 +320,6 @@ public class AnnotationColourChooser slider.setValue( (int) (currentAnnotation.threshold.value * 1000)); thresholdValue.setText(currentAnnotation.threshold.value + ""); slider.setMajorTickSpacing( (int) (range / 10f)); - slider.setMinorTickSpacing( (int) (range / 100f)); slider.setEnabled(true); thresholdValue.setEnabled(true); adjusting = false;