git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1620 version bump and release notes
[jalview.git]
/
src
/
jalview
/
ext
/
rbvi
/
chimera
/
JalviewChimeraBinding.java
diff --git
a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index
090b61d
..
9b9c239
100644
(file)
--- a/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-343,8
+343,7
@@
public abstract class JalviewChimeraBinding extends
public void colourByChain()
{
colourBySequence = false;
public void colourByChain()
{
colourBySequence = false;
- // this is not a valid Chimera command; is there one? Menu option hidden
- evalStateCommand("select *;color chain",false);
+ evalStateCommand("rainbow chain", false);
}
public void colourByCharge()
}
public void colourByCharge()
@@
-783,7
+782,7
@@
public abstract class JalviewChimeraBinding extends
private void waitForChimera()
{
private void waitForChimera()
{
- while (viewer.isBusy())
+ while (viewer != null && viewer.isBusy())
{
try {
Thread.sleep(15);
{
try {
Thread.sleep(15);
@@
-955,7
+954,7
@@
public abstract class JalviewChimeraBinding extends
}
}
}
}
- boolean debug = true;
+ boolean debug = false;
private void log(String message)
{
private void log(String message)
{
@@
-964,8
+963,8
@@
public abstract class JalviewChimeraBinding extends
private void viewerCommandHistory(boolean enable)
{
private void viewerCommandHistory(boolean enable)
{
- log("(Not yet implemented) History "
- + ((debug || enable) ? "on" : "off"));
+ // log("(Not yet implemented) History "
+ // + ((debug || enable) ? "on" : "off"));
}
public void loadInline(String string)
}
public void loadInline(String string)