author | mickeyl <mickeyl> | 2005-09-03 20:36:38 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-09-03 20:36:38 (UTC) |
commit | 62ae8e732a5d4e5b23d060185c0655b1666be59c (patch) (unidiff) | |
tree | 71e6d1530036731274f8ea0262423e74e86fe9f7 | |
parent | de950b18690b8981a2bddaca68cbd5d48c71f689 (diff) | |
download | opie-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.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
@@ -62,13 +62,14 @@ | |||
62 | * libopiecore: Add linux pcmcia system abstraction classes (mickeyl) | 62 | * libopiecore: Add linux pcmcia system abstraction classes (mickeyl) |
63 | * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl) | 63 | * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl) |
64 | * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl) | 64 | * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl) |
65 | * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl) | 65 | * libopiecore: Add support for the new Linux Inputsystem Switches type [necessary for auto rotation in 2.6.13] (mickeyl) |
66 | * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl) | 66 | * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl) |
67 | * Fix / Optimize number of scanned directories (ljp) | 67 | * Fix / Optimize number of scanned directories (ljp) |
68 | 68 | * Use five point mouse calibration to make calibrated mouse drivers work on newer Zaurii (rp,mickeyl) | |
69 | |||
69 | 2005-03-25Opie 1.2.0 | 70 | 2005-03-25Opie 1.2.0 |
70 | 71 | ||
71 | Fixed Bugs | 72 | Fixed Bugs |
72 | ---------- | 73 | ---------- |
73 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) | 74 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) |
74 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) | 75 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) |
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() | |||
121 | QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft]; | 121 | QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft]; |
122 | QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight]; | 122 | QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight]; |
123 | QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft]; | 123 | QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft]; |
124 | QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight]; | 124 | QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight]; |
125 | 125 | ||
126 | // not needed anywhere .. just calculate it, so it's there | 126 | // not needed anywhere .. just calculate it, so it's there |
127 | cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center(); | 127 | //cd.devPoints[QWSPointerCalibrationData::Center] = QRect( tl, br ).normalize().center(); |
128 | 128 | ||
129 | int dlx = QABS( bl. x ( ) - tl. x ( )); | 129 | int dlx = QABS( bl. x ( ) - tl. x ( )); |
130 | int dly = QABS( bl. y ( ) - tl. y ( )); | 130 | int dly = QABS( bl. y ( ) - tl. y ( )); |
131 | int drx = QABS( br. x ( ) - tr. x ( )); | 131 | int drx = QABS( br. x ( ) - tr. x ( )); |
132 | int dry = QABS( br. y ( ) - tr. y ( )); | 132 | int dry = QABS( br. y ( ) - tr. y ( )); |
133 | int dtx = QABS( tr. x ( ) - tl. x ( )); | 133 | int dtx = QABS( tr. x ( ) - tl. x ( )); |
@@ -172,13 +172,13 @@ void Calibrate::moveCrosshair( QPoint pt ) | |||
172 | repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); | 172 | repaint( crossPos.x() - 14, crossPos.y() - 14, 28, 28 ); |
173 | } | 173 | } |
174 | 174 | ||
175 | void Calibrate::paintEvent( QPaintEvent * ) | 175 | void Calibrate::paintEvent( QPaintEvent * ) |
176 | { | 176 | { |
177 | QPainter p( this ); | 177 | QPainter p( this ); |
178 | int y = height() / 3; | 178 | int y = height() / 2; |
179 | 179 | ||
180 | p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter, | 180 | p.drawText( 0, y + height() / 8, width(), height() - y, AlignHCenter, |
181 | tr( "Touch the crosshairs firmly and\n" | 181 | tr( "Touch the crosshairs firmly and\n" |
182 | "accurately to calibrate your screen." ) ); | 182 | "accurately to calibrate your screen." ) ); |
183 | 183 | ||
184 | if ( !showCross ) return; | 184 | if ( !showCross ) return; |
@@ -220,13 +220,13 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) | |||
220 | if ( timer->isActive() ) | 220 | if ( timer->isActive() ) |
221 | return ; | 221 | return ; |
222 | 222 | ||
223 | bool doMove = TRUE; | 223 | bool doMove = TRUE; |
224 | 224 | ||
225 | cd.devPoints[ location ] = penPos; | 225 | cd.devPoints[ location ] = penPos; |
226 | if ( location < QWSPointerCalibrationData::TopRight ) { | 226 | if ( location < QWSPointerCalibrationData::Center ) { |
227 | location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 ); | 227 | location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 ); |
228 | } | 228 | } |
229 | else { | 229 | else { |
230 | if ( sanityCheck() ) { | 230 | if ( sanityCheck() ) { |
231 | reset(); | 231 | reset(); |
232 | goodcd = cd; | 232 | goodcd = cd; |