Adding changes to the Spectrum-class

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

diff --git a/libscience/spectrum.cpp b/libscience/spectrum.cpp
index 928825c6320ffb1bfd40fc2797eb6d04ed618f16..99b1ec96931ff780327cad380077b9b871f295d1 100644 (file)
--- a/libscience/spectrum.cpp
+++ b/libscience/spectrum.cpp
@@ -98,7 +98,18 @@ QList<double> Spectrum::wavelengths( double min, double max )
        return list;
 }
 
+int Spectrum::parentElementNumber() const
+{
+       return  m_parentElementNumber;
+}
+
 Spectrum::~Spectrum()
 {
     qDeleteAll( m_peaklist );
 }
+
+Spectrum::Spectrum()
+{
+    //FIXME this shouldn't be hardcoded
+    m_parentElementNumber = 16;
+}

diff --git a/libscience/spectrum.h b/libscience/spectrum.h
index 549cc265ae2942afe6d8466e7eb6ed2a634b5788..bf428be1ea33c672ab565a8c92e1566135a0344a 100644 (file)
--- a/libscience/spectrum.h
+++ b/libscience/spectrum.h
@@ -38,7 +38,7 @@ class SCIENCE_EXPORT Spectrum
                /**
                 * This spectrum doesn't belong to any element
                 */
-               Spectrum(){}
+               Spectrum();
                
                /**
                 * public destructor
@@ -109,12 +109,11 @@ class SCIENCE_EXPORT Spectrum
                        return m_peaklist;
                }
 
-               /**
-                * @return the parent element of this spectrum
+                /**
+                * If the spectrum belongs to Iron, this method will return "26"
+                * @return the number of the element the spectrum belongs to
                 */
-               Element* parentElement() { 
-                       return m_parentElement; 
-               }
+               int parentElementNumber() const;
 
                /**
                 * @return the smallest wavelength
@@ -126,12 +125,17 @@ class SCIENCE_EXPORT Spectrum
                 */
                double maxPeak();
 
+                void setParentElementNumber( int num )
+                {
+                    m_parentElementNumber = num;
+                }
+
        private:
                /**
                 * the internal dataset
                 */
                QList<peak*> m_peaklist;
 
-               Element* m_parentElement;
+                int m_parentElementNumber;
 };
 #endif // SPECTRUM_H