git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
82ccd12
)
JAL-3921 allow Jmol saveState to be executed as evalScriptWait so state is written...
patch/JAL-3921_jmol_session_save
author
Jim Procter
<j.procter@dundee.ac.uk>
Fri, 17 Mar 2023 16:02:53 +0000
(16:02 +0000)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Fri, 17 Mar 2023 16:02:53 +0000
(16:02 +0000)
src/jalview/ext/jmol/JalviewJmolBinding.java
patch
|
blob
|
history
src/jalview/ext/jmol/JmolCommands.java
patch
|
blob
|
history
src/jalview/structure/StructureCommand.java
patch
|
blob
|
history
src/jalview/structure/StructureCommandI.java
patch
|
blob
|
history
diff --git
a/src/jalview/ext/jmol/JalviewJmolBinding.java
b/src/jalview/ext/jmol/JalviewJmolBinding.java
index
21a19ae
..
dde7643
100644
(file)
--- a/
src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/
src/jalview/ext/jmol/JalviewJmolBinding.java
@@
-154,7
+154,7
@@
public abstract class JalviewJmolBinding extends AAStructureBindingModel
jmolHistory(false);
if (lastCommand == null || !lastCommand.equals(cmd))
{
jmolHistory(false);
if (lastCommand == null || !lastCommand.equals(cmd))
{
- jmolScript(cmd + "\n");
+ jmolScript(cmd + "\n",command.isWaitNeeded());
}
jmolHistory(true);
lastCommand = cmd;
}
jmolHistory(true);
lastCommand = cmd;
diff --git
a/src/jalview/ext/jmol/JmolCommands.java
b/src/jalview/ext/jmol/JmolCommands.java
index
19d64f0
..
7fa47a1
100644
(file)
--- a/
src/jalview/ext/jmol/JmolCommands.java
+++ b/
src/jalview/ext/jmol/JmolCommands.java
@@
-241,7
+241,9
@@
public class JmolCommands extends StructureCommandsBase
/*
* https://chemapps.stolaf.edu/jmol/docs/#writemodel
*/
/*
* https://chemapps.stolaf.edu/jmol/docs/#writemodel
*/
- return new StructureCommand("write STATE \"" + filepath + "\"");
+ StructureCommand sc = new StructureCommand("write STATE \"" + filepath + "\"");
+ sc.setWaitNeeded(true);
+ return sc;
}
@Override
}
@Override
diff --git
a/src/jalview/structure/StructureCommand.java
b/src/jalview/structure/StructureCommand.java
index
5dab059
..
6e4c4e1
100644
(file)
--- a/
src/jalview/structure/StructureCommand.java
+++ b/
src/jalview/structure/StructureCommand.java
@@
-29,6
+29,7
@@
public class StructureCommand implements StructureCommandI
private List<String> parameters;
private List<String> parameters;
+ private boolean waitNeeded=false;
public StructureCommand(String cmd, String... params)
{
command = cmd;
public StructureCommand(String cmd, String... params)
{
command = cmd;
@@
-40,7
+41,18
@@
public class StructureCommand implements StructureCommandI
}
}
}
}
}
}
-
+
+ public void setWaitNeeded(boolean wait)
+ {
+ waitNeeded=wait;
+ }
+
+ @Override
+ public boolean isWaitNeeded()
+ {
+ return waitNeeded;
+ }
+
@Override
public void addParameter(String param)
{
@Override
public void addParameter(String param)
{
diff --git
a/src/jalview/structure/StructureCommandI.java
b/src/jalview/structure/StructureCommandI.java
index
ba557a8
..
03b15fb
100644
(file)
--- a/
src/jalview/structure/StructureCommandI.java
+++ b/
src/jalview/structure/StructureCommandI.java
@@
-31,4
+31,6
@@
public interface StructureCommandI
void addParameter(String param);
boolean hasParameters();
void addParameter(String param);
boolean hasParameters();
+
+ default boolean isWaitNeeded() { return false; };
}
}