import jalview.datamodel.SequenceI;
import jalview.gui.AlignViewport;
import jalview.gui.JvOptionPane;
-import jalview.gui.Preferences;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ZappoColourScheme;
assertEquals(Color.lightGray, rcf.getResidueColour(false,
av.getResidueShading(), groups, seq, 2, null));
+ // use legacy colouring
rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
// G in group specified as magenta in Zappo
// Gap outside group coloured white
assertEquals(Color.white, rcf.getResidueColour(false,
av.getResidueShading(), groups, seq, 2, null));
+
+ // use new colouring
+ rcf = new OverviewResColourFinder(false, Color.blue, Color.red);
+
+ // G in group specified as magenta in Zappo
+ assertEquals(Color.magenta, rcf.getResidueColour(false,
+ av.getResidueShading(), groups, seq, 7, null));
+
+ // Residue outside group coloured white
+ assertEquals(Color.white, rcf.getResidueColour(false,
+ av.getResidueShading(), groups, seq, 0, null));
+
+ // Gap outside group coloured blue
+ assertEquals(Color.blue, rcf.getResidueColour(false,
+ av.getResidueShading(), groups, seq, 2, null));
}
@Test
// gaps gap colour
c = rcf.getBoxColour(shader, seq, 3);
- assertEquals(Preferences.OVERVIEW_DEFAULT_GAP, c);
+ assertEquals(
+ jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP,
+ c);
// legacy colouring set explicitly via constructor
rcf = new OverviewResColourFinder(true, Color.blue, Color.red);
// gaps gap colour
c = rcf.getBoxColour(shader, seq, 3);
- assertEquals(Preferences.OVERVIEW_DEFAULT_GAP, c);
+ assertEquals(
+ jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP,
+ c);
// non legacy colouring with colour scheme
rcf = new OverviewResColourFinder(false, Color.blue, Color.red);