minmal stuff, to tired to continue

svn path=/trunk/KDE/kdeedu/kalzium/src/spectrum.h; revision=435595

diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 53564d3692eb05711abb5faad5d3b57e057eee9a..4340c550490f680a2bfc13f89719522452efcbf5 100644 (file)
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -61,9 +61,6 @@ SpectrumWidget::SpectrumWidget( QWidget* parent, const char* name )
        Gamma = 0.8;
        IntensityMax = 255,
        
-       startValue = 400;
-       endValue = 700;
-
        m_realWidth = 360;
        m_realHeight = 200;
 
@@ -190,7 +187,7 @@ void SpectrumWidget::drawTickmarks( QPainter* p )
        int start = (int)startValue % 10;
        double dist =  width()/(endValue-startValue) * 10;      //distance between the tickles in px
 
-       int count = startValue - start + 10;
+       int count = ( int )startValue - start + 10;
        start *= width()/(endValue-startValue);
 
        for ( int i = start; i < width(); i += dist )
@@ -285,11 +282,15 @@ QColor SpectrumWidget::linecolor( double spectrum )
        return c;
 }
 
-SpectrumView::SpectrumView( QWidget *parent, const char* name )
+SpectrumView::SpectrumView( Spectrum *spec, QWidget *parent, const char* name )
        : QWidget( parent, name )
 {
+       m_spectrum = spec;
+       
        QVBoxLayout *spectrumLayout = new QVBoxLayout( this );
        m_spectrumWidget = new SpectrumWidget( this, "spectrum" );
+       m_spectrumWidget->setBorders( spec->min(), spec->max() );
+       
        spectrumLayout->addWidget( m_spectrumWidget );
 
        QHBoxLayout *hbox = new QHBoxLayout( this );

diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h
index 34fc98084c74a9a7326bfec5503d38d8958a7b65..251615d4c6b950caff17fa9a475c2cf6a127050d 100644 (file)
--- a/kalzium/src/spectrum.h
+++ b/kalzium/src/spectrum.h
@@ -30,7 +30,6 @@
 
 #include <kimageeffect.h>
 #include <kdebug.h>
-#include <kpixmapeffect.h>
 #include <kcombobox.h>
 
 #include "element.h"
@@ -71,6 +70,14 @@ class Spectrum
                        m_bandlist.append( b );
                }
 
+               double min() const{
+                       return m_min;
+               }
+               
+               double max() const{
+                       return m_max;
+               }
+
        private:
                /**
                 * @return the smallest wavelength
@@ -111,8 +118,8 @@ class SpectrumWidget : public QWidget
                 * @param right the right border
                 */
                void setBorders( double left, double right ){
-                       startValue = left;
-                       endValue = right;
+                       startValue = ( int )left;
+                       endValue = ( int )right;
                }
                
                /**
@@ -260,11 +267,7 @@ class SpectrumView : public QWidget
        Q_OBJECT
 
        public: 
-               SpectrumView( QWidget* parent, const char* name );
-
-               void setSpectra( Spectrum* spec ){
-                       m_spectrum = spec;
-               }
+               SpectrumView( Spectrum *spec, QWidget* parent, const char* name );
 
        private:
                SpectrumWidget *m_spectrumWidget;