More work on the spectrum widget, that now should work well (even if "a bit" of

flickering still remains...)

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

diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 4720d399ddb4b23c61030e75703c466800261838..60f5d8c452a4192dbef4d89e6df0a6311faee8b3 100644 (file)
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -26,7 +26,7 @@ SpectrumWidget::SpectrumWidget( QWidget* parent, const char* name )
        : QWidget( parent,name )
 {
        startValue = 450;
-       endValue = 760;
+       endValue = 700;
 
        m_realWidth = 360;
        m_realHeight = 200;
@@ -35,6 +35,8 @@ SpectrumWidget::SpectrumWidget( QWidget* parent, const char* name )
        spectrumpix += "kalzium/data/spektrum.png";
 
        ref_image = QImage( spectrumpix );
+
+       m_stretch = 1;
 }
 
 SpectrumWidget::~SpectrumWidget(){}
@@ -45,6 +47,11 @@ void SpectrumWidget::paintEvent( QPaintEvent * /*e*/ )
        p.begin( this );
        p.fillRect( 0, 0, width(), height(), paletteBackgroundColor() ); 
        p.drawRect( 0,0, width(), height() );
+       QImage i = ref_image;
+       QPixmap px;
+       px.convertFromImage( i.smoothScale( width(), height() ) );
+       m_stretch = ( width() * 1.0 ) / ref_image.width();
+       bitBlt( this, 0, 0, &px );
        drawLines(  &p );
 }
 
@@ -62,6 +69,7 @@ void SpectrumWidget::drawLines( QPainter *p )
        //(255,231,49) is for 600 nm
        //(246,144,49) is for 650 nm
        
+/*
        for(int h = 450; h < 760 ; ++h)
        {
                p->setPen(linecolor(h) );
@@ -69,6 +77,7 @@ void SpectrumWidget::drawLines( QPainter *p )
        }
                
        p->setPen(Qt::black);
+*/
 
        int i = 0;
        for ( QValueList<double>::Iterator it = m_spectra.begin();
@@ -99,10 +108,14 @@ void SpectrumWidget::drawLines( QPainter *p )
 
 int SpectrumWidget::xPos( double value )
 {
+/*
        double var = ( endValue-startValue );
        double coeff = ( value - startValue )/var;
 
        return coeff * m_realWidth;
+*/
+       int proportion = width() * ( value - startValue ) / ( endValue - startValue );
+       return proportion;
 }
 
 QColor SpectrumWidget::linecolor( double spectrum )
@@ -112,7 +125,7 @@ QColor SpectrumWidget::linecolor( double spectrum )
 
        //Example: Freq is 600nm. 760-450 = 360.
        //760 - 600 = 160.   360/160 = 2.25
-       int proportion = m_realWidth * ( spectrum - startValue ) / ( endValue - startValue );
+       int proportion = m_stretch * ( spectrum - startValue ) / ( endValue - startValue );
 
        QRgb rgb = ref_image.pixel(proportion, 2 );
 

diff --git a/kalzium/src/spectrum.h b/kalzium/src/spectrum.h
index 4bf2871cbf7e02bc38fa669634f63cc5bf7c304d..b22ee5210b5f00c24db21713a0203afd7fa83152 100644 (file)
--- a/kalzium/src/spectrum.h
+++ b/kalzium/src/spectrum.h
@@ -66,10 +66,12 @@ class SpectrumWidget : public QWidget
        
                double startValue;
                double endValue;
-       
+
                int m_realWidth;
                int m_realHeight;
 
+               double m_stretch;
+       
        protected:
                virtual void paintEvent( QPaintEvent *e );
 };