summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-21 02:27:43 (UTC)
committer sandman <sandman>2002-11-21 02:27:43 (UTC)
commitba08c640278399f412e66f906283068a099a2f03 (patch) (side-by-side diff)
treeb4237f428c02ba4277561e765a0be51e300032b1
parenta65963a06def8cb064bf7d99ff2776877f5f6315 (diff)
downloadopie-ba08c640278399f412e66f906283068a099a2f03.zip
opie-ba08c640278399f412e66f906283068a099a2f03.tar.gz
opie-ba08c640278399f412e66f906283068a099a2f03.tar.bz2
The light sensor can now be calibrated "reverse" - less backlight in the
dark and more backlight in the light
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/calibration.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/settings/light-and-power/calibration.cpp b/core/settings/light-and-power/calibration.cpp
index aed2bc8..c5377d0 100644
--- a/core/settings/light-and-power/calibration.cpp
+++ b/core/settings/light-and-power/calibration.cpp
@@ -136,14 +136,14 @@ void Calibration::checkPoints ( )
if ( m_p [1]. y ( ) < 0 )
m_p [1]. setY ( 0 );
if ( m_p [1]. y ( ) >= dy )
m_p [1]. setY ( dy - 1 );
if ( m_p [0]. y ( ) < 0 )
m_p [0]. setY ( 0 );
- if ( m_p [0]. y ( ) > m_p [1]. y ( ))
- m_p [0]. setY ( m_p [1]. y ( ));
+ if ( m_p [0]. y ( ) >= dy )
+ m_p [0]. setY ( dy - 1 );
}
#define SCALEX(x) (BRD+(x)*(width()- 2*BRD)/m_scale.width())
#define SCALEY(y) (BRD+(y)*(height()-2*BRD)/m_scale.height())
@@ -202,14 +202,14 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e )
if ( n [0]. x ( ) > n [1]. x ( ))
n [m_dragged]. setX ( n [1 - m_dragged]. x ( ));
if ( n [m_dragged]. y ( ) < 0 )
n [m_dragged]. setY ( 0 );
if ( n [m_dragged]. y ( ) >= m_scale. height ( ))
n [m_dragged]. setY ( m_scale. height ( ) - 1 );
- if ( n [0]. y ( ) > n [1]. y ( ))
- n [m_dragged]. setY ( n [1 - m_dragged]. y ( ));
+// if ( n [0]. y ( ) > n [1]. y ( ))
+// n [m_dragged]. setY ( n [1 - m_dragged]. y ( ));
QRect r;
int ox [2], oy [2], nx [2], ny [2];
for ( int i = 0; i < 2; i++ ) {
nx [i] = SCALEX( n [i]. x ( ));
@@ -234,14 +234,14 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e )
emit endPointChanged ( endPoint ( ));
}
}
}
if ( r. isValid ( )) {
- r |= QRect ( nx [0], ny [0], nx [1] - nx [0] + 1, ny [1] - ny [0] + 1 );
- r |= QRect ( ox [0], oy [0], ox [1] - ox [0] + 1, oy [1] - oy [0] + 1 );
+ r |= QRect ( nx [0], ny [0], nx [1] - nx [0] + 1, ny [1] - ny [0] + 1 ). normalize ( );
+ r |= QRect ( ox [0], oy [0], ox [1] - ox [0] + 1, oy [1] - oy [0] + 1 ). normalize ( );
repaint ( r, false );
}
}
void Calibration::mouseReleaseEvent ( QMouseEvent *e )
@@ -271,13 +271,13 @@ void Calibration::paintEvent ( QPaintEvent *pe )
int y1 = SCALEY( m_p [1]. y ( ));
int dx = x1 - x0;
int dy = y1 - y0;
// restrict steps to real x and y resolution
- int st = QMIN( QMIN( m_steps, ( dx + 1 )), ( dy + 1 ));
+ int st = QMIN( QMIN( m_steps, ( dx + 1 )), ( QABS( dy ) + 1 ));
QString stepstr = tr( "%1 Steps" ). arg ( st );
QRect tr = p. boundingRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD, AlignTop | AlignRight, stepstr );
tr. setLeft ( tr. left ( ) - 20 );
if ( p. hasClipping ( ))
p. setClipRegion ( p. clipRegion ( ) | QRegion ( tr ));