From: Jörg Buchwald <buchwaldj@web.de>
Date: Tue, 26 Jul 2005 13:40:32 +0000 (+0000)
Subject: add ecpercentage
X-Git-Tag: v3.80.2~300^2~20
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=60f20113ba1dd3d7ed52d864b651ad4dd40d5686;p=libqmvoc.git

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 b77bf67..2395f04 100644
--- 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 a612e75..ebd3050 100644
--- 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