X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJMol.java;h=d8ef11a1d3de3c2fb93b1bc12f763552719d402b;hb=fd618c7346eab858aa0039376872820aca37783a;hp=3f2d8954e33b450c1a13514f76972cce10fa71eb;hpb=ff385fde554b8fe517dbb734ca687ef7552f2350;p=jalview.git diff --git a/src/jalview/gui/AppJMol.java b/src/jalview/gui/AppJMol.java index 3f2d895..d8ef11a 100644 --- a/src/jalview/gui/AppJMol.java +++ b/src/jalview/gui/AppJMol.java @@ -396,7 +396,7 @@ public synchronized void addSequence(SequenceI [] seq) public void seqColour_actionPerformed(ActionEvent actionEvent) { colourBySequence = seqColour.isSelected(); - colourBySequence(ap); + colourBySequence(ap.alignFrame.alignPanel); } public void chainColour_actionPerformed(ActionEvent actionEvent) @@ -599,9 +599,17 @@ public synchronized void addSequence(SequenceI [] seq) //End StructureListener //////////////////////////// + String lastCommand; FeatureRenderer fr=null; public void colourBySequence(AlignmentPanel ap) { + + if(ap.alignFrame.getCurrentView()!=ap.av) + { + System.out.println("RETURN"); + return; + } + if(!colourBySequence) return; @@ -611,7 +619,7 @@ public synchronized void addSequence(SequenceI [] seq) if (mapping.length < 1) return; - SequenceRenderer sr = ap.seqPanel.seqCanvas.getSequenceRenderer(); + SequenceRenderer sr = new SequenceRenderer(ap.av); boolean showFeatures = false; @@ -679,7 +687,11 @@ public synchronized void addSequence(SequenceI [] seq) } } - viewer.evalStringQuiet(command.toString()); + if (lastCommand != null && !lastCommand.equals(command.toString())) + { + viewer.evalStringQuiet(command.toString()); + } + lastCommand = command.toString(); } StringBuffer condenseCommand(StringBuffer command, int pos)