Changeset 593

Timestamp:

Feb 25, 2007, 9:29:26 PM (18 years ago)

Author:

dkearney

Message:

added miles as units understood by rappture

Location:

trunk/src/core

Files:

• RpUnits.cc (modified) (3 diffs)
• RpUnitsStd.cc (modified) (1 diff)
• RpUnitsStd.h (modified) (1 diff)

trunk/src/core/RpUnits.cc

@@ -2609 +2609 @@
     RpUnits* feet       = NULL;
     RpUnits* yard       = NULL;
+    RpUnits* mile       = NULL;
 
     meters     = RpUnits::define("m", NULL, RP_TYPE_LENGTH, RPUNITS_METRIC);
@@ -2615 +2616 @@
     feet       = RpUnits::define("ft", inch, RP_TYPE_LENGTH);
     yard       = RpUnits::define("yd", inch, RP_TYPE_LENGTH);
+    mile       = RpUnits::define("mi", inch, RP_TYPE_LENGTH);
 
     // RpUnits::makeMetric(meters);
@@ -2623 +2625 @@
     RpUnits::define(inch, yard, inch2yard, yard2inch);
     RpUnits::define(inch, meters, inch2meter, meter2inch);
+    RpUnits::define(inch, mile, inch2mile, mile2inch);
 
     return 0;

trunk/src/core/RpUnitsStd.cc

@@ -230 +230 @@
 }
 
+double inch2mile (double inch)
+{
+    return (inch/(63360));
+}
+
+double mile2inch (double mi)
+{
+    return (mi*(63360));
+}
+
 /****************************************
  * TEMPERATURE CONVERSIONS

trunk/src/core/RpUnitsStd.h

@@ -62 +62 @@
 double inch2yard (double inch);
 double yard2inch (double yd);
+double inch2mile (double inch);
+double mile2inch (double yd);