Revision: 18357
http://sourceforge.net/p/jmol/code/18357
Author: hansonr
Date: 2013-06-23 22:18:48 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
___JmolVersion="13.1.17_dev_2013.06.23"
bug fix: set defaultDrawArrowScale broken
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
trunk/Jmol/src/org/jmol/shape/Mesh.java
trunk/Jmol/src/org/jmol/shapespecial/Draw.java
trunk/Jmol/src/org/jmol/shapespecial/DrawMesh.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2013-06-23
16:34:18 UTC (rev 18356)
+++ trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2013-06-23
22:18:48 UTC (rev 18357)
@@ -428,7 +428,7 @@
}
private float getArrowScale() {
- float fScale = dmesh.scale;
+ float fScale = (dmesh.isScaleSet ? dmesh.scale : 0);
if (fScale == 0)
fScale = viewer.getFloat(T.defaultdrawarrowscale) * (dmesh.connections
== null ? 1f : 0.5f);
if (fScale <= 0)
Modified: trunk/Jmol/src/org/jmol/shape/Mesh.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/Mesh.java 2013-06-23 16:34:18 UTC (rev
18356)
+++ trunk/Jmol/src/org/jmol/shape/Mesh.java 2013-06-23 22:18:48 UTC (rev
18357)
@@ -68,7 +68,6 @@
public boolean visible = true;
public int lighting = T.frontlit;
- public float scale = 1;
public boolean haveXyPoints;
public int diameter;
public float width;
@@ -123,8 +122,11 @@
// System.out.println("Mesh " + this + " finalized");
//}
+ public void clear(String meshType) {
+ clearMesh(meshType);
+ }
- public void clear(String meshType) {
+ public void clearMesh(String meshType) {
altVertices = null;
bsDisplay = null;
bsSlabDisplay = null;
@@ -147,7 +149,6 @@
normixes = null;
polygonIndexes = null;
polygonTranslucencies = null;
- scale = 1;
scale3d = 0;
showContourLines = false;
showPoints = false;
Modified: trunk/Jmol/src/org/jmol/shapespecial/Draw.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2013-06-23 16:34:18 UTC
(rev 18356)
+++ trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2013-06-23 22:18:48 UTC
(rev 18357)
@@ -1036,6 +1036,7 @@
return;
float f = newScale / dmesh.scale;
dmesh.scale = newScale;
+ dmesh.isScaleSet = true;
if (dmesh.isRenderScalable())
return; // done in renderer
V3 diff = new V3();
@@ -1344,7 +1345,7 @@
str.append(" noHead");
else if (dmesh.isBarb)
str.append(" barb");
- if (dmesh.scale != 1
+ if (dmesh.scale != 1 && dmesh.isScaleSet
&& (dmesh.haveXyPoints || dmesh.connections != null || dmesh.drawType
== EnumDrawType.CIRCLE || dmesh.drawType == EnumDrawType.ARC))
str.append(" scale ").appendF(dmesh.scale);
if (dmesh.width != 0)
Modified: trunk/Jmol/src/org/jmol/shapespecial/DrawMesh.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/DrawMesh.java 2013-06-23 16:34:18 UTC
(rev 18356)
+++ trunk/Jmol/src/org/jmol/shapespecial/DrawMesh.java 2013-06-23 22:18:48 UTC
(rev 18357)
@@ -55,8 +55,18 @@
public float drawArrowScale;
public boolean noHead;
public boolean isBarb;
+
+ public float scale = 1;
+ public boolean isScaleSet;
+
+
+ @Override
+ public void clear(String meshType) {
+ clearMesh(meshType);
+ scale = 1;
+ isScaleSet = false;
+ }
-
public BS bsMeshesVisible = new BS();
void setCenters() {
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-23 16:34:18 UTC
(rev 18356)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-23 22:18:48 UTC
(rev 18357)
@@ -9,8 +9,10 @@
# The quotes above look odd for a parameter file, but they are
# important for the JavaScript version of Jmol.
-___JmolVersion="13.1.17_dev_2013.06.21"
+___JmolVersion="13.1.17_dev_2013.06.23"
+bug fix: set defaultDrawArrowScale broken
+
TODO: PyMOL uniqueAtomSettings for transparency
-- will require by-vertex translucent option
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
