Diffstat (limited to 'noncore/tools/clock/analogclock.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/clock/analogclock.cpp | 112 |
1 files changed, 62 insertions, 50 deletions
diff --git a/noncore/tools/clock/analogclock.cpp b/noncore/tools/clock/analogclock.cpp index c5f0155..16ecc5c 100644 --- a/noncore/tools/clock/analogclock.cpp +++ b/noncore/tools/clock/analogclock.cpp @@ -22,5 +22,8 @@ +#include <qtopia/global.h> + #include <qlayout.h> #include <qpainter.h> -#include <qtopia/global.h> +#include <qpixmap.h> + @@ -31,5 +34,13 @@ const double deg2rad = 0.017453292519943295769; // pi/180 AnalogClock::AnalogClock( QWidget *parent, const char *name ) - : QFrame( parent, name ), clear(false) + : QFrame( parent, name ) { setMinimumSize(50,50); + + /* initial the buffer pixmap */ + QRect r = contentsRect(); + _pixmap = new QPixmap( r.width(), r.height() ); +} + +AnalogClock::~AnalogClock() { + delete _pixmap; } @@ -41,11 +52,8 @@ QSizePolicy AnalogClock::sizePolicy() const -void AnalogClock::drawContents( QPainter *p ) +void AnalogClock::drawContents( QPainter * ) { -#if !defined(NO_DEBUG) - static bool first = true; - if ( first ) { -// QTOPIA_PROFILE("first paint event"); - first = false; - } -#endif + /* no need to draw... */ + if ( !isVisible() ) + return; + @@ -58,2 +66,11 @@ void AnalogClock::drawContents( QPainter *p ) + /* resize the buffer */ + if ( r.width() != _pixmap->width() || + r.height() != _pixmap->height() ) + _pixmap->resize( r.width(), r.height() ); + + QPainter p; + p.begin( _pixmap ); + + QPoint center( r.x() + r.width() / 2, r.y() + r.height() / 2 ); @@ -76,48 +93,46 @@ void AnalogClock::drawContents( QPainter *p ) - QColor color( clear ? backgroundColor() : black ); - QTime time = clear ? prevTime : currTime; + /* fill the pixmap */ + _pixmap->fill( this, 0, 0 ); - if ( clear && prevTime.secsTo(currTime) > 1 ) { - p->eraseRect( rect() ); - return; - } - if ( !clear ) { - // draw ticks - p->setPen( QPen( color, w_tick ) ); - for ( int i = 0; i < 12; i++ ) - p->drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) ); - } + // draw ticks + QColor color = black; + p.setPen( QPen( color, w_tick ) ); + for ( int i = 0; i < 12; i++ ) + p.drawLine( rotate( center, l1, i * 30 ), rotate( center, l2, i * 30 ) ); - if ( !clear || prevTime.minute() != currTime.minute() || - prevTime.hour() != currTime.hour() ) { - // draw hour pointer - h1 = rotate( center, h1, 30 * ( time.hour() % 12 ) + time.minute() / 2 ); - h2 = rotate( center, h2, 30 * ( time.hour() % 12 ) + time.minute() / 2 ); - p->setPen( color ); - p->setBrush( color ); - drawHand( p, h1, h2 ); - } - if ( !clear || prevTime.minute() != currTime.minute() ) { - // draw minute pointer - m1 = rotate( center, m1, time.minute() * 6 ); - m2 = rotate( center, m2, time.minute() * 6 ); - p->setPen( color ); - p->setBrush( color ); - drawHand( p, m1, m2 ); - } + // draw hour pointer + h1 = rotate( center, h1, 30 * ( currTime.hour() % 12 ) + currTime.minute() / 2 ); + h2 = rotate( center, h2, 30 * ( currTime.hour() % 12 ) + currTime.minute() / 2 ); + p.setPen( color ); + p.setBrush( color ); + drawHand( &p, h1, h2 ); + + + // draw minute pointer + m1 = rotate( center, m1, currTime.minute() * 6 ); + m2 = rotate( center, m2, currTime.minute() * 6 ); + p.setPen( color ); + p.setBrush( color ); + drawHand( &p, m1, m2 ); // draw second pointer - s1 = rotate( center, s1, time.second() * 6 ); - s2 = rotate( center, s2, time.second() * 6 ); - p->setPen( QPen( color, w_sec ) ); - p->drawLine( s1, s2 ); + s1 = rotate( center, s1, currTime.second() * 6 ); + s2 = rotate( center, s2, currTime.second() * 6 ); + p.setPen( QPen( color, w_sec ) ); + p.drawLine( s1, s2 ); // cap - p->setBrush(color); - p->drawEllipse( center.x()-w_hour/2, center.y()-w_hour/2, w_hour, w_hour ); + p.setBrush(color); + p.drawEllipse( center.x()-w_hour/2, center.y()-w_hour/2, w_hour, w_hour ); + + prevTime = currTime; + + p.end(); - if ( !clear ) - prevTime = currTime; + p.begin( this ); + p.drawPixmap( 0, 0, *_pixmap ); + + /* leave */ } @@ -188,5 +203,2 @@ void AnalogClock::display( const QTime& t ) currTime = t; - clear = true; - repaint( false ); - clear = false; repaint( false ); |