Revision: 20962
http://sourceforge.net/p/jmol/code/20962
Author: hansonr
Date: 2016-02-15 20:33:16 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.5.2_2016.02.15"
bug fix: _GEOM_BOND reading in CIF files nonfunctional.
-- broken in 14.3.16_2015.08.11
-- only affects CCDC file reading, as it requires presence of
_ccdc_geom_bond_type
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
2016-02-15 03:09:28 UTC (rev 20961)
+++ branches/v14_4/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
2016-02-15 20:33:16 UTC (rev 20962)
@@ -1527,8 +1527,8 @@
int bondCount = 0;
String name1, name2 = null;
while (parser.getData()) {
- if ((asc.getAtomIndex(name1 = getField(GEOM_BOND_ATOM_SITE_LABEL_1))) < 0
- || (asc.getAtomIndex(getField(GEOM_BOND_ATOM_SITE_LABEL_2))) < 0)
+ if (asc.getAtomIndex(name1 = getField(GEOM_BOND_ATOM_SITE_LABEL_1)) < 0
+ || asc.getAtomIndex(name2 = getField(GEOM_BOND_ATOM_SITE_LABEL_2)) <
0)
continue;
float dx = 0;
String sdist = getField(GEOM_BOND_DISTANCE);
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-15
03:09:28 UTC (rev 20961)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-15
20:33:16 UTC (rev 20962)
@@ -7,8 +7,14 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.2_2016.02.14"
+Jmol.___JmolVersion="14.4.2_2016.02.15"
+bug fix: _GEOM_BOND reading in CIF files nonfunctional.
+ -- broken in 14.3.16_2015.08.11
+ -- only affects CCDC file reading, as it requires presence of
_ccdc_geom_bond_type
+
+JmolVersion="14.4.2_2016.02.14"
+
FEATURE CHANGE: JSmol default for Info._disableInitialConsole changed to true
-- no longer necessary with JSmol_spinner.gif
Modified: trunk/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java 2016-02-15
03:09:28 UTC (rev 20961)
+++ trunk/Jmol/src/org/jmol/adapter/readers/cif/CifReader.java 2016-02-15
20:33:16 UTC (rev 20962)
@@ -1527,8 +1527,8 @@
int bondCount = 0;
String name1, name2 = null;
while (parser.getData()) {
- if ((asc.getAtomIndex(name1 = getField(GEOM_BOND_ATOM_SITE_LABEL_1))) < 0
- || (asc.getAtomIndex(getField(GEOM_BOND_ATOM_SITE_LABEL_2))) < 0)
+ if (asc.getAtomIndex(name1 = getField(GEOM_BOND_ATOM_SITE_LABEL_1)) < 0
+ || asc.getAtomIndex(name2 = getField(GEOM_BOND_ATOM_SITE_LABEL_2)) <
0)
continue;
float dx = 0;
String sdist = getField(GEOM_BOND_DISTANCE);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-15 03:09:28 UTC
(rev 20961)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-15 20:33:16 UTC
(rev 20962)
@@ -64,8 +64,14 @@
TODO: isosurface molecular has an issue with 2gb1
-Jmol.___JmolVersion="14.5.2_2016.02.14"
+Jmol.___JmolVersion="14.5.2_2016.02.15"
+bug fix: _GEOM_BOND reading in CIF files nonfunctional.
+ -- broken in 14.3.16_2015.08.11
+ -- only affects CCDC file reading, as it requires presence of
_ccdc_geom_bond_type
+
+JmolVersion="14.5.2_2016.02.14"
+
FEATURE CHANGE: JSmol default for Info._disableInitialConsole changed to true
-- no longer necessary with JSmol_spinner.gif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
