From 2259e3ab9f2e06a4ee4dbd633c17221a47fdb7ba Mon Sep 17 00:00:00 2001 From: sandman Date: Fri, 01 Nov 2002 18:13:18 +0000 Subject: - Completly reworked the backlight "preview": every slider/control that relates to backlight levels, is now switching the lcd to this level for 2 seconds - after that the backlight switches back to the standard level (or light sensor control) - Many bugfixes and usability improvements in light sensor calibration --- diff --git a/core/settings/light-and-power/calibration.cpp b/core/settings/light-and-power/calibration.cpp index 6a3360f..aed2bc8 100644 --- a/core/settings/light-and-power/calibration.cpp +++ b/core/settings/light-and-power/calibration.cpp @@ -29,12 +29,15 @@ #include #include +#include -#define BRD 2 +#define BRD 3 Calibration::Calibration ( QWidget *parent, const char *name, WFlags fl ) - : QWidget ( parent, name, fl ) + : QWidget ( parent, name, fl | WRepaintNoErase ) { + setBackgroundMode ( NoBackground ); + m_scale = QSize ( 256, 256 ); m_steps = 5; m_dragged = -1; @@ -121,20 +124,28 @@ void Calibration::checkPoints ( ) int dx = m_scale. width ( ); int dy = m_scale. height ( ); + if ( m_p [1]. x ( ) < 0 ) + m_p [1]. setX ( 0 ); if ( m_p [1]. x ( ) >= dx ) m_p [1]. setX ( dx - 1 ); + if ( m_p [0]. x ( ) < 0 ) + m_p [0]. setX ( 0 ); if ( m_p [0]. x ( ) > m_p [1]. x ( )) m_p [0]. setX ( m_p [1]. x ( )); + 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 ( )); } -#define SCALEX(x) (BRD+x*(width()- 2*BRD)/m_scale.width()) -#define SCALEY(y) (BRD+y*(height()-2*BRD)/m_scale.height()) +#define SCALEX(x) (BRD+(x)*(width()- 2*BRD)/m_scale.width()) +#define SCALEY(y) (BRD+(y)*(height()-2*BRD)/m_scale.height()) static QRect around ( int x, int y ) @@ -155,8 +166,8 @@ void Calibration::mousePressEvent ( QMouseEvent *e ) x [i] = SCALEX( m_p [i]. x ( )); y [i] = SCALEY( m_p [i]. y ( )); - if (( QABS( e-> x ( ) - x [i] ) <= BRD ) && - ( QABS( e-> y ( ) - y [i] ) <= BRD )) { + if (( QABS( e-> x ( ) - x [i] ) <= 2 * BRD ) && + ( QABS( e-> y ( ) - y [i] ) <= 2 * BRD )) { m_dragged = i; break; } @@ -169,7 +180,7 @@ void Calibration::mousePressEvent ( QMouseEvent *e ) r |= around ( x [olddragged], y [olddragged] ); if ( m_dragged >= 0 ) r |= around ( x [m_dragged], y [m_dragged] ); - repaint ( r ); + repaint ( r, false ); } } @@ -184,10 +195,18 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e ) n [m_dragged]. setY (( e-> y ( ) - BRD ) * m_scale. height ( ) / ( height ( ) - 2 * BRD )); n [1 - m_dragged] = m_p [1 - m_dragged]; - if (( n [0]. x ( ) > n [1]. x ( )) || ( n [m_dragged]. x ( ) < 0 ) || ( n [m_dragged]. x ( ) >= m_scale. width ( ))) - n [m_dragged]. setX ( m_p [m_dragged]. x ( )); - if (( n [0]. y ( ) > n [1]. y ( )) || ( n [m_dragged]. y ( ) < 0 ) || ( n [m_dragged]. y ( ) >= m_scale. height ( ))) - n [m_dragged]. setY ( m_p [m_dragged]. y ( )); + if ( n [m_dragged]. x ( ) < 0 ) + n [m_dragged]. setX ( 0 ); + if ( n [m_dragged]. x ( ) >= m_scale. width ( )) + n [m_dragged]. setX ( m_scale. width ( ) - 1 ); + 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 ( )); QRect r; int ox [2], oy [2], nx [2], ny [2]; @@ -206,10 +225,14 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e ) if ( i == 0 ) { r |= QRect ( 0, ny [0], nx [0] - 0 + 1, 1 ); r |= QRect ( 0, oy [0], ox [0] - 0 + 1, 1 ); + + emit startPointChanged ( startPoint ( )); } else if ( i == 1 ) { r |= QRect ( nx [1], ny [1], width ( ) - nx [1], 1 ); r |= QRect ( ox [1], oy [1], width ( ) - ox [1], 1 ); + + emit endPointChanged ( endPoint ( )); } } } @@ -217,7 +240,7 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e ) 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 ); - repaint ( r ); + repaint ( r, false ); } } @@ -233,14 +256,15 @@ void Calibration::mouseReleaseEvent ( QMouseEvent *e ) int y = SCALEY( m_p [m_dragged]. y ( )); m_dragged = -1; - repaint ( around ( x, y )); + repaint ( around ( x, y ), false ); } -void Calibration::paintEvent ( QPaintEvent * ) +void Calibration::paintEvent ( QPaintEvent *pe ) { - QPainter p ( this ); - QColorGroup g = colorGroup ( ); - + QPixmap pix ( size ( )); + QPainter p ( &pix, this ); + QRect cr = pe-> rect ( ); + int x0 = SCALEX( m_p [0]. x ( )); int y0 = SCALEY( m_p [0]. y ( )); int x1 = SCALEX( m_p [1]. x ( )); @@ -249,15 +273,48 @@ void Calibration::paintEvent ( QPaintEvent * ) 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 )); + + 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 )); + + QColorGroup g = colorGroup ( ); + + p. fillRect ( cr, g. base ( )); + p. fillRect ( tr, g. base ( )); + int ex = x0, ey = y0; + p. setPen ( g. mid ( )); + + int gx0 = SCALEX( 0 ); + int gy0 = SCALEY( 0 ); + int gx1 = SCALEX( m_scale. width ( ) - 1 ); + int gy1 = SCALEY( m_scale. height ( ) - 1 ); + + int xdiv = QMIN( 4, m_scale. width ( )); + int ydiv = QMIN( 4, m_scale. height ( )); + + xdiv = ( gx1 - gx0 + 1 ) / xdiv; + ydiv = ( gy1 - gy0 + 1 ) / ydiv; + + for ( int i = gx0 + xdiv; i <= ( gx1 - xdiv ); i += xdiv ) + p. drawLine ( i, gy0, i, gy1 ); + + for ( int i = gy0 + ydiv; i <= ( gy1 - ydiv ); i += ydiv ) + p. drawLine ( gx0, i, gx1, i ); + p. setPen ( g. highlight ( )); p. drawLine ( BRD, ey, ex, ey ); - for ( int i = 1; i < m_steps; i++ ) { - int fx = x0 + dx * i / m_steps; - int fy = y0 + dy * i / ( m_steps - 1 ); + for ( int i = 1; i < st; i++ ) { + int fx = x0 + dx * i / st; + int fy = y0 + dy * i / ( st - 1 ); p. drawLine ( ex, ey, fx, ey ); p. drawLine ( fx, ey, fx, fy ); @@ -265,13 +322,25 @@ void Calibration::paintEvent ( QPaintEvent * ) ex = fx; ey = fy; } + if ( st == 1 ) { + p. drawLine ( ex, ey, ex, y1 ); + ey = y1; + } p. drawLine ( ex, ey, width ( ) - 1 - BRD, ey ); + p. fillRect ( around ( x0, y0 ), m_dragged == 0 ? g. highlightedText ( ) : g. text ( )); + p. drawRect ( around ( x0, y0 )); p. fillRect ( around ( x1, y1 ), m_dragged == 1 ? g. highlightedText ( ) : g. text ( )); + p. drawRect ( around ( x1, y1 )); p. setPen ( g. text ( )); - p. drawText ( QRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD ), AlignTop | AlignRight, tr( "%1 Steps" ). arg ( m_steps )); + p. drawText ( tr, AlignTop | AlignRight, stepstr ); + + p. end ( ); + bitBlt ( this, cr. topLeft ( ), &pix, cr ); + if ( !cr. contains ( tr )) + bitBlt ( this, tr. topLeft ( ), &pix, tr ); } diff --git a/core/settings/light-and-power/calibration.h b/core/settings/light-and-power/calibration.h index 2bff69a..ffa63b2 100644 --- a/core/settings/light-and-power/calibration.h +++ b/core/settings/light-and-power/calibration.h @@ -43,6 +43,10 @@ public: QPoint startPoint ( ) const; QPoint endPoint ( ) const; +signals: + void startPointChanged ( const QPoint & ); + void endPointChanged ( const QPoint & ); + public slots: void setScale ( const QSize &s ); void setLineSteps ( int step ); diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index c89a26d..80c6631 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro @@ -1,7 +1,7 @@ TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on debug DESTDIR = $(OPIEDIR)/bin -HEADERS = settings.h sensor.h calibration.h +HEADERS = light.h sensor.h calibration.h SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp INTERFACES = lightsettingsbase.ui sensorbase.ui INCLUDEPATH += $(OPIEDIR)/include diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index c0ba60b..21377b7 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -26,7 +26,7 @@ */ -#include "settings.h" +#include "light.h" #include #include @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -48,7 +49,7 @@ using namespace Opie; LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) - : LightSettingsBase( parent, name, true, WStyle_ContextHelp ) + : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) { m_res = ODevice::inst ( )-> displayBrightnessResolution ( ); @@ -63,14 +64,14 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) config. setGroup ( "Battery" ); // battery spinboxes - interval_dim-> setValue ( config. readNumEntry ( "Dim", 20 )); - interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 )); + interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); + interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); // battery check and slider LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); - int bright = config. readNumEntry ( "Brightness", 255 ); + int bright = config. readNumEntry ( "Brightness", 127 ); brightness-> setMaxValue ( m_res - 1 ); brightness-> setTickInterval ( QMAX( 1, m_res / 16 )); brightness-> setLineStep ( QMAX( 1, m_res / 16 )); @@ -84,9 +85,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) config. setGroup ( "AC" ); // ac spinboxes - interval_dim_ac_3-> setValue ( config. readNumEntry ( "Dim", 20 )); - interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 30 )); - interval_suspend_ac_3-> setValue ( config. readNumEntry ( "Suspend", 60 )); + interval_dim_ac_3-> setValue ( config. readNumEntry ( "Dim", 60 )); + interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 120 )); + interval_suspend_ac_3-> setValue ( config. readNumEntry ( "Suspend", 0 )); // ac check and slider LcdOffOnly_2_3-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); @@ -108,24 +109,28 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); + m_resettimer = new QTimer ( this ); + connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( ))); + if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { - connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); tabs-> setCurrentPage ( 0 ); } else { - connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); tabs-> setCurrentPage ( 1 ); } + + connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); + connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); } LightSettings::~LightSettings ( ) { } - void LightSettings::calibrateSensor ( ) { Sensor *s = new Sensor ( m_sensordata, this ); + connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); s-> showMaximized ( ); s-> exec ( ); delete s; @@ -134,6 +139,7 @@ void LightSettings::calibrateSensor ( ) void LightSettings::calibrateSensorAC ( ) { Sensor *s = new Sensor ( m_sensordata_ac, this ); + connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); s-> showMaximized ( ); s-> exec ( ); delete s; @@ -141,18 +147,21 @@ void LightSettings::calibrateSensorAC ( ) void LightSettings::setBacklight ( int bright ) { - bright = bright * 255 / ( m_res - 1 ); + if ( bright >= 0 ) + bright = bright * 255 / ( m_res - 1 ); + QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); e << bright; + + if ( bright != -1 ) { + m_resettimer-> stop ( ); + m_resettimer-> start ( 2000, true ); + } } -void LightSettings::reject ( ) +void LightSettings::resetBacklight ( ) { - { - QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); - e << -1; - } - QDialog::reject ( ); + setBacklight ( -1 ); } void LightSettings::accept ( ) @@ -200,16 +209,14 @@ void LightSettings::accept ( ) QCopEnvelope e ( "QPE/System", "setScreenSaverInterval(int)" ); e << -1; } - { - QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); - e << -1; - } - - QDialog::accept ( ); + LightSettingsBase::accept ( ); } void LightSettings::done ( int r ) { - QDialog::done ( r ); + m_resettimer-> stop ( ); + resetBacklight ( ); + + LightSettingsBase::done ( r ); close ( ); } diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 04c6726..309b95d 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui @@ -11,7 +11,7 @@ 0 0 - 379 + 371 532 @@ -1189,90 +1189,6 @@ - auto_brightness - toggled(bool) - brightness - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - brightness_ac_3 - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - TextLabel1_3_2 - setDisabled(bool) - - - auto_brightness - toggled(bool) - TextLabel1_3 - setDisabled(bool) - - - auto_brightness - toggled(bool) - interval_dim - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - interval_dim_ac_3 - setDisabled(bool) - - - auto_brightness - toggled(bool) - PixmapLabel2 - setDisabled(bool) - - - auto_brightness - toggled(bool) - TextLabel4 - setDisabled(bool) - - - auto_brightness - toggled(bool) - TextLabel5 - setDisabled(bool) - - - auto_brightness - toggled(bool) - PixmapLabel1 - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - PixmapLabel2_2_3 - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - TextLabel6 - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - TextLabel7 - setDisabled(bool) - - - auto_brightness_ac_3 - toggled(bool) - PixmapLabel1_2_3 - setDisabled(bool) - - CalibrateLightSensor clicked() LightSettingsBase diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp index 051fdec..ecacf69 100644 --- a/core/settings/light-and-power/main.cpp +++ b/core/settings/light-and-power/main.cpp @@ -18,7 +18,7 @@ ** **********************************************************************/ -#include "settings.h" +#include "light.h" #include #include diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp index c1df04d..5ca54d4 100644 --- a/core/settings/light-and-power/sensor.cpp +++ b/core/settings/light-and-power/sensor.cpp @@ -30,6 +30,10 @@ #include #include +#include + +using namespace Opie; + #include "calibration.h" #include "sensor.h" @@ -52,34 +56,48 @@ Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) case 2: steps = params [1]. toInt ( ); case 1: inter = params [0]. toInt ( ) / 1000; } + + int xscale = ODevice::inst ( )-> lightSensorResolution ( ); + int yscale = ODevice::inst ( )-> displayBrightnessResolution ( ); QVBoxLayout *lay = new QVBoxLayout ( frame ); lay-> setMargin ( 2 ); m_calib = new Calibration ( frame ); - lay-> add ( m_calib ); + lay-> add ( m_calib ); - m_calib-> setScale ( QSize ( 256, 256 )); + m_calib-> setScale ( QSize ( xscale, yscale )); m_calib-> setLineSteps ( steps ); m_calib-> setInterval ( inter ); - m_calib-> setStartPoint ( QPoint ( smin, lmax )); - m_calib-> setEndPoint ( QPoint ( smax, lmin )); + m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 )); + m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 )); interval-> setValue ( inter ); linesteps-> setValue ( steps ); connect ( interval, SIGNAL( valueChanged ( int )), m_calib, SLOT( setInterval ( int ))); connect ( linesteps, SIGNAL( valueChanged ( int )), m_calib, SLOT( setLineSteps ( int ))); + + connect ( m_calib, SIGNAL( startPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & ))); + connect ( m_calib, SIGNAL( endPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & ))); } void Sensor::accept ( ) { + int xscale = ODevice::inst ( )-> lightSensorResolution ( ); + int yscale = ODevice::inst ( )-> displayBrightnessResolution ( ); + m_params. clear ( ); m_params << QString::number ( m_calib-> interval ( ) * 1000 ) << QString::number ( m_calib-> lineSteps ( )) - << QString::number ( m_calib-> startPoint ( ). x ( )) - << QString::number ( m_calib-> endPoint ( ). x ( )) - << QString::number ( m_calib-> endPoint ( ). y ( )) - << QString::number ( m_calib-> startPoint ( ). y ( )); + << QString::number ( m_calib-> startPoint ( ). x ( ) * 256 / xscale ) + << QString::number ( m_calib-> endPoint ( ). x ( ) * 256 / xscale ) + << QString::number ( m_calib-> endPoint ( ). y ( ) * 256 / yscale ) + << QString::number ( m_calib-> startPoint ( ). y ( ) * 256 / yscale ); QDialog::accept ( ); } + +void Sensor::pointDrag ( const QPoint &p ) +{ + emit viewBacklight ( p. y ( )); +} diff --git a/core/settings/light-and-power/sensor.h b/core/settings/light-and-power/sensor.h index 7a26d81..b484519 100644 --- a/core/settings/light-and-power/sensor.h +++ b/core/settings/light-and-power/sensor.h @@ -34,10 +34,18 @@ class Calibration; class QStringList; class Sensor : public SensorBase { + Q_OBJECT + public: Sensor ( QStringList ¶ms, QWidget *parent = 0, const char *name = 0 ); virtual void accept ( ); + +signals: + void viewBacklight ( int ); + +private slots: + void pointDrag ( const QPoint & ); private: QStringList &m_params; -- cgit v0.9.0.2