Revision: 18458
http://sourceforge.net/p/jmol/code/18458
Author: hansonr
Date: 2013-07-18 12:19:02 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
___JmolVersion="13.1.19_dev_2013.07.18"
bug fix: set shift_XX not saved in state
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/StateCreator.java
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-07-18 11:28:17 UTC
(rev 18457)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-07-18 12:19:02 UTC
(rev 18458)
@@ -11,6 +11,7 @@
___JmolVersion="13.1.19_dev_2013.07.18"
+bug fix: set shift_XX not saved in state
bug fix: JSmol menu not disappearing upon touch outside menu
bug fix: PyMOL surface map reading error
@@ -23,8 +24,6 @@
bug fix: cartoons with too small nonzero size will not render anything
-TODO: trouble with the Indirect spin coupling... Jmol will visualize them only
within the unit cell
-
code: org.jmol.quantum.NMRCalculation smoothly handles J-coupling and dipolar
coupling constant display.
new feature: unitcell center {atomset}
Modified: trunk/Jmol/src/org/jmol/viewer/StateCreator.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateCreator.java 2013-07-18 11:28:17 UTC
(rev 18457)
+++ trunk/Jmol/src/org/jmol/viewer/StateCreator.java 2013-07-18 12:19:02 UTC
(rev 18458)
@@ -458,15 +458,15 @@
return;
Iterator<String> e = dm.dataValues.keySet().iterator();
SB sb = new SB();
- int n = 0;
+ boolean haveData = false;
if (atomProps.length() > 0) {
- n = 1;
+ haveData = true;
sb.append(atomProps);
}
while (e.hasNext()) {
String name = e.next();
if (name.indexOf("property_") == 0) {
- n++;
+ haveData = true;
Object[] obj = dm.dataValues.get(name);
Object data = obj[1];
if (data != null && ((Integer) obj[3]).intValue() == 1) {
@@ -480,14 +480,14 @@
Object[] obj = dm.dataValues.get(name);
Object data = obj[1];
if (data != null && ((Integer) obj[3]).intValue() == 2) {
- n++;
+ haveData = true;
sb.append("\n").append(Escape.encapsulateData(name, data, 2));
}
} else if (name.indexOf("data3d") == 0) {
Object[] obj = dm.dataValues.get(name);
Object data = obj[1];
if (data != null && ((Integer) obj[3]).intValue() == 3) {
- n++;
+ haveData = true;
sb.append("\n").append(Escape.encapsulateData(name, data, 3));
}
}
@@ -496,12 +496,14 @@
if (dm.userVdws != null) {
String info = dm.getDefaultVdwNameOrData(0, EnumVdw.USER, dm.bsUserVdws);
if (info.length() > 0) {
- n++;
+ haveData = true;
sb.append(info);
}
}
- if (n == 0)
+ if (viewer.nmrCalculation != null)
+ haveData |= viewer.getNMRCalculation().getState(sb);
+ if (!haveData)
return;
if (sfunc != null)
state.append("function _setDataState() {\n");
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-07-18 11:28:17 UTC (rev
18457)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-07-18 12:19:02 UTC (rev
18458)
@@ -10109,7 +10109,7 @@
return (scriptManager != null && scriptManager.isQueueProcessing() ?
Boolean.TRUE : Boolean.FALSE);
}
- private JmolNMRInterface nmrCalculation;
+ JmolNMRInterface nmrCalculation;
public JmolNMRInterface getNMRCalculation() {
return (nmrCalculation == null ? (nmrCalculation = (JmolNMRInterface)
Interface
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
