| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 60 |
1 files changed, 18 insertions, 42 deletions
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 @@ -43,5 +43,6 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : int w = desk.height()/3; logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w)); - } else { + } + else { logo = Resource::loadPixmap( "launcher/opielogo" ); } @@ -92,43 +93,21 @@ void Calibrate::reset() 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; + QRect r ( cd.devPoints[ QWSPointerCalibrationData::TopLeft ], cd.devPoints[ QWSPointerCalibrationData::BottomRight ] ); + r = r. normalize ( ); // This should also handle rotated TS controllers - 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; + cd. devPoints [QWSPointerCalibrationData::TopRight] = r. topRight ( ); + cd. devPoints [QWSPointerCalibrationData::BottomLeft] = r. bottomLeft ( ); + cd. devPoints [QWSPointerCalibrationData::Center] = r. center ( ); - return TRUE; + 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 ); @@ -155,14 +134,10 @@ void Calibrate::paintEvent( QPaintEvent * ) "accurately to calibrate your screen.") ); - QFont f = p.font(); f.setBold(TRUE); + 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 ); @@ -176,6 +151,5 @@ void Calibrate::mousePressEvent( QMouseEvent *e ) { // map to device coordinates - QPoint devPos = qt_screen->mapToDevice( e->pos(), - QSize(qt_screen->width(), qt_screen->height()) ); + QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) ); if ( penPos.isNull() ) penPos = devPos; @@ -193,7 +167,8 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) cd.devPoints[location] = penPos; - if ( location < QWSPointerCalibrationData::LastLocation ) { - location = (QWSPointerCalibrationData::Location)((int)location + 1); - } else { + if ( location == QWSPointerCalibrationData::TopLeft ) { + location = QWSPointerCalibrationData::BottomRight; + } + else { if ( sanityCheck() ) { reset(); @@ -202,5 +177,6 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) emit accept(); doMove = FALSE; - } else { + } + else { location = QWSPointerCalibrationData::TopLeft; } |