Changeset 80 for trunk

Timestamp:

Sep 30, 2005 5:30:24 PM (19 years ago)

Author:

dkearney

Message:

one good test deserves another... fixed Rappture.Units.convert("5J","meV")

File:

• trunk/src/core/RpUnits.cc (modified) (10 diffs)

trunk/src/core/RpUnits.cc

@@ -777 +777 @@
     double value = val;
     RpUnits* basis = this->getBasis();
+    RpUnits* toBasis = toUnit->getBasis();
     RpUnits* fromUnit = this;
     RpUnits* dictToUnit = NULL;
@@ -809 +810 @@
 
     // find the toUnit in our dictionary.
-
-    dictToUnit = find(toUnit->getUnits());
+    // if the toUnits has a basis, we need to search for the basis
+    // and convert between basis' and then convert again back to the 
+    // original unit.
+    if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+        dictToUnit = find(toBasis->getUnits());
+    }
+    else {
+        dictToUnit = find(toUnit->getUnits());
+    }
 
     // did we find the unit in the dictionary?
@@ -841 +849 @@
 
             value = p->conv->convForwFxnPtr(value);
+            
+            // check to see if we converted to the actual requested unit
+            // or to the requested unit's basis.
+            // if we converted to the requested unit's basis. we need to
+            // do one last conversion from the requested unit's basis back 
+            // to the requested unit.
+            if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+                my_result = 0;
+                value = toBasis->convert(toUnit,value,&my_result);
+                if (my_result != 0) {
+                    if (result) {
+                        *result += 1;
+                    }
+                }
+            }
+            
+            // we can probably remove this
             if (result) {
-                *result = 0;
+                *result += 0;
             }
             break;
@@ -852 +877 @@
 
             value = p->conv->convBackFxnPtr(value);
+            
+            // check to see if we converted to the actual requested unit
+            // or to the requested unit's basis.
+            // if we converted to the requested unit's basis. we need to
+            // do one last conversion from the requested unit's basis back 
+            // to the requested unit.
+            if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+                my_result = 0;
+                value = toBasis->convert(toUnit,value,&my_result);
+                if (my_result != 0) {
+                    if (result) {
+                        *result += 1;
+                    }
+                }
+            }
+            
+            // we can probably remove this
             if (result) {
-                *result = 0;
+                *result += 0;
             }
             break;
@@ -865 +907 @@
     if ( p == NULL) {
         // we did not find the conversion
+        if (result) {
+            *result += 1;
+        }
         return val;
     }
@@ -883 +928 @@
     void* value = val;
     RpUnits* basis = this->getBasis();
+    RpUnits* toBasis = toUnit->getBasis();
     RpUnits* fromUnit = this;
     RpUnits* dictToUnit = NULL;
@@ -915 +961 @@
 
     // find the toUnit in our dictionary.
-
-    dictToUnit = find(toUnit->getUnits());
+    // if the toUnits has a basis, we need to search for the basis
+    // and convert between basis' and then convert again back to the 
+    // original unit.
+    if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+        dictToUnit = find(toBasis->getUnits());
+    }
+    else {
+        dictToUnit = find(toUnit->getUnits());
+    }
 
     // did we find the unit in the dictionary?
@@ -948 +1001 @@
             value = p->conv->convForwFxnPtrVoid(p->conv->convForwData,value);
 
+            // check to see if we converted to the actual requested unit
+            // or to the requested unit's basis.
+            // if we converted to the requested unit's basis. we need to
+            // do one last conversion from the requested unit's basis back 
+            // to the requested unit.
+            if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+                my_result = 0;
+                value = toBasis->convert(toUnit,value,&my_result);
+                if (my_result != 0) {
+                    if (result) {
+                        *result += 1;
+                    }
+                }
+            }
+            
+            // we can probably remove this
             if (result) {
                 *result = 0;
@@ -959 +1028 @@
 
             value = p->conv->convBackFxnPtrVoid(p->conv->convBackData,value);
+
+            // check to see if we converted to the actual requested unit
+            // or to the requested unit's basis.
+            // if we converted to the requested unit's basis. we need to
+            // do one last conversion from the requested unit's basis back 
+            // to the requested unit.
+            if ( (toBasis) && (toBasis->getUnits() != fromUnit->getUnits()) ) {
+                my_result = 0;
+                value = toBasis->convert(toUnit,value,&my_result);
+                if (my_result != 0) {
+                    if (result) {
+                        *result += 1;
+                    }
+                }
+            }
+            
+            // we can probably remove this
             if (result) {
                 *result = 0;
@@ -972 +1058 @@
     if ( p == NULL) {
         // we did not find the conversion
+        if (result) {
+            *result += 1;
+        }
         return val;
     }