X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=7169fa2974379fd8460efc25495235d1b295a523;hb=05e40b4dd4e216024024fb921d797917d74daa76;hp=66420b048d93cf18162b6306bb4e3c3d8d269465;hpb=8f08ed712138cea8987594a62b6053a0bfdba327;p=jalview.git diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java index 66420b0..7169fa2 100644 --- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java +++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java @@ -342,6 +342,13 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel "Response from command ('" + cmd + "') was:\n" + lastReply); } } + else + { + if (Cache.log.isDebugEnabled()) + { + Cache.log.debug("Command executed: " + cmd); + } + } return reply; } @@ -418,19 +425,29 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel { return; } - + if (!found) + { + // not a valid residue label command, so clear + cmd.setLength(0); + } /* - * unshow the label for the previous residue + * prepend with command + * to unshow the label for the previous residue */ if (lastHighlightCommand != null) { - executeCommand(false, null, new StructureCommand("~" + lastHighlightCommand)); + cmd.insert(0, ";"); + cmd.insert(0,lastHighlightCommand); + cmd.insert(0,"~"); + } - if (found) - { - executeCommand(false, null, new StructureCommand(command)); + if (cmd.length()>0) { + executeCommand(true, null, new StructureCommand(cmd.toString())); + } + + if (found) { + this.lastHighlightCommand = command; } - this.lastHighlightCommand = command; } /**