Revision: 20338
http://sourceforge.net/p/jmol/code/20338
Author: hansonr
Date: 2015-02-26 15:24:18 +0000 (Thu, 26 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.12_2015.02.26"
bug fix: writing image of MO fails to write info (Jmol 12 or before)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/OutputManager.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 2015-02-26 15:23:18 UTC
(rev 20337)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-26 15:24:18 UTC
(rev 20338)
@@ -1,5 +1,5 @@
Jmol.___JmolDate="$Date$"
-Jmol.___fullJmolProperties="src/org/jmol/viewer/Jmol.properties"
+Jmol.___fullJmolProperties="src/org/jmol/viewer/J mol.properties"
# THIS IS THE DEVELOPMENT TRUNK
@@ -14,8 +14,12 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.12_2015.02.25c"
+Jmol.___JmolVersion="14.2.12_2015.02.26"
+bug fix: writing image of MO fails to write info (Jmol 12 or before)
+
+JmolVersion="14.3.12_2015.02.25c"
+bug fix: legacy non-XML JVXL files with color mapping should default to RGB
color scheme
bug fix: Jmol 14.1.2_2013.12.13 disabled some mmCIF file reading for non-wwPDB
mmCIF files
Modified: trunk/Jmol/src/org/jmol/viewer/OutputManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/OutputManager.java 2015-02-26 15:23:18 UTC
(rev 20337)
+++ trunk/Jmol/src/org/jmol/viewer/OutputManager.java 2015-02-26 15:24:18 UTC
(rev 20338)
@@ -757,9 +757,6 @@
} else {
int count = getInt(params, "captureCount", 0);
params.put("captureCount", Integer.valueOf(++count));
- if (count == 10)
- System.out.println("outman 10");
-
if ((rootExt = (String[]) params.get("captureRootExt")) !=
null) {
localName = (String) getRootExt(null, rootExt, count);
captureMsg = null;
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-02-26 15:23:18 UTC (rev
20337)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-02-26 15:24:18 UTC (rev
20338)
@@ -826,21 +826,37 @@
* @return enough data to update a WebGL view
*
*/
+ @SuppressWarnings("unused")
public Object getGLmolView() {
- @SuppressWarnings("unused")
TransformManager tm = this.tm;
+ T3 center = tm.fixedRotationCenter;
+ Quat q = tm.getRotationQ();
+ float xtrans = tm.xTranslationFraction;
+ float ytrans = tm.yTranslationFraction;
+ float scale = tm.scalePixelsPerAngstrom;
+ float zoom = tm.zmPctSet;
+ float cd = tm.cameraDistance;
+ float pc = tm.screenPixelCount;
+ boolean pd = tm.perspectiveDepth;
+ int width = tm.width;
+ int height = tm.height;
+
/**
* @j2sNative
*
- * return { center:tm.fixedRotationCenter,
- * quaternion:tm.getRotationQuaternion(),
- * xtrans:tm.xTranslationFraction,
- * ytrans:tm.yTranslationFraction,
- * scale:tm.scalePixelsPerAngstrom, zoom:tm.zoomPercent,
- * cameraDistance:tm.cameraDistance,
- * pixelCount:tm.screenPixelCount,
- * perspective:tm.perspectiveDepth, width:tm.width,
- * height:tm.height };
+ * return {
+ * center:center,
+ * quaternion:q,
+ * xtrans:xtrans,
+ * ytrans:ytrans,
+ * scale:scale,
+ * zoom:zoom,
+ * cameraDistance:cd,
+ * pixelCount:pc,
+ * perspective:pd,
+ * width:width,
+ * height:height
+ * };
*/
{
return null;
@@ -3321,8 +3337,7 @@
&& checkMotionRendering(T.antialiasdisplay)
: isImageWrite && !isExport ? g.antialiasImages : false);
imageFontScaling = (isReset || width <= 0 ? 1
- : (g.zoomLarge == (height > width) ? height : width) / getScreenDim())
- * (antialiased ? 2 : 1);
+ : (antialiased ? 2 : 1) * (g.zoomLarge == (height > width) ? height :
width) / getScreenDim());
if (width > 0) {
dimScreen.width = width;
dimScreen.height = height;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
