Now the halflife is displayed. Only the unit remains to be fixed

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=782221

diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp
index 5f2a52a06da220924907b0b557da1e699f3a7958..b2aeb935c1608816725e18fcb197bcea3c4a2878 100644 (file)
--- a/libscience/chemicaldataobject.cpp
+++ b/libscience/chemicaldataobject.cpp
@@ -325,7 +325,7 @@ QString ChemicalDataObject::unitAsString() const
                        return "s";
        }
        
-       bounit = bounit.prepend( "bo:" );
+//     bounit = bounit.prepend( "bo:" );
        
        return bounit;
 }

diff --git a/libscience/isotope.cpp b/libscience/isotope.cpp
index 3e6c4fdb7cf840b62ecb662869ca10a27e0c1f22..7445154c70eb07089a62ca3911c3e2e0c7236973 100644 (file)
--- a/libscience/isotope.cpp
+++ b/libscience/isotope.cpp
@@ -99,6 +99,12 @@ double Isotope::halflife() const
 {
        return m_halflife.value().toDouble();
 }
+
+ChemicalDataObject Isotope::halflifeObject() const
+{
+    return m_halflife;
+}
+
 double Isotope::ecdecay() const
 {
        return m_ecdecay.value().toDouble();

diff --git a/libscience/isotope.h b/libscience/isotope.h
index 5793c2d7632ec40f7d265df69e2f92cc1fce06f4..9746512cd0d0fdfcb6c6f67918b75b5dcee4c803 100644 (file)
--- a/libscience/isotope.h
+++ b/libscience/isotope.h
@@ -88,6 +88,11 @@ class SCIENCE_EXPORT Isotope
                QString abundance() const;              
 
                double halflife() const;
+
+                /**
+                 * @return the ChemicalDataObject of the halflife of the Isotope
+                 */
+                ChemicalDataObject halflifeObject() const;
                
                /**
                 * add the ChemicalDataObject @p o