From: Jörg Buchwald <buchwaldj@web.de>
Date: Tue, 29 Aug 2006 13:56:57 +0000 (+0000)
Subject: added halflife unit
X-Git-Tag: v3.80.2~58
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=7b1e3c971c167a98e4b6bb84719dc8a6a19607e8;p=libqmvoc.git

added halflife unit

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=578509
---

diff --git a/libscience/data/isotopes.xml b/libscience/data/isotopes.xml
index 7f78a59..ce9af97 100644
--- a/libscience/data/isotopes.xml
+++ b/libscience/data/isotopes.xml
@@ -14,7 +14,7 @@
 
   <metadataList>
     <!-- manually updated -->
-
+    <metadata name="dc:contributor" content="Jörg Buchwald" />
     <metadata name="dc:contributor" content="Geoffrey R. Hutchison" />
     <metadata name="dc:contributor" content="Carsten Niehaus" />
     <metadata name="dc:contributor" content="Egon Willighagen" />
@@ -7242,7 +7242,7 @@
 	</isotope>
 	<isotope id="Ce139" number="139" elementType="Ce">
 		<scalar dictRef="bo:exactMass" errorValue="8E-6">138.906653</scalar>
-		<magmoment dictRef="bo:magneticMoment">±0.9</magmoment>
+		<magmoment dictRef="bo:magneticMoment">0.9</magmoment>
 		<halflife dictRef="bo:halfLife" unit="siUnits:s">11892096</halflife>
 		<ecdecay dictRef="bo:ecDecay" percentage="100.0">0.27</ecdecay>
 		<scalar dictRef="bo:atomicNumber">58</scalar>
@@ -7256,7 +7256,7 @@
 	<isotope id="Ce141" number="141" elementType="Ce">
 		<scalar dictRef="bo:exactMass" errorValue="2.6E-6">140.9082763</scalar>
 		<spin dictRef="bo:spin">7/2-</spin>
-		<magmoment dictRef="bo:magneticMoment">±0.97</magmoment>
+		<magmoment dictRef="bo:magneticMoment">0.97</magmoment>
 		<halflife dictRef="bo:halfLife" unit="siUnits:s">2808086.4</halflife>
 		<betaminusdecay dictRef="bo:betaminusDecay" percentage="100.0">0.581</betaminusdecay>
 		<scalar dictRef="bo:atomicNumber">58</scalar>
@@ -7772,7 +7772,7 @@
 	</isotope>
 	<isotope id="Pm149" number="149" elementType="Pm">
 		<scalar dictRef="bo:exactMass" errorValue="4E-6">148.918334</scalar>
-		<magmoment dictRef="bo:magneticMoment">±3.3</magmoment>
+		<magmoment dictRef="bo:magneticMoment">3.3</magmoment>
 		<halflife dictRef="bo:halfLife" unit="siUnits:s">191160</halflife>
 		<betaminusdecay dictRef="bo:betaminusDecay" percentage="100.0">1.073</betaminusdecay>
 		<scalar dictRef="bo:atomicNumber">61</scalar>
@@ -9257,7 +9257,7 @@
 	<isotope id="Yb175" number="175" elementType="Yb">
 		<scalar dictRef="bo:exactMass" errorValue="2.6E-6">174.9412765</scalar>
 		<spin dictRef="bo:spin">7/2-</spin>
-		<magmoment dictRef="bo:magneticMoment">±0.3</magmoment>
+		<magmoment dictRef="bo:magneticMoment">0.3</magmoment>
 		<halflife dictRef="bo:halfLife" unit="siUnits:s">244224</halflife>
 		<betaminusdecay dictRef="bo:betaminusDecay" percentage="100.0">0.467</betaminusdecay>
 		<scalar dictRef="bo:atomicNumber">70</scalar>
@@ -10687,7 +10687,7 @@
 	</isotope>
 	<isotope id="Au195" number="195" elementType="Au">
 		<scalar dictRef="bo:exactMass" errorValue="1.4E-6">194.9650346</scalar>
-		<magmoment dictRef="bo:magneticMoment">±0.148</magmoment>
+		<magmoment dictRef="bo:magneticMoment">0.148</magmoment>
 		<halflife dictRef="bo:halfLife" unit="siUnits:s">16078176</halflife>
 		<ecdecay dictRef="bo:ecDecay" percentage="100.0">0.230</ecdecay>
 		<scalar dictRef="bo:atomicNumber">79</scalar>
@@ -12480,7 +12480,7 @@
 		<scalar dictRef="bo:exactMass" errorValue="2.4E-6">231.035884</scalar>
 		<abundance dictRef="bo:relativeAbundance">100</abundance>
 		<spin dictRef="bo:spin">3/2-</spin>
-		<magmoment dictRef="bo:magneticMoment">±2.01</magmoment>
+		<magmoment dictRef="bo:magneticMoment">2.01</magmoment>
 		<halflife dictRef="bo:halfLife" unit="units:y">32760</halflife>
 		<alphadecay dictRef="bo:alphaDecay" percentage="100.0">5.148</alphadecay>
 		<scalar dictRef="bo:atomicNumber">91</scalar>
diff --git a/libscience/isotopeparser.cpp b/libscience/isotopeparser.cpp
index 7f78ea4..5a8f6f2 100644
--- a/libscience/isotopeparser.cpp
+++ b/libscience/isotopeparser.cpp
@@ -116,6 +116,18 @@ bool IsotopeParser::startElement(const QString&, const QString &localName, const
 		d->inMagMoment = true;
 	} else if (d->inIsotope && localName == "halflife") {
 //X 		kDebug() << "bo:halfLife" << endl;
+		for (int i = 0; i < attrs.length(); ++i) 
+		{
+			if ( attrs.localName( i ) == "unit" )
+			{
+			d->currentDataObject->setUnit( d->currentUnit );
+			continue;
+			}
+			else
+			{
+			d->currentUnit = ChemicalDataObject::noUnit;
+			}
+		}
 		d->inHalfLife = true;
 //X 		if ( d->currentUnit != ChemicalDataObject::noUnit )
 //X 			d->currentDataObject->setUnit( d->currentUnit );