* Make use of the SpectrumParser

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

diff --git a/libscience/element.cpp b/libscience/element.cpp
index c186433e9f33aaf955cd513c7b582f2637ed3645..79a735b5e5fca586be4cfd92e77b9370cc9f1650 100644 (file)
--- a/libscience/element.cpp
+++ b/libscience/element.cpp
@@ -19,12 +19,10 @@
  ***************************************************************************/
 
 #include "element.h"
-#include "spectrum.h"
 #include <kdebug.h>
 
 Element::Element()
 {
-    m_spectrum = 0;
 }
 
 QVariant Element::dataAsVariant( ChemicalDataObject::BlueObelisk type ) const
@@ -47,8 +45,6 @@ QString Element::dataAsString(ChemicalDataObject::BlueObelisk type) const
 
 Element::~Element()
 {
-    delete m_spectrum;
-    m_spectrum = 0;
 }
 
 void Element::addData( const ChemicalDataObject& o )

diff --git a/libscience/element.h b/libscience/element.h
index 5ce247bf9e9c9ab4a2556bcde9c0ba7ae860dab9..1681ef7454ea82ec8acc31473a48cec110ff914b 100644 (file)
--- a/libscience/element.h
+++ b/libscience/element.h
@@ -76,21 +76,11 @@ class SCIENCE_EXPORT Element
                        return dataList;
                }
 
-    void setSpectrum( Spectrum * spec ){
-        m_spectrum = spec;
-    }
-
-    Spectrum * spectrum() const{
-        return m_spectrum;
-    }
-
        private:
                /**
                 * this QList stores all information about an element
                 */
                QList<ChemicalDataObject> dataList;
-
-    Spectrum *m_spectrum;
 };
 
 #endif

diff --git a/libscience/spectrumparser.cpp b/libscience/spectrumparser.cpp
index 50250bfeca90efbacdbc15e9fd7398b47e6519e7..0e9e02fa0230cf001a6f6623a854143c2f6fa67c 100644 (file)
--- a/libscience/spectrumparser.cpp
+++ b/libscience/spectrumparser.cpp
@@ -78,11 +78,11 @@ bool SpectrumParser::startElement(const QString&, const QString &localName, cons
                for (int i = 0; i < attrs.length(); ++i) 
                {
                        if (attrs.localName(i) == "xValue"){
-                                d->wavelenght = attrs.value(i).toDouble();
-                        }
-                       else if (attrs.localName(i) == "yValue"){
                                 d->intensity = attrs.value(i).toInt();
                         }
+                        else if (attrs.localName(i) == "yValue"){
+                                d->wavelenght = attrs.value(i).toDouble();
+                        }
                }
                 d->currentPeak = new Spectrum::peak(d->wavelenght, d->intensity);
        }