convert magmoment to QString

svn path=/trunk/KDE/kdeedu/kalzium/src/element.cpp; revision=435578

diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index bc41ca5b9e51916271be86914bc3386d59996d60..c193d46311425cb554444582862c1f8385d731c7 100644 (file)
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -610,8 +610,8 @@ EList KalziumDataObject::readData(  QDomDocument &dataDocument )
                        QString ecdecay = iso.attributeNode( "ecdecay" ).value();
                        double decayenergy = iso.attributeNode( "decayenergy" ).value().toDouble();
                        QString spin = iso.attributeNode( "spin" ).value();
-                       double magmoment = iso.attributeNode( "magmoment" ).value().toDouble(); 
-
+                       QString magmoment = iso.attributeNode( "magmoment" ).value();
+                       
                        bool alphadecay_ = false, betaminusdecay_ = false, betaplusdecay_ = false, ecdecay_ = false;
                        if ( betaplusdecay == "true" ) betaplusdecay_ = true;
                        if ( betaminusdecay == "true" ) betaminusdecay_ = true;
@@ -683,7 +683,7 @@ const int KalziumDataObject::numberOfElements() const
        return m_numOfElements;
 }
 
-Isotope::Isotope(  int neutrons, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double decayenergy, QString spin, double magmoment )
+Isotope::Isotope(  int neutrons, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double decayenergy, QString spin, QString magmoment )
 {
        m_neutrons = neutrons;
        m_percentage = percentage;

diff --git a/kalzium/src/element.h b/kalzium/src/element.h
index 7d919ce3d357aba441052791483c1eca2b49daed..a158800d88cce08a1b66080fd2d80fbeccb25e67 100644 (file)
--- a/kalzium/src/element.h
+++ b/kalzium/src/element.h
@@ -45,7 +45,7 @@ typedef QValueList<double> doubleList;
 class Isotope
 {
        public:
-               Isotope( int neutrons, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double decayenergy, QString spin, double magmoment);
+               Isotope( int neutrons, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double decayenergy, QString spin, QString magmoment);
 
                bool seconds() const{
                        if ( m_format == "seconds" )
@@ -101,7 +101,7 @@ class Isotope
                        return m_spin;
                }
                
-               double magmoment() const{
+               QString magmoment() const{
                        return m_magmoment;
                }
 
@@ -156,7 +156,7 @@ class Isotope
                /**
                * magnetic moment
                */
-               double m_magmoment;
+               QString m_magmoment;
 };
 
 /**