Revision: 20070
http://sourceforge.net/p/jmol/code/20070
Author: hansonr
Date: 2014-10-14 00:53:12 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
{*}.modo.all reports current modulation
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/util/ModulationSet.java
trunk/Jmol/src/org/jmol/util/ModulationSet.java
Modified: branches/v14_2/Jmol/src/org/jmol/util/ModulationSet.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/util/ModulationSet.java 2014-10-14
00:33:47 UTC (rev 20069)
+++ branches/v14_2/Jmol/src/org/jmol/util/ModulationSet.java 2014-10-14
00:53:12 UTC (rev 20070)
@@ -428,8 +428,8 @@
return P3.new3((float) ta[0][0], (modDim > 1 ? (float) ta[1][0] : 0),
(modDim > 2 ? (float) ta[2][0] : 0));
case 'O':
- // return vOcc
- return Float.valueOf(modTemp.calculate(tuv, false).vOcc * 100);
+ // return vOcc current or calculated
+ return Float.valueOf((tuv == null ? vOcc : modTemp.calculate(tuv,
false).vOcc) * 100);
}
return null;
}
Modified: trunk/Jmol/src/org/jmol/util/ModulationSet.java
===================================================================
--- trunk/Jmol/src/org/jmol/util/ModulationSet.java 2014-10-14 00:33:47 UTC
(rev 20069)
+++ trunk/Jmol/src/org/jmol/util/ModulationSet.java 2014-10-14 00:53:12 UTC
(rev 20070)
@@ -428,8 +428,8 @@
return P3.new3((float) ta[0][0], (modDim > 1 ? (float) ta[1][0] : 0),
(modDim > 2 ? (float) ta[2][0] : 0));
case 'O':
- // return vOcc
- return Float.valueOf(modTemp.calculate(tuv, false).vOcc * 100);
+ // return vOcc current or calculated
+ return Float.valueOf((tuv == null ? vOcc : modTemp.calculate(tuv,
false).vOcc) * 100);
}
return null;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://p.sf.net/sfu/Zoho
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
