From 3e03199a9d2b06def39fbc7d5531649cd5485b5c Mon Sep 17 00:00:00 2001 From: sandman Date: Tue, 18 Jun 2002 17:14:27 +0000 Subject: Improved calibration: 1) Should work on rotated TS controllers (x<->y) 2) Needs only 2 points now (Qt uses only 2 points internally) 3) Reformated source code --- (limited to 'core/apps') diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index 7b60e64..54fa8ec 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -32,212 +32,188 @@ #include -Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : - QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop ) +Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) : + QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop ) { - showCross = TRUE; - const int offset = 30; - QRect desk = qApp->desktop()->geometry(); - setGeometry( 0, 0, desk.width(), desk.height() ); - if ( desk.height() < 250 ) { - int w = desk.height()/3; - logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w)); - } else { - logo = Resource::loadPixmap( "launcher/opielogo" ); - } - cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset ); - cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset ); - cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset ); - cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset ); - cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 ); - goodcd = cd; - reset(); - - timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) ); + showCross = TRUE; + const int offset = 30; + QRect desk = qApp->desktop() ->geometry(); + setGeometry( 0, 0, desk.width(), desk.height() ); + if ( desk.height() < 250 ) { + int w = desk.height() / 3; + logo.convertFromImage( Resource::loadImage( "launcher/opielogo" ).smoothScale( w, w ) ); + } + else { + logo = Resource::loadPixmap( "launcher/opielogo" ); + } + cd.screenPoints[ QWSPointerCalibrationData::TopLeft ] = QPoint( offset, offset ); + cd.screenPoints[ QWSPointerCalibrationData::BottomLeft ] = QPoint( offset, qt_screen->deviceHeight() - offset ); + cd.screenPoints[ QWSPointerCalibrationData::BottomRight ] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset ); + cd.screenPoints[ QWSPointerCalibrationData::TopRight ] = QPoint( qt_screen->deviceWidth() - offset, offset ); + cd.screenPoints[ QWSPointerCalibrationData::Center ] = QPoint( qt_screen->deviceWidth() / 2, qt_screen->deviceHeight() / 2 ); + goodcd = cd; + reset(); + + timer = new QTimer( this ); + connect( timer, SIGNAL( timeout() ), this, SLOT( timeout() ) ); } Calibrate::~Calibrate() { - store(); + store(); } void Calibrate::show() { - grabMouse(); - QWSServer::mouseHandler()->getCalibration(&goodcd); - QWSServer::mouseHandler()->clearCalibration(); - QDialog::show(); + grabMouse(); + QWSServer::mouseHandler() ->getCalibration( &goodcd ); + QWSServer::mouseHandler() ->clearCalibration(); + QDialog::show(); } void Calibrate::store() { - QWSServer::mouseHandler()->calibrate( &goodcd ); + QWSServer::mouseHandler() ->calibrate( &goodcd ); } void Calibrate::hide() { - if ( isVisible() ) - store(); - QDialog::hide(); + if ( isVisible() ) + store(); + QDialog::hide(); } void Calibrate::reset() { - penPos = QPoint(); - location = QWSPointerCalibrationData::TopLeft; - crossPos = fromDevice( cd.screenPoints[location] ); + penPos = QPoint(); + location = QWSPointerCalibrationData::TopLeft; + crossPos = fromDevice( cd.screenPoints[ location ] ); } QPoint Calibrate::fromDevice( const QPoint &p ) { - return qt_screen->mapFromDevice( p, - QSize(qt_screen->deviceWidth(), qt_screen->deviceHeight()) ); + return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) ); } bool Calibrate::sanityCheck() { - QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft]; - QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight]; - QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft]; - QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight]; - - int vl = QABS( tl.y() - bl.y() ); - int vr = QABS( tr.y() - br.y() ); - int diff = QABS( vl - vr ); - int avg = ( vl + vr ) / 2; - if ( diff > avg / 20 ) // 5% leeway - return FALSE; - - int ht = QABS( tl.x() - tr.x() ); - int hb = QABS( br.x() - bl.x() ); - diff = QABS( ht - hb ); - avg = ( ht + hb ) / 2; - if ( diff > avg / 20 ) // 5% leeway - return FALSE; - - return TRUE; -} + QRect r ( cd.devPoints[ QWSPointerCalibrationData::TopLeft ], cd.devPoints[ QWSPointerCalibrationData::BottomRight ] ); + r = r. normalize ( ); // This should also handle rotated TS controllers + + cd. devPoints [QWSPointerCalibrationData::TopRight] = r. topRight ( ); + cd. devPoints [QWSPointerCalibrationData::BottomLeft] = r. bottomLeft ( ); + cd. devPoints [QWSPointerCalibrationData::Center] = r. center ( ); + + return true; +} void Calibrate::moveCrosshair( QPoint pt ) { -/* - QPainter p( this ); - p.drawPixmap( crossPos.x()-8, crossPos.y()-8, saveUnder ); - saveUnder = QPixmap::grabWindow( winId(), pt.x()-8, pt.y()-8, 16, 16 ); - p.drawRect( pt.x()-1, pt.y()-8, 2, 7 ); - p.drawRect( pt.x()-1, pt.y()+1, 2, 7 ); - p.drawRect( pt.x()-8, pt.y()-1, 7, 2 ); - p.drawRect( pt.x()+1, pt.y()-1, 7, 2 ); -*/ - showCross = FALSE; - repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 ); - showCross = TRUE; - crossPos = pt; - repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 ); + showCross = FALSE; + repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); + showCross = TRUE; + crossPos = pt; + repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); } void Calibrate::paintEvent( QPaintEvent * ) { - QPainter p( this ); - - int y; - - if ( !logo.isNull() ) { - y = height() / 2 - logo.height() - 15; - p.drawPixmap( (width() - logo.width())/2, y, logo ); - } - - y = height() / 2 + 15; - - p.drawText( 0, y+height()/8, width(), height() - y, AlignHCenter, - tr("Touch the crosshairs firmly and\n" - "accurately to calibrate your screen.") ); - - QFont f = p.font(); f.setBold(TRUE); - p.setFont( f ); - p.drawText( 0, y, width(), height() - y, AlignHCenter|WordBreak, - tr("Welcome to Opie") ); - -/* - saveUnder = QPixmap::grabWindow( winId(), crossPos.x()-8, crossPos.y()-8, - 16, 16 ); - moveCrosshair( crossPos ); -*/ - if ( showCross ) { - p.drawRect( crossPos.x()-1, crossPos.y()-8, 2, 7 ); - p.drawRect( crossPos.x()-1, crossPos.y()+1, 2, 7 ); - p.drawRect( crossPos.x()-8, crossPos.y()-1, 7, 2 ); - p.drawRect( crossPos.x()+1, crossPos.y()-1, 7, 2 ); - } + QPainter p( this ); + + int y; + + if ( !logo.isNull() ) { + y = height() / 2 - logo.height() - 15; + p.drawPixmap( ( width() - logo.width() ) / 2, y, logo ); + } + + y = height() / 2 + 15; + + p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter, + tr( "Touch the crosshairs firmly and\n" + "accurately to calibrate your screen." ) ); + + QFont f = p.font(); + f.setBold( TRUE ); + p.setFont( f ); + p.drawText( 0, y, width(), height() - y, AlignHCenter | WordBreak, + tr( "Welcome to Opie" ) ); + + if ( showCross ) { + p.drawRect( crossPos.x() - 1, crossPos.y() - 8, 2, 7 ); + p.drawRect( crossPos.x() - 1, crossPos.y() + 1, 2, 7 ); + p.drawRect( crossPos.x() - 8, crossPos.y() - 1, 7, 2 ); + p.drawRect( crossPos.x() + 1, crossPos.y() - 1, 7, 2 ); + } } void Calibrate::mousePressEvent( QMouseEvent *e ) { - // map to device coordinates - QPoint devPos = qt_screen->mapToDevice( e->pos(), - QSize(qt_screen->width(), qt_screen->height()) ); - if ( penPos.isNull() ) - penPos = devPos; - else - penPos = QPoint( (penPos.x() + devPos.x())/2, - (penPos.y() + devPos.y())/2 ); + // map to device coordinates + QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) ); + if ( penPos.isNull() ) + penPos = devPos; + else + penPos = QPoint( ( penPos.x() + devPos.x() ) / 2, + ( penPos.y() + devPos.y() ) / 2 ); } void Calibrate::mouseReleaseEvent( QMouseEvent * ) { - if ( timer->isActive() ) - return; - - bool doMove = TRUE; - - cd.devPoints[location] = penPos; - if ( location < QWSPointerCalibrationData::LastLocation ) { - location = (QWSPointerCalibrationData::Location)((int)location + 1); - } else { - if ( sanityCheck() ) { - reset(); - goodcd = cd; - hide(); - emit accept(); - doMove = FALSE; - } else { - location = QWSPointerCalibrationData::TopLeft; - } - } - - if ( doMove ) { - QPoint target = fromDevice( cd.screenPoints[location] ); - dx = (target.x() - crossPos.x())/10; - dy = (target.y() - crossPos.y())/10; - timer->start( 30 ); - } + if ( timer->isActive() ) + return ; + + bool doMove = TRUE; + + cd.devPoints[ location ] = penPos; + if ( location == QWSPointerCalibrationData::TopLeft ) { + location = QWSPointerCalibrationData::BottomRight; + } + else { + if ( sanityCheck() ) { + reset(); + goodcd = cd; + hide(); + emit accept(); + doMove = FALSE; + } + else { + location = QWSPointerCalibrationData::TopLeft; + } + } + + if ( doMove ) { + QPoint target = fromDevice( cd.screenPoints[ location ] ); + dx = ( target.x() - crossPos.x() ) / 10; + dy = ( target.y() - crossPos.y() ) / 10; + timer->start( 30 ); + } } void Calibrate::timeout() { - QPoint target = fromDevice( cd.screenPoints[location] ); + QPoint target = fromDevice( cd.screenPoints[ location ] ); - bool doneX = FALSE; - bool doneY = FALSE; - QPoint newPos( crossPos.x() + dx, crossPos.y() + dy ); + bool doneX = FALSE; + bool doneY = FALSE; + QPoint newPos( crossPos.x() + dx, crossPos.y() + dy ); - if ( QABS(crossPos.x() - target.x()) <= QABS(dx) ) { - newPos.setX( target.x() ); - doneX = TRUE; - } + if ( QABS( crossPos.x() - target.x() ) <= QABS( dx ) ) { + newPos.setX( target.x() ); + doneX = TRUE; + } - if ( QABS(crossPos.y() - target.y()) <= QABS(dy) ) { - newPos.setY(target.y()); - doneY = TRUE; - } + if ( QABS( crossPos.y() - target.y() ) <= QABS( dy ) ) { + newPos.setY( target.y() ); + doneY = TRUE; + } - if ( doneX && doneY ) { - penPos = QPoint(); - timer->stop(); - } + if ( doneX && doneY ) { + penPos = QPoint(); + timer->stop(); + } - moveCrosshair( newPos ); + moveCrosshair( newPos ); } #endif // _WS_QWS_ -- cgit v0.9.0.2