summaryrefslogtreecommitdiff
path: root/core
authormickeyl <mickeyl>2005-09-03 20:36:38 (UTC)
committer mickeyl <mickeyl>2005-09-03 20:36:38 (UTC)
commit62ae8e732a5d4e5b23d060185c0655b1666be59c (patch) (side-by-side diff)
tree71e6d1530036731274f8ea0262423e74e86fe9f7 /core
parentde950b18690b8981a2bddaca68cbd5d48c71f689 (diff)
downloadopie-62ae8e732a5d4e5b23d060185c0655b1666be59c.zip
opie-62ae8e732a5d4e5b23d060185c0655b1666be59c.tar.gz
opie-62ae8e732a5d4e5b23d060185c0655b1666be59c.tar.bz2
switch to 5-point calibration to make it work on some newer Zaurii
this goes hand in hand with the integration of the RMK tslib calibration algorithm into Qt/Embedded 2.3.x. Patch courtesy Richard Purdie.
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 5f52bdc..53388f1 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -121,13 +121,13 @@ 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];
// not needed anywhere .. just calculate it, so it's there
- cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center();
+ //cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center();
int dlx = QABS( bl. x ( ) - tl. x ( ));
int dly = QABS( bl. y ( ) - tl. y ( ));
int drx = QABS( br. x ( ) - tr. x ( ));
int dry = QABS( br. y ( ) - tr. y ( ));
int dtx = QABS( tr. x ( ) - tl. x ( ));
@@ -172,13 +172,13 @@ void Calibrate::moveCrosshair( QPoint pt )
repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 );
}
void Calibrate::paintEvent( QPaintEvent * )
{
QPainter p( this );
- int y = height() / 3;
+ int y = height() / 2;
p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter,
tr( "Touch the crosshairs firmly and\n"
"accurately to calibrate your screen." ) );
if ( !showCross ) return;
@@ -220,13 +220,13 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * )
if ( timer->isActive() )
return ;
bool doMove = TRUE;
cd.devPoints[ location ] = penPos;
- if ( location < QWSPointerCalibrationData::TopRight ) {
+ if ( location < QWSPointerCalibrationData::Center ) {
location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 );
}
else {
if ( sanityCheck() ) {
reset();
goodcd = cd;