X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=8146be0314bd1be23d4188153ce7c6111886cd20;hb=e1124a62486322d2d28482529d2d6b850ce1719b;hp=62d95ead3c7f3608c47058957b810592ebf78dd1;hpb=b90206d60dbcb530a3eeeb00b4802ba0a6d8bad2;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 62d95ea..8146be0 100755 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -585,98 +585,8 @@ public class SeqPanel extends JPanel ap.alignFrame.updateEditMenuBar(); } - av.updateConservation(); - av.updateConsensus(); + av.firePropertyChange("alignment", null,av.getAlignment().getSequences()); - //Does the edit affect any groups? - ////////////////////////////// - Vector groupsToUpdate = new Vector(); - SequenceGroup sg = av.getSelectionGroup(); - - int s, g, gSize = av.alignment.getGroups().size(); - if (sg != null) - { - groupsToUpdate.addElement(av.getSelectionGroup()); - int sSize = sg.getSize(); - for (s = 0; s < sSize; s++) - { - SequenceI seq = sg.getSequenceAt(s); - - for (g = 0; g < gSize; g++) - { - SequenceGroup sg2 = (SequenceGroup) av.alignment.getGroups(). - elementAt( - g); - if (sg2.sequences.contains(seq)) - { - if (!groupsToUpdate.contains(sg2)) - groupsToUpdate.addElement(sg2); - continue; - } - } - } - } - else - { - SequenceI seq = av.alignment.getSequenceAt(startseq); - for (g = 0; g < gSize; g++) - { - SequenceGroup sg2 = (SequenceGroup) av.alignment.getGroups().elementAt( - g); - if (sg2.sequences.contains(seq)) - { - if (!groupsToUpdate.contains(sg2)) - groupsToUpdate.addElement(sg2); - continue; - } - } - } - - gSize = groupsToUpdate.size(); - for (g = 0; g < gSize; g++) - { - ( (SequenceGroup) groupsToUpdate.elementAt(g)).recalcConservation(); - } - ////End of updating groups - ////////////////////////////////////////// - - // Y O Y CLUSTALX - ColourSchemeI cs = av.getGlobalColourScheme(); - if(cs!=null) - { - if (cs.conservationApplied()) - { - Conservation c = new Conservation("All", - ResidueProperties.propHash, 3, - av.alignment.getSequences(), - 0, av.alignment.getWidth() - 1); - c.calculate(); - c.verdict(false, av.ConsPercGaps); - - if (cs instanceof ClustalxColourScheme) - { - ((ClustalxColourScheme)cs). - resetClustalX(av.alignment.getSequences(), - av.alignment.getWidth()); - - cs.setConservation(c); - av.setGlobalColourScheme(cs); - } - else - { - cs.setConservation(c); - av.setGlobalColourScheme(cs); - } - - } - - if (cs instanceof ClustalxColourScheme) - { - ( (ClustalxColourScheme) cs).resetClustalX(av.alignment.getSequences(), - av.alignment.getWidth()); - av.setGlobalColourScheme(cs); - } - } } /**