Added more more convientent unit functions.

(bzr r12380.1.27)

2 files changed, 21 insertions, 1 deletions

diff --git a/src/util/units.cpp b/src/util/units.cpp
index ed8fbfa34..ffbd74fdd 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -140,6 +140,12 @@ bool Unit::compatibleWith(const Unit *u) const {
     // Different, incompatible types
     return false;
 }
+bool Unit::compatibleWith(const Glib::ustring u) const
+{
+    static UnitTable unit_table;
+    Unit compatible_unit = unit_table.getUnit(u);
+    return compatibleWith(&compatible_unit);
+}
 
 /** Check if units are equal. */
 bool operator== (const Unit &u1, const Unit &u2) {
@@ -455,11 +461,22 @@ Quantity::Quantity(double q, const Unit *u) {
     unit = u;
     quantity = q;
 }
+Quantity::Quantity(double q, const Glib::ustring u) {
+    UnitTable unit_table;
+    unit = new Unit(unit_table.getUnit(u));
+    quantity = q;
+}
 
 /** Checks if a quantity is compatible with the specified unit. */
 bool Quantity::compatibleWith(const Unit *u) const {
     return unit->compatibleWith(u);
 }
+bool Quantity::compatibleWith(const Glib::ustring u) const
+{
+    static UnitTable unit_table;
+    Unit other_unit = unit_table.getUnit(u);
+    return compatibleWith(&other_unit);
+}
 
 /** Return the quantity's value in the specified unit. */
 double Quantity::value(const Unit *u) const {
diff --git a/src/util/units.h b/src/util/units.h
index f1a5f1e95..ec9435647 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -66,6 +66,7 @@ class Unit {
     int            defaultDigits() const;
 
     bool           compatibleWith(const Unit *u) const;
+    bool           compatibleWith(const Glib::ustring) const;
 
     UnitType       type;
     double         factor;
@@ -87,8 +88,10 @@ public:
     const Unit *unit;
     double quantity;
     
-    Quantity(double q, const Unit *u);   // constructor
+    Quantity(double q, const Unit *u);          // constructor
+    Quantity(double q, const Glib::ustring u);  // constructor
     bool compatibleWith(const Unit *u) const;
+    bool compatibleWith(const Glib::ustring u) const;
     double value(const Unit *u) const;
     double value(const Glib::ustring u) const;