Pino: This adds the reading of the bo:periodTableBlock

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=472979

diff --git a/libscience/chemicaldataobject.cpp b/libscience/chemicaldataobject.cpp
index fb79b40a6aa65da76cc48a736df96a34bbaae6f4..e9aded52251e19688afdb89982024ebf494e9ad9 100644 (file)
--- a/libscience/chemicaldataobject.cpp
+++ b/libscience/chemicaldataobject.cpp
@@ -115,6 +115,9 @@ QString ChemicalDataObject::dictRef()
                case boilingpoint:
                        botype = "boilingpoint";
                        break;
+               case periodTableBlock:
+                       botype = "periodTableBlock";
+                       break;
        }
        
        botype = botype.prepend( "bo:" );

diff --git a/libscience/chemicaldataobject.h b/libscience/chemicaldataobject.h
index 04d5a1b51f89bb7ebcf13695bf62a7a82051b1aa..7177879d622cfbd801bb067d5fb2f8fa42bea31a 100644 (file)
--- a/libscience/chemicaldataobject.h
+++ b/libscience/chemicaldataobject.h
@@ -53,7 +53,8 @@ class ChemicalDataObject
                        radiusCovalent/**< the covalent radius */,
                        radiusVDW/**< the van der Waals radius */,
                        meltingpoint,
-                       boilingpoint
+                       boilingpoint,
+                       periodTableBlock
                };
 
                /**

diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index f9370ff9cf829f424cfc619ba7a77b7984f0e22f..aea08b3af1d60ac33d64846f3ba5308eee2f95ea 100644 (file)
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -33,7 +33,8 @@ ElementSaxParser::ElementSaxParser()
        inRadiusCovalent_(false),
        inRadiusVDW_(false),
        inBoilingPoint_(false),
-       inMeltingPoint_(false)
+       inMeltingPoint_(false),
+       inPeriodTableBlock_(false)
 {
 }
 
@@ -69,6 +70,8 @@ bool ElementSaxParser::startElement(const QString&, const QString &localName, co
                                inMeltingPoint_ = true;
                        else if (attrs.value(i) == "bo:boilingpoint")
                                inBoilingPoint_ = true;
+                       else if (attrs.value(i) == "bo:periodTableBlock")
+                               inPeriodTableBlock_ = true;
                }
        }
        return true;
@@ -152,6 +155,11 @@ bool ElementSaxParser::characters(const QString &ch)
                type = ChemicalDataObject::boilingpoint; 
                inBoilingPoint_ = false;
        }
+       else if (inPeriodTableBlock_) {
+               value = ch;
+               type = ChemicalDataObject::periodTableBlock; 
+               inPeriodTableBlock_ = false;
+       }
        else//it is a non known value. Do not create a wrong object but return
                return true;
 

diff --git a/libscience/elementparser.h b/libscience/elementparser.h
index 8c388e9db210ea2b3e446c73b186d2149c8d2703..74602a230d86cecab81a5c0cbc3dfbb50e1ed070 100644 (file)
--- a/libscience/elementparser.h
+++ b/libscience/elementparser.h
@@ -46,6 +46,7 @@ class ElementSaxParser : public QXmlDefaultHandler
                         inRadiusCovalent_,
                         inRadiusVDW_,
                         inBoilingPoint_,
-                        inMeltingPoint_;
+                        inMeltingPoint_,
+                        inPeriodTableBlock_;
 };
 #endif // ELEMENTPARSER_H