From: <ha...@us...> - 2011-12-23 15:10:47
|
Revision: 16633 http://jmol.svn.sourceforge.net/jmol/?rev=16633&view=rev Author: hansonr Date: 2011-12-23 15:10:37 +0000 (Fri, 23 Dec 2011) Log Message: ----------- version=12.2.11_dev # bug fix: changes in defaultDistanceLabel not always preserved in state correctly Modified Paths: -------------- branches/v12_2/Jmol/src/org/jmol/modelset/Measurement.java branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_2/Jmol/src/org/jmol/modelset/Measurement.java =================================================================== --- branches/v12_2/Jmol/src/org/jmol/modelset/Measurement.java 2011-12-23 05:18:27 UTC (rev 16632) +++ branches/v12_2/Jmol/src/org/jmol/modelset/Measurement.java 2011-12-23 15:10:37 UTC (rev 16633) @@ -342,12 +342,17 @@ } private String getLabelString() { - String s = countPlusIndices[0]+":" + ""; + String s = countPlusIndices[0] + ":"; String label = (strFormat != null && strFormat.length() > 2 - && strFormat.indexOf(s)==0? strFormat : viewer - .getDefaultMeasurementLabel(countPlusIndices[0])); + && strFormat.indexOf(s)==0? strFormat : null); + if (label == null) { + strFormat = null; + label = viewer.getDefaultMeasurementLabel(countPlusIndices[0]); + } if (label.indexOf(s)==0) label = label.substring(2); + if (strFormat == null) + strFormat = s + label; return label; } Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2011-12-23 05:18:27 UTC (rev 16632) +++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2011-12-23 15:10:37 UTC (rev 16633) @@ -4,6 +4,7 @@ version=12.2.11_dev +# bug fix: changes in defaultDistanceLabel not always preserved in state correctly # bug fix: parameters can be set to invalid values using xxx = ... instead of set xxx ... # bug fix: (Application) proper Edit...Preferences dialog action This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |