-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 2 | ||||
-rw-r--r-- | share/sysinfo/results | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 060185a..2a269b8 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp | |||
@@ -136,50 +136,48 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
136 | 136 | ||
137 | startButton = new QPushButton( tr( "&Start Tests!" ), this ); | 137 | startButton = new QPushButton( tr( "&Start Tests!" ), this ); |
138 | QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) ); | 138 | QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) ); |
139 | connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); | 139 | connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); |
140 | vb->addWidget( tests, 2 ); | 140 | vb->addWidget( tests, 2 ); |
141 | 141 | ||
142 | QHBoxLayout* hb = new QHBoxLayout( vb ); | 142 | QHBoxLayout* hb = new QHBoxLayout( vb ); |
143 | hb->addWidget( startButton, 2 ); | 143 | hb->addWidget( startButton, 2 ); |
144 | 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 | { |
148 | machineCombo = new QComboBox( this ); | 148 | machineCombo = new QComboBox( this ); |
149 | QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) ); | 149 | QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) ); |
150 | 150 | ||
151 | QTextStream ts( &f ); | 151 | QTextStream ts( &f ); |
152 | while( !ts.eof() ) | 152 | while( !ts.eof() ) |
153 | { | 153 | { |
154 | QString machline = ts.readLine(); | 154 | QString machline = ts.readLine(); |
155 | odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl; | 155 | odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl; |
156 | QString resline = ts.readLine(); | 156 | QString resline = ts.readLine(); |
157 | machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); | 157 | machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); |
158 | machineCombo->insertItem( machline ); | 158 | machineCombo->insertItem( machline ); |
159 | } | 159 | } |
160 | |||
161 | hb->addWidget( new QLabel( tr( "Compare:" ), this ) ); | ||
162 | hb->addWidget( machineCombo, 2 ); | 160 | hb->addWidget( machineCombo, 2 ); |
163 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); | 161 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); |
164 | } | 162 | } |
165 | } | 163 | } |
166 | 164 | ||
167 | 165 | ||
168 | BenchmarkInfo::~BenchmarkInfo() | 166 | BenchmarkInfo::~BenchmarkInfo() |
169 | {} | 167 | {} |
170 | 168 | ||
171 | 169 | ||
172 | void BenchmarkInfo::machineActivated( int index ) | 170 | void BenchmarkInfo::machineActivated( int index ) |
173 | { | 171 | { |
174 | QStringList* results = machines[ machineCombo->text( index ) ]; | 172 | QStringList* results = machines[ machineCombo->text( index ) ]; |
175 | if ( !results ) | 173 | if ( !results ) |
176 | { | 174 | { |
177 | odebug << "sysinfo: no results available." << oendl; | 175 | odebug << "sysinfo: no results available." << oendl; |
178 | return; | 176 | return; |
179 | } | 177 | } |
180 | QStringList::Iterator it = results->begin(); | 178 | QStringList::Iterator it = results->begin(); |
181 | test_alu->setText( 2, *(it++) ); | 179 | test_alu->setText( 2, *(it++) ); |
182 | test_fpu->setText( 2, *(it++) ); | 180 | test_fpu->setText( 2, *(it++) ); |
183 | test_txt->setText( 2, *(it++) ); | 181 | test_txt->setText( 2, *(it++) ); |
184 | test_gfx->setText( 2, *(it++) ); | 182 | test_gfx->setText( 2, *(it++) ); |
185 | test_ram->setText( 2, *(it++) ); | 183 | test_ram->setText( 2, *(it++) ); |
diff --git a/share/sysinfo/results b/share/sysinfo/results index d1fc6a8..7b7a587 100644 --- a/share/sysinfo/results +++ b/share/sysinfo/results | |||
@@ -1,25 +1,25 @@ | |||
1 | <Choose model> | 1 | <Compare to> |
2 | n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a | 2 | n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a |
3 | Sharp SL-5500 | 3 | Sharp SL-5500 |
4 | 240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec | 4 | 240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec |
5 | Sharp SL-5600 | 5 | Sharp SL-5600 |
6 | not,yet,contributed,please,mail,to,opie@handhelds.org | 6 | not,yet,contributed,please,mail,to,opie@handhelds.org |
7 | Sharp C-700 | 7 | Sharp C-700 |
8 | not,yet,contributed,please,mail,to,opie@handhelds.org | 8 | not,yet,contributed,please,mail,to,opie@handhelds.org |
9 | Sharp C-750 | 9 | Sharp C-750 |
10 | 490677 dhrys,2.452 sec,437 char/sec,1396 gops/sec,132.061 kb/sec,129.752 kb/sec,n/a | 10 | 490677 dhrys,2.452 sec,437 char/sec,1396 gops/sec,132.061 kb/sec,129.752 kb/sec,n/a |
11 | Sharp C-760 | 11 | Sharp C-760 |
12 | not,yet,contributed,please,mail,to,opie@handhelds.org | 12 | not,yet,contributed,please,mail,to,opie@handhelds.org |
13 | Sharp C-860 | 13 | Sharp C-860 |
14 | not,yet,contributed,please,mail,to,opie@handhelds.org | 14 | not,yet,contributed,please,mail,to,opie@handhelds.org |
15 | HP iPAQ 36xx | 15 | HP iPAQ 36xx |
16 | not,yet,contributed,please,mail,to,opie@handhelds.org | 16 | not,yet,contributed,please,mail,to,opie@handhelds.org |
17 | HP iPAQ 37xx | 17 | HP iPAQ 37xx |
18 | not,yet,contributed,please,mail,to,opie@handhelds.org | 18 | not,yet,contributed,please,mail,to,opie@handhelds.org |
19 | HP iPAQ 38xx | 19 | HP iPAQ 38xx |
20 | 234880 dhrys,42.37 sec,418 char/sec,1788 gops/sec,51.6911 kb/sec,31.1029 kb/sec,untested | 20 | 234880 dhrys,42.37 sec,418 char/sec,1788 gops/sec,51.6911 kb/sec,31.1029 kb/sec,untested |
21 | HP iPAQ 54xx | 21 | HP iPAQ 54xx |
22 | not,yet,contributed,please,mail,to,opie@handhelds.org | 22 | not,yet,contributed,please,mail,to,opie@handhelds.org |
23 | HP iPAQ 55xx | 23 | HP iPAQ 55xx |
24 | not,yet,contributed,please,mail,to,opie@handhelds.org | 24 | not,yet,contributed,please,mail,to,opie@handhelds.org |
25 | HP Jornada 5x0 | 25 | HP Jornada 5x0 |