author | mickeyl <mickeyl> | 2004-05-02 20:08:30 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-02 20:08:30 (UTC) |
commit | 109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95 (patch) (side-by-side diff) | |
tree | f7484ada7bff7e4f7a91184f6a8e078af6053dca | |
parent | 8602449caa5a055bd5f033e3792d0a59a0b41bfa (diff) | |
download | opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.zip opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.tar.gz opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.tar.bz2 |
PacketViewer improvements:
- expose buffer size through API
- improve packet viewer logic
- display time/date of capture + capture length
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 9 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.cpp | 52 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.h | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 |
5 files changed, 55 insertions, 14 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 279b39c..89ed24c 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -39,5 +39,6 @@ using namespace Opie::Net; #include <qpushbutton.h> +#include <qradiobutton.h> +#include <qspinbox.h> #include <qtabwidget.h> #include <qtoolbutton.h> -#include <qspinbox.h> #include <qtextstream.h> @@ -476 +477,7 @@ void WellenreiterConfigWindow::save() } + + +int WellenreiterConfigWindow::hexViewBuffer() const +{ + return hexViewBufferUnlimited->isChecked() ? -1 : hexViewBufferSize->value(); +} diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 0a5b3bd..2d478e7 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h @@ -60,2 +60,4 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase + int hexViewBuffer() const; + public slots: diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index 4df01da..f0f16ff 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp @@ -21,2 +21,3 @@ #include <opie2/olistview.h> +#include <opie2/oapplication.h> @@ -40,6 +41,4 @@ PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) _number = new QSpinBox( this ); - _number->setPrefix( "Packet # " ); + _number->setPrefix( "Pkt# " ); _label = new QLabel( this ); - _label->setText( "eth0 2004/03/08 - 00:00:21" ); - _list = new OListView( this ); @@ -53,2 +52,3 @@ PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) _hex = new QTextView( this ); + _hex->setMargin( 0 ); _hex->setFont( QFont( "Fixed", 8 ) ); @@ -57,6 +57,6 @@ PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); - hb->addWidget( _label ); - hb->addWidget( _number ); - vb->addWidget( _list ); - vb->addWidget( _hex ); + hb->addWidget( _label, 5 ); + hb->addWidget( _number, 2 ); + vb->addWidget( _list, 3 ); + vb->addWidget( _hex, 4 ); // allow a bit (4/3) more space @@ -65,8 +65,25 @@ PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) connect( _number, SIGNAL( valueChanged( int ) ), this, SLOT( showPacket( int ) ) ); + connect( parent, SIGNAL( currentChanged( QWidget *) ), this, SLOT( activated( QWidget* ) ) ); + + clear(); + } -void PacketView::add( const OPacket* p ) +void PacketView::add( const OPacket* p, int size ) +{ + odebug << "PacketView::add() size = " << size << oendl; + if ( size == -1 ) // unlimited buffer + { + _packets.append( p ); + } + else + // limited buffer, limit = size + if ( _packets.count() < size ) { _packets.append( p ); - // Add Circular Buffer and check for number of elements here + } + + _number->setMinValue( 1 ); + _number->setMaxValue( _packets.count() ); + _number->setValue( _packets.count() ); } @@ -77,3 +94,3 @@ void PacketView::showPacket( int number ) _hex->setText(""); - const OPacket* p = _packets.at( number ); + const OPacket* p = _packets.at( number-1 ); @@ -83,2 +100,4 @@ void PacketView::showPacket( int number ) _doHexPacket( p ); + QDateTime dt; dt.setTime_t( p->timeval().tv_sec ); + _label->setText( dt.toString() + QString().sprintf( " Len=%d", p->len() ) ); } @@ -90,2 +109,10 @@ void PacketView::showPacket( int number ) +void PacketView::activated( QWidget* w ) +{ + if ( ( this == w ) && _packets.count() ) + { + _number->setValue( 1 ); + } +} + void PacketView::_doSubPackets( QObjectList* l, int counter ) @@ -104,3 +131,6 @@ void PacketView::_doHexPacket( const OPacket* p ) { + if ( oApp->desktop()->width() > 320 ) _hex->setText( p->dump( 16 ) ); + else + _hex->setText( p->dump( 8 ) ); } @@ -118,3 +148,3 @@ void PacketView::clear() _list->clear(); - _hex->setText( " <i>-- no Packet available --</i> " ); + _hex->setText( " <center><i>-- no Packet available --</i></center> " ); } diff --git a/noncore/net/wellenreiter/gui/packetview.h b/noncore/net/wellenreiter/gui/packetview.h index 42e8f5d..bb366c5 100644 --- a/noncore/net/wellenreiter/gui/packetview.h +++ b/noncore/net/wellenreiter/gui/packetview.h @@ -23,2 +23,3 @@ +class QWidget; class QLabel; @@ -38,3 +39,3 @@ class PacketView: public QFrame - void add( const Opie::Net::OPacket* p ); + void add( const Opie::Net::OPacket* p, int size ); const QString getLog() const; @@ -44,2 +45,3 @@ class PacketView: public QFrame void showPacket( int number ); + void activated( QWidget* ); diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 12b3978..fe8f22d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -415,3 +415,3 @@ void Wellenreiter::receivePacket( OPacket* p ) { - hexWindow()->add( p ); + hexWindow()->add( p, configwindow->hexViewBuffer() ); |