summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-25 21:19:29 (UTC)
committer sandman <sandman>2002-06-25 21:19:29 (UTC)
commit27d9215054a51c1d605e0f4e77abcee3c96e8270 (patch) (unidiff)
tree4ece274016a03911beaa9fd2e011440a6af10877
parentd64bb324d4b617479dab8bf967f954a66f0faa29 (diff)
downloadopie-27d9215054a51c1d605e0f4e77abcee3c96e8270.zip
opie-27d9215054a51c1d605e0f4e77abcee3c96e8270.tar.gz
opie-27d9215054a51c1d605e0f4e77abcee3c96e8270.tar.bz2
Fix for the calibration routine I broke with my latest "enhancement"
(it is not that trivial to detect all sort of rotations and permutations of the x and y axis)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp52
1 files changed, 42 insertions, 10 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 54fa8ec..1f4fb1b 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -76,56 +76,88 @@ void Calibrate::store()
76 QWSServer::mouseHandler() ->calibrate( &goodcd ); 76 QWSServer::mouseHandler() ->calibrate( &goodcd );
77} 77}
78 78
79void Calibrate::hide() 79void Calibrate::hide()
80{ 80{
81 if ( isVisible() ) 81 if ( isVisible() )
82 store(); 82 store();
83 QDialog::hide(); 83 QDialog::hide();
84} 84}
85 85
86void Calibrate::reset() 86void Calibrate::reset()
87{ 87{
88 penPos = QPoint(); 88 penPos = QPoint();
89 location = QWSPointerCalibrationData::TopLeft; 89 location = QWSPointerCalibrationData::TopLeft;
90 crossPos = fromDevice( cd.screenPoints[ location ] ); 90 crossPos = fromDevice( cd.screenPoints[ location ] );
91} 91}
92 92
93QPoint Calibrate::fromDevice( const QPoint &p ) 93QPoint Calibrate::fromDevice( const QPoint &p )
94{ 94{
95 return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) ); 95 return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) );
96} 96}
97 97
98bool Calibrate::sanityCheck() 98bool Calibrate::sanityCheck()
99{ 99{
100 QRect r ( cd.devPoints[ QWSPointerCalibrationData::TopLeft ], cd.devPoints[ QWSPointerCalibrationData::BottomRight ] ); 100 QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft];
101 r = r. normalize ( ); // This should also handle rotated TS controllers 101 QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight];
102 102 QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft];
103 cd. devPoints [QWSPointerCalibrationData::TopRight] = r. topRight ( ); 103 QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight];
104 cd. devPoints [QWSPointerCalibrationData::BottomLeft] = r. bottomLeft ( ); 104
105 cd. devPoints [QWSPointerCalibrationData::Center] = r. center ( ); 105 // not needed anywhere .. just calculate it, so it's there
106 106 cd. devPoints [QWSPointerCalibrationData::Center] = QRect ( tl, br ). normalize ( ). center ( );
107 return true; 107
108 int dlx = QABS( bl. x ( ) - tl. x ( ));
109 int dly = QABS( bl. y ( ) - tl. y ( ));
110 int drx = QABS( br. x ( ) - tr. x ( ));
111 int dry = QABS( br. y ( ) - tr. y ( ));
112 int dtx = QABS( tr. x ( ) - tl. x ( ));
113 int dty = QABS( tr. y ( ) - tl. y ( ));
114 int dbx = QABS( br. x ( ) - bl. x ( ));
115 int dby = QABS( br. y ( ) - bl. y ( ));
116
117 int dl = (int) ::sqrt (( dlx * dlx ) + ( dly * dly )); // calculate vector lengths for all sides
118 int dr = (int) ::sqrt (( drx * drx ) + ( dry * dry ));
119 int dt = (int) ::sqrt (( dtx * dtx ) + ( dty * dty ));
120 int db = (int) ::sqrt (( dbx * dbx ) + ( dby * dby ));
121
122 // Calculate leeway for x/y (we do not care if diff1/diff2 is for x or y here !)
123 int diff1 = QABS( dl - dr );
124 int avg1 = ( dl + dr ) / 2;
125 int diff2 = QABS( dt - db );
126 int avg2 = ( dt + db ) / 2;
127
128 // Calculate leeway for "real" vector length against "manhattan" vector length
129 // This is a check, if the rect is rotated (other then 0/90/180/270)
130 // It needs to be performed only for the triange (bl, tl, tr)
131 int diff3 = QABS(( dlx + dly + dtx + dty ) - ( dl + dt ));
132 int avg3 = (( dlx + dly + dtx + dty ) + ( dl + dt )) / 2;
133
134 if (( diff1 > ( avg1 / 20 )) || // 5% leeway
135 ( diff2 > ( avg2 / 20 )) ||
136 ( diff3 > ( avg3 / 20 )))
137 return false;
138 else
139 return true;
108 } 140 }
109 141
110void Calibrate::moveCrosshair( QPoint pt ) 142void Calibrate::moveCrosshair( QPoint pt )
111{ 143{
112 showCross = FALSE; 144 showCross = FALSE;
113 repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); 145 repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 );
114 showCross = TRUE; 146 showCross = TRUE;
115 crossPos = pt; 147 crossPos = pt;
116 repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 ); 148 repaint( crossPos.x() - 8, crossPos.y() - 8, 16, 16 );
117} 149}
118 150
119void Calibrate::paintEvent( QPaintEvent * ) 151void Calibrate::paintEvent( QPaintEvent * )
120{ 152{
121 QPainter p( this ); 153 QPainter p( this );
122 154
123 int y; 155 int y;
124 156
125 if ( !logo.isNull() ) { 157 if ( !logo.isNull() ) {
126 y = height() / 2 - logo.height() - 15; 158 y = height() / 2 - logo.height() - 15;
127 p.drawPixmap( ( width() - logo.width() ) / 2, y, logo ); 159 p.drawPixmap( ( width() - logo.width() ) / 2, y, logo );
128 } 160 }
129 161
130 y = height() / 2 + 15; 162 y = height() / 2 + 15;
131 163
@@ -145,50 +177,50 @@ void Calibrate::paintEvent( QPaintEvent * )
145 p.drawRect( crossPos.x() - 8, crossPos.y() - 1, 7, 2 ); 177 p.drawRect( crossPos.x() - 8, crossPos.y() - 1, 7, 2 );
146 p.drawRect( crossPos.x() + 1, crossPos.y() - 1, 7, 2 ); 178 p.drawRect( crossPos.x() + 1, crossPos.y() - 1, 7, 2 );
147 } 179 }
148} 180}
149 181
150void Calibrate::mousePressEvent( QMouseEvent *e ) 182void Calibrate::mousePressEvent( QMouseEvent *e )
151{ 183{
152 // map to device coordinates 184 // map to device coordinates
153 QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) ); 185 QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) );
154 if ( penPos.isNull() ) 186 if ( penPos.isNull() )
155 penPos = devPos; 187 penPos = devPos;
156 else 188 else
157 penPos = QPoint( ( penPos.x() + devPos.x() ) / 2, 189 penPos = QPoint( ( penPos.x() + devPos.x() ) / 2,
158 ( penPos.y() + devPos.y() ) / 2 ); 190 ( penPos.y() + devPos.y() ) / 2 );
159} 191}
160 192
161void Calibrate::mouseReleaseEvent( QMouseEvent * ) 193void Calibrate::mouseReleaseEvent( QMouseEvent * )
162{ 194{
163 if ( timer->isActive() ) 195 if ( timer->isActive() )
164 return ; 196 return ;
165 197
166 bool doMove = TRUE; 198 bool doMove = TRUE;
167 199
168 cd.devPoints[ location ] = penPos; 200 cd.devPoints[ location ] = penPos;
169 if ( location == QWSPointerCalibrationData::TopLeft ) { 201 if ( location < QWSPointerCalibrationData::TopRight ) {
170 location = QWSPointerCalibrationData::BottomRight; 202 location = (QWSPointerCalibrationData::Location) ( int( location ) + 1 );
171 } 203 }
172 else { 204 else {
173 if ( sanityCheck() ) { 205 if ( sanityCheck() ) {
174 reset(); 206 reset();
175 goodcd = cd; 207 goodcd = cd;
176 hide(); 208 hide();
177 emit accept(); 209 emit accept();
178 doMove = FALSE; 210 doMove = FALSE;
179 } 211 }
180 else { 212 else {
181 location = QWSPointerCalibrationData::TopLeft; 213 location = QWSPointerCalibrationData::TopLeft;
182 } 214 }
183 } 215 }
184 216
185 if ( doMove ) { 217 if ( doMove ) {
186 QPoint target = fromDevice( cd.screenPoints[ location ] ); 218 QPoint target = fromDevice( cd.screenPoints[ location ] );
187 dx = ( target.x() - crossPos.x() ) / 10; 219 dx = ( target.x() - crossPos.x() ) / 10;
188 dy = ( target.y() - crossPos.y() ) / 10; 220 dy = ( target.y() - crossPos.y() ) / 10;
189 timer->start( 30 ); 221 timer->start( 30 );
190 } 222 }
191} 223}
192 224
193void Calibrate::timeout() 225void Calibrate::timeout()
194{ 226{