[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/datamodel Measurement.java,1.9,1.10

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7755/src/org/openscience/jmol/viewer/datamodel

Modified Files:
	Measurement.java 
Log Message:
default distance measurement is now nanometers


Index: Measurement.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Measurement.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Measurement.java	16 Jun 2004 13:33:50 -0000	1.9
+++ Measurement.java	13 Jul 2004 16:10:50 -0000	1.10
@@ -108,8 +108,9 @@
 
   String formatDistance(float dist) {
     dist = (int)(dist * 1000 + 0.5f);
-    dist /= 1000;
-    return "" + dist + '\u00C5';
+    return frame.viewer.getMeasureDistanceInAngstroms()
+      ? "" + (dist / 1000) + '\u00C5'
+      : "" + (dist / 100) + " nm";
   }
 
   String formatAngle(float angle) {