Revision: 20490
http://sourceforge.net/p/jmol/code/20490
Author: hansonr
Date: 2015-05-07 21:59:01 +0000 (Thu, 07 May 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.05.07b"
bug fix: BIND can cause fault
bug fix: write "?" can cause fault when [x] box is pushed on window
bug fix: set picking dragMolecule, set picking dragMinimizeMolecule, set
picking dragLigand broken
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/modelset/ModelSet.java
branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java
branches/v14_2/Jmol/src/org/jmol/viewer/ActionManager.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v14_2/Jmol/src/org/jmol/viewer/binding/Binding.java
Modified: branches/v14_2/Jmol/src/org/jmol/modelset/ModelSet.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/modelset/ModelSet.java 2015-05-07
21:58:53 UTC (rev 20489)
+++ branches/v14_2/Jmol/src/org/jmol/modelset/ModelSet.java 2015-05-07
21:59:01 UTC (rev 20490)
@@ -2028,14 +2028,6 @@
bs.andNot(uc.notInCentroid(this, am[i].bsAtoms, minmax));
}
return bs;
- // case T.sidechain: -- can't reach this code -- sidechain is
hardwired
- // int ia = ((BS) specInfo).nextSetBit(0);
- // if (ia < 0)
- // return new BS();
- // if (at[ia].group.isStandardProtein)
- // return at[ia].group.getBSSideChain();
- // // treat as molecule if not PDB protein;
- // //$FALL-THROUGH$
case T.molecule:
return getMoleculeBitSet((BS) specInfo);
case T.spec_seqcode_range:
Modified: branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-05-07
21:58:53 UTC (rev 20489)
+++ branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-05-07
21:59:01 UTC (rev 20490)
@@ -572,6 +572,8 @@
params.put("captureMode", T.nameOf(mode).toLowerCase());
params.put("captureLooping", looping ? Boolean.TRUE : Boolean.FALSE);
String msg = vwr.processWriteOrCapture(params);
+ if (msg == null)
+ msg = "canceled";
Logger.info(msg);
}
@@ -3622,6 +3624,8 @@
params.put("height", Integer.valueOf(height));
params.put("nVibes", Integer.valueOf(nVibes));
msg = vwr.processWriteOrCapture(params);
+ if (msg == null)
+ msg = "canceled";
if (isImage && msg.startsWith("OK"))
msg += "; width=" + width + "; height=" + height;
if (timeMsg)
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/ActionManager.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/ActionManager.java 2015-05-07
21:58:53 UTC (rev 20489)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/ActionManager.java 2015-05-07
21:59:01 UTC (rev 20490)
@@ -1086,7 +1086,7 @@
case PICKING_DRAG_LIGAND:
case PICKING_DRAG_MOLECULE:
case PICKING_DRAG_MINIMIZE_MOLECULE:
- bs = vwr.ms.getAtoms(T.sidechain, BSUtil.newAndSetBit(dragAtomIndex));
+ bs = vwr.ms.getAtoms(T.molecule, BSUtil.newAndSetBit(dragAtomIndex));
if (apm == PICKING_DRAG_LIGAND)
bs.and(vwr.getAtomBitSet("ligand"));
//$FALL-THROUGH$
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07
21:58:53 UTC (rev 20489)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07
21:59:01 UTC (rev 20490)
@@ -4,8 +4,15 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.3.13_2015.05.07"
+Jmol.___JmolVersion="14.2.13_2015.05.07b"
+bug fix: BIND can cause fault
+bug fix: write "?" can cause fault when [x] box is pushed on window
+bug fix: set picking dragMolecule, set picking dragMinimizeMolecule, set
picking dragLigand broken
+
+
+JmolVersion="14.2.13_2015.05.07"
+
bug fix: x = plane(@1 @2 @3) fails
bug fix: isolated bio groups such as AMP, which are not part of biopolymers,
can result in crashes
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/binding/Binding.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/binding/Binding.java
2015-05-07 21:58:53 UTC (rev 20489)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/binding/Binding.java
2015-05-07 21:59:01 UTC (rev 20490)
@@ -308,7 +308,9 @@
Lst<String>[] names = new Lst[actionInfo.length];
Lst<String[]> user = new Lst<String[]>();
for (Object obj : bindings.values()) {
- if (AU.isAS(obj)) {
+ if (obj instanceof Boolean) {
+ // ignore
+ } else if (AU.isAS(obj)) {
String action = ((String[]) obj)[0];
String script = ((String[]) obj)[1];
if (qlow == null || qlow.indexOf("user") >= 0 || action.indexOf(qlow)
>= 0 || script.indexOf(qlow) >= 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
