From: Carsten Niehaus <cniehaus@gmx.de>
Date: Wed, 5 Mar 2008 20:01:24 +0000 (+0000)
Subject: * I removed the density from the database. After a long discussion we (BlueObelisk... 
X-Git-Tag: v4.0.71~28
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=675685c19ca4b7e6f87b4c7dcc5b0d564d23301d;p=libqmvoc.git

* I removed the density from the database. After a long discussion we (BlueObelisk) agreed that it is a compound property and thus does not belong into Kalzium.

Example: Carbon exists at least in three forms: graphite, diamond and buckyballs (Fullerene). This means I need at least three (3) values for the density as all three forms of carbon are "carbon". The same applies for S, P and many many other elements.

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

diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp
index b2aeb93..736e455 100644
--- a/libscience/chemicaldataobject.cpp
+++ b/libscience/chemicaldataobject.cpp
@@ -276,9 +276,6 @@ QString ChemicalDataObject::dictRef() const
 		case crystalstructure:
 			botype ="crystalstructure";
 			break;
-		case density:
-			botype ="density";
-			break;
 		case dangerSymbol:
 			botype ="dangerSymbol";
 			break;
diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h
index c844339..59733fe 100644
--- a/libscience/chemicaldataobject.h
+++ b/libscience/chemicaldataobject.h
@@ -64,7 +64,6 @@ class SCIENCE_EXPORT ChemicalDataObject
 			crystalstructure/**< own, bcc, hdp, ccp, hcp, fcc, d, sc, tet, rh, or, mono*/,
 			electronicConfiguration/**< the electronic configuration, for example 1s2 for He*/,
 			group/**< This is a value between 1 and 8*/,
-			density/**< The density */,
 			nameOrigin/**< the origin of the name */,
 			orbit/**< the quantumorbit of the element */,
 			period/**< the period of the element */,
diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index 1085869..c6f2e2a 100644
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -47,7 +47,6 @@ class ElementSaxParser::Private
             inFamily( false ),
             inGroup( false ),
             inElectronicconfiguration( false ),
-            inDensity( false ),
             inDangerSymbol( false ),
             inRPhrase( false ),
             inSPhrase( false ),
@@ -89,7 +88,6 @@ class ElementSaxParser::Private
         bool inFamily;
         bool inGroup;
         bool inElectronicconfiguration;
-        bool inDensity;
         bool inDangerSymbol;
         bool inRPhrase;
         bool inSPhrase;
@@ -166,8 +164,6 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co
                 d->inGroup = true;
             else if (attrs.value(i) == "bo:electronicConfiguration")
                 d->inElectronicconfiguration = true;
-            else if (attrs.value(i) == "bo:density")
-                d->inDensity = true;
             else if (attrs.value(i) == "bo:dangerSymbol")
                 d->inDangerSymbol = true;
             else if (attrs.value(i) == "bo:RPhrase")
@@ -334,11 +330,6 @@ bool ElementSaxParser::characters(const QString &ch)
         type = ChemicalDataObject::electronicConfiguration; 
         d->inElectronicconfiguration = false;
     }
-    else if (d->inDensity){
-        value = ch.toDouble();
-        type = ChemicalDataObject::density; 
-        d->inDensity = false;
-    }
     else if (d->inDangerSymbol){
         value = ch;
         type = ChemicalDataObject::dangerSymbol;