From: <ha...@us...> - 2007-03-13 04:18:44
|
Revision: 7087 http://svn.sourceforge.net/jmol/?rev=7087&view=rev Author: hansonr Date: 2007-03-12 21:18:43 -0700 (Mon, 12 Mar 2007) Log Message: ----------- 11.1.21 Introduces "real" color translucency color xxxx translucent N where N is 0 to 3. translucent 0 same as Jmol 10.2 translucent 1 1/2 translucency (default) translucent 2 3/4 translucency translucent 3 7/8 translucency (very sheer) Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Dots.java trunk/Jmol/src/org/jmol/viewer/JmolConstants.java trunk/Jmol/src/org/jmol/viewer/Polyhedra.java trunk/Jmol/src/org/jmol/viewer/Sticks.java Modified: trunk/Jmol/src/org/jmol/viewer/Dots.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Dots.java 2007-03-13 03:56:28 UTC (rev 7086) +++ trunk/Jmol/src/org/jmol/viewer/Dots.java 2007-03-13 04:18:43 UTC (rev 7087) @@ -195,11 +195,6 @@ return; } - if ("color" == propertyName) { - super.setProperty(propertyName, value, bs); - return; - } - if ("translucency" == propertyName) { return; // no translucent dots } @@ -255,7 +250,8 @@ colixes[indexI] = Graphics3D.getColix(argb); //all done! return; - } + } + super.setProperty(propertyName, value, bs); } void setSize(int size, BitSet bsSelected) { Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2007-03-13 03:56:28 UTC (rev 7086) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2007-03-13 04:18:43 UTC (rev 7087) @@ -38,7 +38,21 @@ /* * - * + * + 11.1.21 + + Introduces "real" color translucency + + color xxxx translucent N + + where N is 0 to 3. + + translucent 0 same as Jmol 10.2 + translucent 1 1/2 translucency (default) + translucent 2 3/4 translucency + translucent 3 7/8 translucency (very sheer) + + 11.1.20 cleans up axes/boundbox/unitcell business Modified: trunk/Jmol/src/org/jmol/viewer/Polyhedra.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Polyhedra.java 2007-03-13 03:56:28 UTC (rev 7086) +++ trunk/Jmol/src/org/jmol/viewer/Polyhedra.java 2007-03-13 04:18:43 UTC (rev 7087) @@ -165,8 +165,7 @@ // but from Color we need to identify the centers. if ("colorThis" == propertyName && iHaveCenterBitSet) bs = centers; - super.setProperty("color", value, bs); - return; + //allow super } if (propertyName.indexOf("translucency") == 0) { @@ -174,14 +173,15 @@ // but from Color we need to identify the centers. if ("translucencyThis" == propertyName && iHaveCenterBitSet) bs = centers; - super.setProperty("translucency", value, bs); - return; + //allow super } if ("radius" == propertyName) { radius = ((Float) value).floatValue(); return; } + + super.setProperty(propertyName, value, bs); } void deletePolyhedra() { @@ -225,8 +225,9 @@ if (haveBitSetVertices) return; } - } +} + Polyhedron constructBondsPolyhedron(int atomIndex) { Atom atom = atoms[atomIndex]; Bond[] bonds = atom.bonds; Modified: trunk/Jmol/src/org/jmol/viewer/Sticks.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Sticks.java 2007-03-13 03:56:28 UTC (rev 7086) +++ trunk/Jmol/src/org/jmol/viewer/Sticks.java 2007-03-13 04:18:43 UTC (rev 7087) @@ -129,7 +129,6 @@ } return; } - //better not be here super.setProperty(propertyName, value, bsSelected); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |