| -rw-r--r-- | core/apps/calibrate/calibrate.cpp | 37 | ||||
| -rw-r--r-- | core/apps/calibrate/calibrate.h | 6 |
2 files changed, 34 insertions, 9 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index a5f8792..e079195 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp @@ -27,5 +27,5 @@ #include <qapplication.h> -#if defined(Q_WS_QWS) || defined(_WS_QWS_) +//#if defined(Q_WS_QWS) || defined(_WS_QWS_) #include <qpainter.h> @@ -38,4 +38,5 @@ Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) : QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop ) { +#ifdef QWS showCross = TRUE; const int offset = 30; @@ -59,4 +60,5 @@ Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) : timer = new QTimer( this ); connect( timer, SIGNAL( timeout() ), this, SLOT( timeout() ) ); +#endif } @@ -68,13 +70,17 @@ Calibrate::~Calibrate() void Calibrate::show() { +#ifdef QWS grabMouse(); QWSServer::mouseHandler() ->getCalibration( &goodcd ); QWSServer::mouseHandler() ->clearCalibration(); QDialog::show(); +#endif } void Calibrate::store() { +#ifdef QWS QWSServer::mouseHandler() ->calibrate( &goodcd ); +#endif } @@ -88,5 +94,5 @@ void Calibrate::hide() QCopEnvelope e( "QPE/System", "closing(QString)" ); e << QString ( "calibrate" ); - } + } } QDialog::hide(); @@ -95,16 +101,24 @@ void Calibrate::hide() void Calibrate::reset() { +#ifdef QWS penPos = QPoint(); location = QWSPointerCalibrationData::TopLeft; crossPos = fromDevice( cd.screenPoints[ location ] ); +#endif } QPoint Calibrate::fromDevice( const QPoint &p ) { +#ifdef QWS return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) ); +#else + return QPoint(); +#endif + } bool Calibrate::sanityCheck() { +#ifdef QWS QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft]; QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight]; @@ -128,6 +142,6 @@ bool Calibrate::sanityCheck() int dt = (int) ::sqrt (( dtx * dtx ) + ( dty * dty )); int db = (int) ::sqrt (( dbx * dbx ) + ( dby * dby )); - - // Calculate leeway for x/y (we do not care if diff1/diff2 is for x or y here !) + + // Calculate leeway for x/y (we do not care if diff1/diff2 is for x or y here !) int diff1 = QABS( dl - dr ); int avg1 = ( dl + dr ) / 2; @@ -138,5 +152,5 @@ bool Calibrate::sanityCheck() // This is a check, if the rect is rotated (other then 0/90/180/270) // It needs to be performed only for the triange (bl, tl, tr) - int diff3 = QABS(( dlx + dly + dtx + dty ) - ( dl + dt )); + int diff3 = QABS(( dlx + dly + dtx + dty ) - ( dl + dt )); int avg3 = (( dlx + dly + dtx + dty ) + ( dl + dt )) / 2; @@ -147,5 +161,8 @@ bool Calibrate::sanityCheck() else return true; -} +#else +return true; +#endif +} void Calibrate::moveCrosshair( QPoint pt ) @@ -191,4 +208,5 @@ void Calibrate::paintEvent( QPaintEvent * ) void Calibrate::mousePressEvent( QMouseEvent *e ) { +#ifdef QWS // map to device coordinates QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) ); @@ -198,8 +216,10 @@ void Calibrate::mousePressEvent( QMouseEvent *e ) penPos = QPoint( ( penPos.x() + devPos.x() ) / 2, ( penPos.y() + devPos.y() ) / 2 ); +#endif } void Calibrate::mouseReleaseEvent( QMouseEvent * ) { +#ifdef QWS if ( timer->isActive() ) return ; @@ -230,8 +250,10 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * ) timer->start( 30 ); } +#endif } void Calibrate::timeout() { +#ifdef QWS QPoint target = fromDevice( cd.screenPoints[ location ] ); @@ -256,5 +278,6 @@ void Calibrate::timeout() moveCrosshair( newPos ); +#endif } -#endif // _WS_QWS_ +//#endif // _WS_QWS_ diff --git a/core/apps/calibrate/calibrate.h b/core/apps/calibrate/calibrate.h index 97108c9..06aa0c9 100644 --- a/core/apps/calibrate/calibrate.h +++ b/core/apps/calibrate/calibrate.h @@ -21,5 +21,5 @@ #include <qwsmouse_qws.h> -#if defined(Q_WS_QWS) || defined(_WS_QWS_) +//#if defined(Q_WS_QWS) || defined(_WS_QWS_) #include <qdialog.h> @@ -53,6 +53,8 @@ private: void reset(); QPixmap logo; +#ifdef QWS QWSPointerCalibrationData goodcd,cd; QWSPointerCalibrationData::Location location; +#endif QPoint crossPos; QPoint penPos; @@ -64,4 +66,4 @@ private: }; -#endif // _WS_QWS_ +//#endif // _WS_QWS_ |