From 17e6e34865c25bd6bb89e0f2b9c1669db0ffc281 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 29 Mar 2004 11:58:21 +0000 Subject: eliminate bar graph display style first shot at drawing the antenna symbol 'by hand' to support multiple display resolutions --- (limited to 'noncore/applets') diff --git a/noncore/applets/wirelessapplet/connect0.xpm b/noncore/applets/wirelessapplet/connect0.xpm deleted file mode 100644 index f2c0bb7..0000000 --- a/noncore/applets/wirelessapplet/connect0.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect0_xpm[] = { -"14 14 11 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #000000", -"# c #C6C3C6", -"$ c #877F81", -"% c #191819", -"& c #897D7F", -"* c #0E0E0E", -"= c #575657", -"- c #131313", -" ", -" ", -" ", -" +@+ ", -" #@@ ", -" $%+ ", -" + ", -" @ ", -" &*= ", -" +-@ ", -" +@@ ", -" +#@@+ ", -" +#@@@ ", -" +#@@@ "}; diff --git a/noncore/applets/wirelessapplet/connect1.xpm b/noncore/applets/wirelessapplet/connect1.xpm deleted file mode 100644 index d831437..0000000 --- a/noncore/applets/wirelessapplet/connect1.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect1_xpm[] = { -"14 14 11 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #FF2609", -"# c #877F81", -"$ c #000000", -"% c #897D7F", -"& c #0E0E0E", -"* c #575657", -"= c #131313", -"- c #C6C3C6", -" ", -" ", -" ", -" +@+ ", -" @@@ ", -" #@+ ", -" + ", -" $ ", -" %&* ", -" +=$ ", -" +$$ ", -" +-$$+ ", -" +-$$$ ", -" +-$$$ "}; diff --git a/noncore/applets/wirelessapplet/connect2.xpm b/noncore/applets/wirelessapplet/connect2.xpm deleted file mode 100644 index 9e42f33..0000000 --- a/noncore/applets/wirelessapplet/connect2.xpm +++ b/dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * connect2_xpm[] = { -"14 14 12 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #897D7F", -"= c #0E0E0E", -"- c #575657", -"; c #131313", -" ", -" ", -" ... ", -" .@#@. ", -" .$##. ", -" .%&@. ", -" ... ", -" # ", -" *=- ", -" @;# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/connect3.xpm b/noncore/applets/wirelessapplet/connect3.xpm deleted file mode 100644 index 263443d..0000000 --- a/noncore/applets/wirelessapplet/connect3.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect3_xpm[] = { -"14 14 11 1", -" c None", -". c #FF2609", -"+ c #848284", -"@ c #000000", -"# c #C6C3C6", -"$ c #877F81", -"% c #191819", -"& c #897D7F", -"* c #0E0E0E", -"= c #575657", -"- c #131313", -" ", -" ... ", -" . . ", -" . +@+ . ", -" . #@@ . ", -" . $%+ . ", -" . + . ", -" ... ", -" &*= ", -" +-@ ", -" +@@ ", -" +#@@+ ", -" +#@@@ ", -" +#@@@ "}; diff --git a/noncore/applets/wirelessapplet/connect4.xpm b/noncore/applets/wirelessapplet/connect4.xpm deleted file mode 100644 index 471ed64..0000000 --- a/noncore/applets/wirelessapplet/connect4.xpm +++ b/dev/null @@ -1,26 +0,0 @@ -/* XPM */ -static char * connect4_xpm[] = { -"14 14 9 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #131313", -" ... ", -" .. .. ", -" . . ", -" . @#@ . ", -" . $## . ", -" . %&@ . ", -" . @ . ", -" .. # .. ", -" ... ", -" @*# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/connect5.xpm b/noncore/applets/wirelessapplet/connect5.xpm deleted file mode 100644 index a67be9a..0000000 --- a/noncore/applets/wirelessapplet/connect5.xpm +++ b/dev/null @@ -1,26 +0,0 @@ -/* XPM */ -static char * connect5_xpm[] = { -"14 14 9 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #131313", -" . ... . ", -" . .. .. . ", -" . . . .", -" . . @#@ . .", -" . . $## . .", -" . . %&@ . .", -" . . @ . .", -" . .. # .. . ", -" . ... . ", -" @*# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/nowireless.xpm b/noncore/applets/wirelessapplet/nowireless.xpm deleted file mode 100644 index a76322d..0000000 --- a/noncore/applets/wirelessapplet/nowireless.xpm +++ b/dev/null @@ -1,22 +0,0 @@ -static char * nowireless_xpm[] = { -"14 14 6 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #000000", -"# c #FF0000", -"$ c #C6C3C6", -" ", -" ", -" ", -" +@+ ", -" # $#@ ", -" ####@+ ", -" ## + ", -" ####@ ", -" # #@+ ", -" # +#@ ", -" +@@ ", -" +$@@+ ", -" +$@@@ ", -" +$@@@ "}; diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp index f244426..711d0dd 100644 --- a/noncore/applets/wirelessapplet/wireless.cpp +++ b/noncore/applets/wirelessapplet/wireless.cpp @@ -14,13 +14,6 @@ #include "wireless.h" #include "mgraph.h" #include "advancedconfig.h" -#include "connect0.xpm" -#include "connect1.xpm" -#include "connect2.xpm" -#include "connect3.xpm" -#include "connect4.xpm" -#include "connect5.xpm" -#include "nowireless.xpm" /* OPIE */ #include @@ -40,12 +33,10 @@ #include /* STD */ +#include #include #include -#define STYLE_BARS 0 -#define STYLE_ANTENNA 1 - //#define MDEBUG #undef MDEBUG @@ -57,7 +48,6 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const readConfig(); writeConfigEntry( "UpdateFrequency", updateFrequency ); - writeConfigEntry( "DisplayStyle", displayStyle ); setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" ); @@ -71,7 +61,7 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const "Or Sharp ROM ?
" "CELL: 00:00:00:00:00:00" ); /* QString text( "Station: Unknown
" - "ESSID: Unknown
" + "ESSID: Unknown
" "MODE: Unknown
" "FREQ: Unknown
" "CELL: AA:BB:CC:DD:EE:FF" ); */ @@ -81,15 +71,6 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const /* visualization group box */ - QButtonGroup* group = new QButtonGroup( 1, Qt::Horizontal, "Visualization", this ); - QRadioButton* r1 = new QRadioButton( "Color Bars", group ); - QRadioButton* r2 = new QRadioButton( "Antenna", group ); - r1->setFocusPolicy( QWidget::NoFocus ); - r2->setFocusPolicy( QWidget::NoFocus ); - group->setFocusPolicy( QWidget::NoFocus ); - group->setButton( displayStyle ); - grid->addWidget( group, 0, 1 ); - /* quality graph */ mgraph = new MGraph( this ); @@ -130,12 +111,8 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const setFixedSize( sizeHint() ); setFocusPolicy( QWidget::NoFocus ); - applet->displayStyleChange( displayStyle ); applet->updateDelayChange( updateFrequency ); - connect( group, SIGNAL( clicked(int) ), - this, SLOT( displayStyleChange(int) ) ); - applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE ); } @@ -187,7 +164,6 @@ void WirelessControl::readConfig() cfg.setGroup( "Wireless" ); updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 ); - displayStyle = cfg.readNumEntry( "DisplayStyle", STYLE_ANTENNA ); rocESSID = cfg.readBoolEntry( "renew_dhcp_on_essid_change", false ); rocFREQ = cfg.readBoolEntry( "renew_dhcp_on_freq_change", false ); rocAP = cfg.readBoolEntry( "renew_dhcp_on_ap_change", false ); @@ -204,7 +180,7 @@ void WirelessControl::writeConfigEntry( const char *entry, int val ) //=========================================================================== WirelessApplet::WirelessApplet( QWidget *parent, const char *name ) - : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ), + : QWidget( parent, name ), timer( 0 ), interface( 0 ), oldiface( 0 ), rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false ) { @@ -391,11 +367,11 @@ bool WirelessApplet::mustRepaint() } } - const char** pixmap = getQualityPixmap(); + int rings = numberOfRings(); - if ( pixmap && ( pixmap != oldpixmap ) ) + if ( rings != oldrings ) { - oldpixmap = pixmap; + oldrings = rings; return true; } @@ -467,84 +443,55 @@ void WirelessApplet::updatePopupWindow() cell + " " + interface->associatedAP().toString() ); } -const char** WirelessApplet::getQualityPixmap() +int WirelessApplet::numberOfRings() { - if ( !interface ) return ( const char** ) nowireless_xpm; + if ( !interface ) return -1; int qualityH = interface->signalStrength(); - if ( qualityH < 0 ) return ( const char** ) nowireless_xpm; - - if ( visualStyle == STYLE_ANTENNA ) - { - if ( qualityH < 1 ) return ( const char** ) connect0_xpm; - if ( qualityH < 17 ) return ( const char** ) connect1_xpm; - if ( qualityH < 34 ) return ( const char** ) connect2_xpm; - if ( qualityH < 50 ) return ( const char** ) connect3_xpm; - if ( qualityH < 65 ) return ( const char** ) connect4_xpm; - return ( const char** ) connect5_xpm; - } - - return 0; // please draw your bars + qDebug( "quality = %d", qualityH ); + if ( qualityH < 1 ) return -1; + if ( qualityH < 20 ) return 0; + if ( qualityH < 40 ) return 1; + if ( qualityH < 60 ) return 2; + if ( qualityH < 65 ) return 3; + return 4; } void WirelessApplet::paintEvent( QPaintEvent* ) { QPainter p( this ); - QColor color; + int h = height(); + int w = width(); + int m = 2; - const char** pixmap = getQualityPixmap(); + p.drawLine( m, h-m-1, round( w/2.0 ), round( 0+h/3.0 ) ); + p.drawLine( round( w/2.0 ), round( 0+h/3.0 ), w-m, h-m-1 ); + p.setPen( QColor( 150, 150, 150 ) ); + p.drawLine( w-m, h-m-1, m, h-m-1 ); - if ( pixmap ) - p.drawPixmap( 0, 1, pixmap ); - else + int rings = numberOfRings(); + + if ( rings == -1 ) + { + p.setPen( QPen( QColor( 200, 20, 20 ), 2 ) ); + p.drawLine( w/2-m-m, h/2-m-m, w/2+m+m, h/2+m+m ); + p.drawLine( w/2+m+m, h/2-m-m, w/2-m-m, h/2+m+m ); + return; + } + + qDebug( "WirelessApplet: painting %d rings", rings ); + int radius = 2; + int rstep = 4; + int maxrings = w/rstep; + + p.setPen( QColor( 200, 20, 20 ) ); + for ( int i = 0; i < rings; ++i ) { + p.drawEllipse( w/2 - radius/2, h/3 - radius/2, radius, radius ); + radius += rstep; + }; - int noiseH = 30; // iface->noisePercent() * ( height() - 3 ) / 100; - int signalH = 50; // iface->signalPercent() * ( height() - 3 ) / 100; - int qualityH = interface->signalStrength(); // iface->qualityPercent() * ( height() - 3 ) / 100; - - double intensity; - int pixelHeight; - int pixelWidth = 2; - int Hue; - int barSpace = 3; - int leftoffset = 0; - int bottomoffset = 2; - - // draw noise indicator - pixelHeight = noiseH; - Hue = 50; - for ( int i = 0; i < pixelHeight; ++i ) - { - intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205; - color.setHsv( Hue, 255, intensity ); - p.setPen ( color ); - p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i ); - } - // draw signal indicator - pixelHeight = signalH; - Hue = 100; - leftoffset += pixelWidth + barSpace; - for ( int i = 0; i < pixelHeight; ++i ) - { - intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205; - color.setHsv( Hue, 255, intensity ); - p.setPen ( color ); - p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i ); - } - // draw quality indicator - pixelHeight = qualityH; - Hue = 250; - leftoffset += pixelWidth + barSpace; - for ( int i = 0; i < pixelHeight; ++i ) - { - intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205; - color.setHsv( Hue, 255, intensity ); - p.setPen ( color ); - p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i ); - } - } } diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h index b475a46..9146c66 100644 --- a/noncore/applets/wirelessapplet/wireless.h +++ b/noncore/applets/wirelessapplet/wireless.h @@ -50,7 +50,6 @@ class WirelessControl : public QFrame private: WirelessApplet* applet; - int displayStyle; int updateFrequency; bool rocESSID; @@ -82,7 +81,7 @@ class WirelessApplet : public QWidget bool mustRepaint(); void updatePopupWindow(); - const char** getQualityPixmap(); + int numberOfRings(); private: QPixmap snapshotPixmap; @@ -92,7 +91,7 @@ class WirelessApplet : public QWidget Opie::Net::OWirelessNetworkInterface* interface; private: - const char** oldpixmap; + int oldrings; Opie::Net::OWirelessNetworkInterface* oldiface; int oldqualityH; int oldsignalH; -- cgit v0.9.0.2