Changeset 148 for trunk/gui/scripts/units.tcl

Timestamp:

Dec 12, 2005, 9:26:20 PM (19 years ago)

Author:

mmc

Message:

Fixed Rappture::Units::convert to work properly for both "/cm3"
and "cm" types of units. My last fix broke the "cm" case.

File:

• trunk/gui/scripts/units.tcl (modified) (1 diff)

trunk/gui/scripts/units.tcl

@@ -450 +450 @@
     }
     # note: case-insensitive matching for metric prefix
-    if {[regexp {^(/?)([cCmMuUnNpPfFaAkKgGtT]?)([a-zA-Z].+)$} $units match slash prefix tail]} {
+    if {[regexp {^(/?)([cCmMuUnNpPfFaAkKgGtT]?)([a-zA-Z]+[0-9]+|[a-zA-Z]+)$} $units match slash prefix tail]} {
         if {[regexp {^[CUNFAK]$} $prefix]} {
             # we know that these should be lower case