From: <ha...@us...> - 2008-01-21 01:38:43
|
Revision: 8924 http://jmol.svn.sourceforge.net/jmol/?rev=8924&view=rev Author: hansonr Date: 2008-01-20 17:38:40 -0800 (Sun, 20 Jan 2008) Log Message: ----------- 11.5.3_dev # bug fix: color isosurface when isosurface is an lcaoCartoon only colors one lobe Modified Paths: -------------- trunk/Jmol/src/org/jmol/shape/MeshCollection.java trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/shape/MeshCollection.java =================================================================== --- trunk/Jmol/src/org/jmol/shape/MeshCollection.java 2008-01-21 00:58:06 UTC (rev 8923) +++ trunk/Jmol/src/org/jmol/shape/MeshCollection.java 2008-01-21 01:38:40 UTC (rev 8924) @@ -66,7 +66,7 @@ linkedMesh = currentMesh.linkedMesh; } else { allocMesh(thisID); - } + } if (currentMesh.thisID == null) currentMesh.thisID = myType + (++nUnnamed); previousMeshID = currentMesh.thisID; Modified: trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java =================================================================== --- trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java 2008-01-21 00:58:06 UTC (rev 8923) +++ trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java 2008-01-21 01:38:40 UTC (rev 8924) @@ -273,7 +273,6 @@ if ("finalize" == propertyName) { setScriptInfo(); setJvxlInfo(); - linkedMesh = null; } //surface generator only (return TRUE) or shared (return FALSE) @@ -315,15 +314,16 @@ // processed by meshCollection setPropertySuper(propertyName, value, bs); - } private void setPropertySuper(String propertyName, Object value, BitSet bs) { + } + + private void setPropertySuper(String propertyName, Object value, BitSet bs) { //System.out.println(propertyName + " " + value); //System.out.println(thisMesh + (thisMesh!= null ? thisMesh.thisID : "")); currentMesh = thisMesh; super.setProperty(propertyName, value, bs); thisMesh = (IsosurfaceMesh) currentMesh; jvxlData = (thisMesh == null ? null : thisMesh.jvxlData); - System.out.println("isosurface setpropertysuper thisMesh=" + thisMesh); - } + } public Object getProperty(String property, int index) { if (property == "dataRange") Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-01-21 00:58:06 UTC (rev 8923) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-01-21 01:38:40 UTC (rev 8924) @@ -3582,6 +3582,9 @@ if (changeElementColor(str, argb)) return; invalidArgument(); + case Token.isosurface: + setShapeProperty(JmolConstants.SHAPE_ISOSURFACE, "thisID", JmolConstants.PREVIOUS_MESH_ID); + //fall through default: colorObject(theTok, 2); } Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-01-21 00:58:06 UTC (rev 8923) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-01-21 01:38:40 UTC (rev 8924) @@ -6,9 +6,7 @@ # missing outermost parentheses # bug fix: state: selection state "end function" missing semicolon # bug fix: isosurface lcaoCartoon "pz" translucent not setting both lobes translucent - -############################## - +# bug fix: color isosurface when isosurface is an lcaoCartoon only colors one lobe # bug fix: save state for "color SelectionHalos" # ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |