Revision: 18590
http://sourceforge.net/p/jmol/code/18590
Author: hansonr
Date: 2013-08-17 18:32:23 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
___JmolVersion="13.3.4_dev_2013.08.17"
new feature: set platformSpeed [0 to 10]
-- basically an expanded "set wireframe OFF" with more options
-- only effected during model rotation
(including mouse dragging, spin, vibration, and animation)
-- value enables
0 [reserved for "auto"]
1 same as "set wireframeRotation off"
2 wireframe and balls
3 ellipsoids
4 geosurfaces
5 cartoons, rockets, trace
6 meshes (draw, isosurface, MO, pmesh, lcaocartoon,
CGO)
7 translucency
8 antialiasDisplay
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/render/BallsRenderer.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/render/BallsRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/BallsRenderer.java 2013-08-17 17:46:37 UTC
(rev 18589)
+++ trunk/Jmol/src/org/jmol/render/BallsRenderer.java 2013-08-17 18:32:23 UTC
(rev 18590)
@@ -37,7 +37,7 @@
@Override
protected boolean render() {
boolean needTranslucent = false;
- if (isExport || viewer.checkMotionRendering(T.balls)) {
+ if (isExport || viewer.checkMotionRendering(T.atoms)) {
Atom[] atoms = modelSet.atoms;
short[] colixes = ((Balls) shape).colixes;
BS bsOK = viewer.getRenderableBitSet();
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-17 17:46:37 UTC
(rev 18589)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-17 18:32:23 UTC
(rev 18590)
@@ -13,7 +13,26 @@
___JmolVersion="13.3.4_dev_2013.08.17"
+new feature: set platformSpeed [0 to 10]
+ -- basically an expanded "set wireframe OFF" with more options
+ -- only effected during model rotation
+ (including mouse dragging, spin, vibration, and animation)
+
+ -- value enables
+ 0 [reserved for "auto"]
+ 1 same as "set wireframeRotation off"
+ 2 wireframe and balls
+ 3 ellipsoids
+ 4 geosurfaces
+ 5 cartoons, rockets, trace
+ 6 meshes (draw, isosurface, MO, pmesh, lcaocartoon,
CGO)
+ 7 translucency
+ 8 antialiasDisplay
+
+FEATURE CHANGE: set wireframeRotation expanded
+
new feature: show ROTATION BEST
+ -- operates on currently selected atoms
-- reports "{quaternion}"
new feature: quaternion("best")
@@ -32,12 +51,9 @@
bug fix: CIF reader does not find Hall name for space groups
-new feature: set platformSpeed [0 to 10] (includes wireframeRotation along
with cartoons and surfaces)
-
bug fix: binding names not included in SHOW MOUSE
bug fix: "single" touch can fire double-click
bug fix: {x}.tensor() command fails when no atom tensors
-FEATURE CHANGE: set wireframeRotation expanded to include bioshapes and
isosurfaces
bug fix: isosurface slab not allowing two different slabs for two diffrent
isosurfaces
bug fix: set wireframeRotation not working ("inMotion" flag not properly read
in Viewer).
bug fix: screen repaints were being requested far too frequently
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-17 17:46:37 UTC (rev
18589)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-17 18:32:23 UTC (rev
18590)
@@ -10299,25 +10299,47 @@
}
}
+ /**
+ * check motion for rendering during mouse movement,
+ * spin, vibration, and animation
+ *
+ * @param tok
+ * @return TRUE if allowed
+ */
public boolean checkMotionRendering(int tok) {
- if (!getInMotion(true))
+ if (!getInMotion(true) &&
+ !transformManager.spinOn &&
+ !transformManager.vibrationOn &&
+ !animationManager.animationOn)
return true;
if (global.wireframeRotation)
return false;
+ int n = 0;
switch (tok) {
- case T.balls:
case T.bonds:
+ case T.atoms:
+ n = 2;
+ break;
case T.ellipsoid:
- return global.platformSpeed >= 3;
+ n = 3;
+ break;
+ case T.geosurface:
+ n = 4;
+ break;
case T.cartoon:
- case T.geosurface:
- return global.platformSpeed >= 5;
+ n = 5;
+ break;
case T.mesh:
+ n = 6;
+ break;
case T.translucent:
+ n = 7;
+ break;
case T.antialiasdisplay:
- return global.platformSpeed >= 8;
+ n = 8;
+ break;
}
- return false;
+ return global.platformSpeed >= n;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
