editingSeqs = false;\r
groupEditing = false;\r
\r
- seqCanvas.repaint();\r
+ ap.repaint();\r
}\r
\r
public void doMousePressed(MouseEvent evt)\r
// Y O Y CLUSTALX\r
ColourSchemeI cs = av.getGlobalColourScheme();\r
\r
+ if(av.getSelectionGroup()!=null)\r
+ av.getSelectionGroup().recalcConservation();\r
+\r
+\r
if (cs instanceof ConservationColourScheme)\r
{\r
ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
+ Conservation c = new Conservation("All",\r
+ ResidueProperties.propHash, 3,\r
+ av.alignment.getSequences(), 0,\r
+ av.alignment.getWidth() - 1);\r
+ c.calculate();\r
+ c.verdict(false, av.ConsPercGaps);\r
\r
if (ccs.cs instanceof ClustalxColourScheme)\r
{\r
- Conservation c = new Conservation("All",\r
- ResidueProperties.propHash, 3,\r
- av.alignment.getSequences(), 0,\r
- av.alignment.getWidth() - 1);\r
- c.calculate();\r
- c.verdict(false, av.ConsPercGaps);\r
\r
ClustalxColourScheme cxs = (ClustalxColourScheme) ccs.cs;\r
cxs.resetClustalX(av.alignment.getSequences(),\r
ccs = new ConservationColourScheme(c, cxs);\r
av.setGlobalColourScheme(ccs);\r
}\r
+ else\r
+ {\r
+ ccs = new ConservationColourScheme(c, ccs.cs);\r
+ av.setGlobalColourScheme(ccs);\r
+ }\r
}\r
\r
if (cs instanceof ClustalxColourScheme)\r
\r
if (stretchGroup.sequences.contains(nextSeq))\r
{\r
- stretchGroup.deleteSequence(seq, false);\r
- stretchGroup.deleteSequence(nextSeq, false);\r
+ stretchGroup.deleteSequence(seq, false);\r
}\r
else\r
{\r
{\r
stretchGroup.addSequence(seq, false);\r
}\r
-\r
stretchGroup.addSequence(nextSeq, false);\r
}\r
}\r