add ecpercentage

svn path=/trunk/KDE/kdeedu/kalzium/src/isotope.h; revision=438887

diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp
index b77bf6770278500dadb9ba46cc203fd603fa724b..2395f04064b4ffefe192d90c999fcfe09d2e9b5c 100644 (file)
--- a/kalzium/src/isotope.cpp
+++ b/kalzium/src/isotope.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-Isotope::Isotope( int neutrons, int protones,  double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, double alphapercentage, double betaminuspercentage, double betapluspercentage, bool ecdecay, double decayenergy, QString spin, QString magmoment)
+Isotope::Isotope( int neutrons, int protones,  double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double alphapercentage, double betapluspercentage, double betaminuspercentage, double ecpercentage, double decayenergy, QString spin, QString magmoment)
 {
        m_neutrons = neutrons;
        m_protones = protones;
@@ -33,15 +33,16 @@ Isotope::Isotope( int neutrons, int protones,  double percentage, double weight,
        m_alphadecay = alphadecay;
        m_betaplusdecay = betaplusdecay;
        m_betaminusdecay = betaminusdecay;
-
        m_ecdecay = ecdecay;
+       
        m_decayenergy = decayenergy;
        m_spin = spin;
        m_magmoment = magmoment;
 
        m_alphapercentage = alphapercentage;
-       m_betaminusdecay = betaminuspercentage;
-       m_betaplusdecay = betapluspercentage;
+       m_betapluspercentage = betapluspercentage;
+       m_betaminuspercentage = betaminuspercentage;
+       m_ecpercentage = ecpercentage;
 }
 
 QString Isotope::halflifeAsString()

diff --git a/kalzium/src/isotope.h b/kalzium/src/isotope.h
index a612e750b1bea2c4522a23fe10478ef66e6e7974..ebd305027eab57e8db0d92f3ac741bccb5fd80e4 100644 (file)
--- a/kalzium/src/isotope.h
+++ b/kalzium/src/isotope.h
@@ -31,7 +31,7 @@
 class Isotope
 {
        public:
-               Isotope( int neutrons, int protones, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, double alphapercentage, double betaminuspercentage, double betapluspercentage, bool ecdecay, double decayenergy, QString spin, QString magmoment);
+               Isotope( int neutrons, int protones, double percentage, double weight, double halflife, QString format, bool alphadecay, bool betaplusdecay, bool betaminusdecay, bool ecdecay, double alphapercentage, double betaminuspercentage, double betapluspercentage, double ecpercentage, double decayenergy, QString spin, QString magmoment);
 
                bool seconds() const{
                        if ( m_format == "seconds" )
@@ -137,6 +137,13 @@ class Isotope
                double alphapercentage() const{
                        return m_alphapercentage;
                }
+               
+               /**
+                * @return the percentage of the EC decay
+                */
+               double ecpercentage() const{
+                       return m_ecpercentage;
+               }
 
        private:
                /**
@@ -208,6 +215,10 @@ class Isotope
                 * the percentage with which the istope decays as beta-minus
                 */
                double m_betaminuspercentage;
+               /**
+                * the percentage with which the istope decays as EC
+                */
+               double m_ecpercentage;
 };
 
 #endif // ISOTOPE_H