summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-09-15 12:39:17 (UTC)
committer mickeyl <mickeyl>2004-09-15 12:39:17 (UTC)
commit3440a45f736fbdddf787c81664e3dbb74f3e4b8b (patch) (unidiff)
tree6786fa4990a2b9c76cb3a22a68c25dc542db2de6
parentbb7cd69b07a5d6e00a29b23dc8bfebc511d34891 (diff)
downloadopie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.zip
opie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.tar.gz
opie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.tar.bz2
minor adjustments to button layout. release 1.1.1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp19
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro2
-rw-r--r--share/sysinfo/results4
3 files changed, 12 insertions, 13 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index be7e4b6..fde032a 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -1,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** BenchmarkInfo 2** BenchmarkInfo
3** 3**
4** A benchmark for Qt/Embedded 4** A benchmark widget for Qt/Embedded
5** 5**
6** Copyright (C) 2004 Michael Lauer <mickey@vanille.de> 6** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
7** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp> 7** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
@@ -63,9 +63,6 @@ extern "C"
63#define DHRYSTONE_RUNS 20000000 63#define DHRYSTONE_RUNS 20000000
64#define TEST_DURATION 3 64#define TEST_DURATION 3
65 65
66#define BUFF_SIZE 8192
67#define FILE_SIZE 1024 * 1024 // 1Mb
68
69//=========================================================================== 66//===========================================================================
70 67
71class BenchmarkPaintWidget : public QWidget 68class BenchmarkPaintWidget : public QWidget
@@ -142,6 +139,9 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
142 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); 139 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
143 vb->addWidget( tests, 2 ); 140 vb->addWidget( tests, 2 );
144 141
142 QHBoxLayout* hb = new QHBoxLayout( vb );
143 hb->addWidget( startButton, 2 );
144
145 QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" ); 145 QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
146 if ( f.open( IO_ReadOnly ) ) 146 if ( f.open( IO_ReadOnly ) )
147 { 147 {
@@ -158,13 +158,10 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
158 machineCombo->insertItem( machline ); 158 machineCombo->insertItem( machline );
159 } 159 }
160 160
161 QHBoxLayout* hb = new QHBoxLayout( vb ); 161 hb->addWidget( new QLabel( tr( "Compare:" ), this ) );
162 hb->addWidget( new QLabel( tr( "Compare To:" ), this ) );
163 hb->addWidget( machineCombo, 2 ); 162 hb->addWidget( machineCombo, 2 );
164 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); 163 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
165 } 164 }
166
167 vb->addWidget( startButton, 2 );
168} 165}
169 166
170 167
@@ -195,7 +192,7 @@ void BenchmarkInfo::machineActivated( int index )
195 192
196void BenchmarkInfo::run() 193void BenchmarkInfo::run()
197{ 194{
198 startButton->setText( "> Don't touch! Running Tests! Don't touch! <" ); 195 startButton->setText( "> Don't touch! <" );
199 qApp->processEvents(); 196 qApp->processEvents();
200 QTime t; 197 QTime t;
201 198
@@ -396,14 +393,14 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item
396 QString readUnit = "kB/s"; 393 QString readUnit = "kB/s";
397 if ( readSpeed > 1024 ) 394 if ( readSpeed > 1024 )
398 { 395 {
399 readSpeed = readSpeed / 1024.0; 396 readSpeed /= 1024.0;
400 readUnit = "MB/s"; 397 readUnit = "MB/s";
401 } 398 }
402 double writeSpeed = FILE_TEST_COUNT / ( write / 1000.0 ); 399 double writeSpeed = FILE_TEST_COUNT / ( write / 1000.0 );
403 QString writeUnit = "kb/s"; 400 QString writeUnit = "kb/s";
404 if ( writeSpeed > 1024 ) 401 if ( writeSpeed > 1024 )
405 { 402 {
406 writeSpeed = writeSpeed / 1024.0; 403 writeSpeed /= 1024.0;
407 writeUnit = "MB/s"; 404 writeUnit = "MB/s";
408 } 405 }
409 item->setText( 1, QString().sprintf( "%.2f %s, %.2f %s", readSpeed, readUnit.latin1(), writeSpeed, writeUnit.latin1() ) ); 406 item->setText( 1, QString().sprintf( "%.2f %s, %.2f %s", readSpeed, readUnit.latin1(), writeSpeed, writeUnit.latin1() ) );
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 58f6eb0..dd35563 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -29,6 +29,6 @@ DEPENDPATH += $(OPIEDIR)/include
29LIBS += -lqpe -lopiecore2 -lopieui2 29LIBS += -lqpe -lopiecore2 -lopieui2
30DEFINES += UNIX 30DEFINES += UNIX
31TARGET = sysinfo 31TARGET = sysinfo
32VERSION = 1.1.0 32VERSION = 1.1.1
33 33
34include ( $(OPIEDIR)/include.pro ) 34include ( $(OPIEDIR)/include.pro )
diff --git a/share/sysinfo/results b/share/sysinfo/results
index b34fc99..b53f1ea 100644
--- a/share/sysinfo/results
+++ b/share/sysinfo/results
@@ -1,4 +1,4 @@
1<Choose a model> 1<Choose model>
2n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a 2n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a
3Sharp SL-5500 3Sharp SL-5500
4240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec 4240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec
@@ -28,3 +28,5 @@ M&N Ramses
28not,yet,contributed,please,mail,to,opie@handhelds.org 28not,yet,contributed,please,mail,to,opie@handhelds.org
29SIEMENS SIMpad 29SIEMENS SIMpad
30not,yet,contributed,please,mail,to,opie@handhelds.org 30not,yet,contributed,please,mail,to,opie@handhelds.org
31MASTERIA Beagle
32not,yet,contributed,please,mail,to,opie@handhelds.org