- ChimeraCommands.addAtomSpecRange(map, Color.blue, 1, 2, 5, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.blue, 1, 7, 7, "B");
- ChimeraCommands.addAtomSpecRange(map, Color.blue, 1, 9, 23, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.blue, 2, 1, 1, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.blue, 2, 4, 7, "B");
- ChimeraCommands.addAtomSpecRange(map, Color.yellow, 2, 8, 8, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.yellow, 2, 3, 5, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.red, 1, 3, 5, "A");
- ChimeraCommands.addAtomSpecRange(map, Color.red, 1, 6, 9, "A");
-
- // Colours should appear in the Chimera command in the order in which
- // they were added; within colour, by model, by chain, ranges in start order
- String[] commands = new ChimeraXCommands().colourBySequence(map);
- assertEquals(commands.length, 1);
- assertEquals(
- commands[0],
- "color #1/A:2-5,9-23/B:7|#2/A:1/B:4-7 #0000ff; color #2/A:3-5,8 #ffff00; color #1/A:3-9 #ff0000");
+ ChimeraCommands.addAtomSpecRange(map, Color.blue, "1", 2, 5, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.blue, "1", 7, 7, "B");
+ ChimeraCommands.addAtomSpecRange(map, Color.blue, "1", 9, 23, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.blue, "2", 1, 1, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.blue, "2", 4, 7, "B");
+ ChimeraCommands.addAtomSpecRange(map, Color.yellow, "2", 8, 8, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.yellow, "2", 3, 5, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.red, "1", 3, 5, "A");
+ ChimeraCommands.addAtomSpecRange(map, Color.red, "1", 6, 9, "A");
+
+ /*
+ * Colours should appear in the Chimera command in the order in which
+ * they were added; within colour, by model, by chain, ranges in start order
+ */
+ List<StructureCommandI> commands = testee.colourBySequence(map);
+ assertEquals(commands.size(), 1);
+ assertEquals(commands.get(0).getCommand(),
+ "color #1/A:2-5,9-23/B:7|#2/A:1/B:4-7 #0000ff;color #2/A:3-5,8 #ffff00;color #1/A:3-9 #ff0000");