3 files changed, 109 insertions, 22 deletions

diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 69d8229..0aeb251 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -1,157 +1,209 @@
 /**********************************************************************
 ** BenchmarkInfo
 **
 ** A benchmark for Qt/Embedded
 **
 ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
 ** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 /* OPIE */
 #include <opie2/ostorageinfo.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpedecoration_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 /* QT */
-#include <qlayout.h>
+#include <qclipboard.h>
+#include <qcolor.h>
+#include <qcombobox.h>
+#include <qdirectpainter_qws.h>
+#include <qfile.h>
+#include <qtextstream.h>
 #include <qfiledialog.h>
 #include <qlabel.h>
+#include <qlayout.h>
 #include <qpainter.h>
-#include <qdirectpainter_qws.h>
-#include <qapplication.h>
 #include <qpushbutton.h>
-#include <qclipboard.h>
 #include <qtimer.h>
-#include <qcolor.h>
-#include <qpushbutton.h>
 
 /* STD */
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
 #include "benchmarkinfo.h"
 
 extern "C"
 {
     void BenchFFT( void );
     double dhry_main( int );
 }
 
 #define DHRYSTONE_RUNS   20000000
 #define TEST_DURATION    3
 
 #define BUFF_SIZE        8192
 #define FILE_SIZE        1024 * 1024  // 1Mb
 
 //===========================================================================
 
 class BenchmarkPaintWidget : public QWidget
 {
   public:
     BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
     {
         resize( QApplication::desktop()->size() );
         show();
         p.begin( this );
     };
 
     ~BenchmarkPaintWidget()
     {
         p.end();
         hide();
     };
 
     QPainter p;
 };
 
 //===========================================================================
 
 BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
         : QWidget( parent, name, wFlags )
 {
 
     setMinimumSize( 200, 150 );
 
     QVBoxLayout* vb = new QVBoxLayout( this );
     vb->setSpacing( 4 );
     vb->setMargin( 4 );
 
     tests = new QListView( this );
-    tests->setMargin( 1 );
-    tests->addColumn( "Tests" );
-    tests->addColumn( "Results" );
+    tests->setMargin( 0 );
+    tests->addColumn( tr( "Tests" ) );
+    tests->addColumn( tr( "Results" ) );
+    tests->addColumn( tr( "Comparison" ) );
     tests->setShowSortIndicator( true );
 
-    test_alu = new QCheckListItem( tests, "1: Integer Arithmetic  ", QCheckListItem::CheckBox );
+    test_alu = new QCheckListItem( tests, tr( "1. Integer Arithmetic  " ), QCheckListItem::CheckBox );
+    test_fpu = new QCheckListItem( tests, tr( "2. Floating Point Unit  " ), QCheckListItem::CheckBox );
+    test_txt = new QCheckListItem( tests, tr( "3. Text Rendering  " ), QCheckListItem::CheckBox );
+    test_gfx = new QCheckListItem( tests, tr( "4. Gfx Rendering  " ), QCheckListItem::CheckBox );
+    test_ram = new QCheckListItem( tests, tr( "5. RAM Performance  " ), QCheckListItem::CheckBox );
+    test_sd = new QCheckListItem( tests, tr( "6. SD Card Performance  " ), QCheckListItem::CheckBox );
+    test_cf = new QCheckListItem( tests, tr( "7. CF Card Performance  " ), QCheckListItem::CheckBox );   
+       
     test_alu->setText( 1, "n/a" );
-    test_fpu = new QCheckListItem( tests, "2: Floating Point Unit  ", QCheckListItem::CheckBox );
-    test_fpu->setText( 1, "n/a" );
-    test_txt = new QCheckListItem( tests, "3: Text Rendering  ", QCheckListItem::CheckBox );
+    test_fpu->setText( 1, "n/a" );   
     test_txt->setText( 1, "n/a" );
-    test_gfx = new QCheckListItem( tests, "4: Gfx Rendering  ", QCheckListItem::CheckBox );
     test_gfx->setText( 1, "n/a" );
-    test_ram = new QCheckListItem( tests, "5: RAM Performance  ", QCheckListItem::CheckBox );
     test_ram->setText( 1, "n/a" );
-    test_sd = new QCheckListItem( tests, "6: SD Card Performance  ", QCheckListItem::CheckBox );
     test_sd->setText( 1, "n/a" );
-    test_cf = new QCheckListItem( tests, "7: CF Card Performance  ", QCheckListItem::CheckBox );
-    test_cf->setText( 1, "n/a" );
-
+    test_cf->setText( 1, "n/a" );   
+    
+    test_alu->setText( 2, "n/a" );
+    test_fpu->setText( 2, "n/a" );   
+    test_txt->setText( 2, "n/a" );
+    test_gfx->setText( 2, "n/a" );
+    test_ram->setText( 2, "n/a" );
+    test_sd->setText( 2, "n/a" );
+    test_cf->setText( 2, "n/a" );   
+    
     startButton = new QPushButton( tr( "&Start Tests!" ), this );
     connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
-
+    
     vb->addWidget( tests, 2 );
-    vb->addWidget( startButton );
+    
+    QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
+    if ( f.open( IO_ReadOnly ) )
+    {
+        machineCombo = new QComboBox( this );
+        
+        QTextStream ts( &f );
+        while( !ts.eof() )
+        {
+            QString machline = ts.readLine();
+            qDebug( "sysinfo: parsing benchmark results for '%s'", (const char*) machline );
+            QString resline = ts.readLine();
+            machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
+            machineCombo->insertItem( machline );
+        }
+        
+        QHBoxLayout* hb = new QHBoxLayout( vb );
+        hb->addWidget( new QLabel( tr( "Compare To:" ), this ) );
+        hb->addWidget( machineCombo, 2 );
+        connect( machineCombo, SIGNAL( activated( int ) ), this, SLOT( machineActivated( int ) ) );
+    }
+    
+    vb->addWidget( startButton, 2 );
 }
 
 
 BenchmarkInfo::~BenchmarkInfo()
 {}
 
 
+void BenchmarkInfo::machineActivated( int index )
+{
+    QStringList* results = machines[ machineCombo->text( index ) ];
+    if ( !results )
+    {
+        qDebug( "sysinfo: no results available." );
+        return;
+    }
+    QStringList::Iterator it = results->begin();
+    test_alu->setText( 2, *(it++) );
+    test_fpu->setText( 2, *(it++) );   
+    test_txt->setText( 2, *(it++) );
+    test_gfx->setText( 2, *(it++) );
+    test_ram->setText( 2, *(it++) );
+    test_sd->setText( 2, *(it++) );
+    test_cf->setText( 2, *(it++) );   
+}
+
+
 void BenchmarkInfo::run()
 {
     startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
     qApp->processEvents();
     QTime t;
 
     if ( test_alu->isOn() )
     {
         int d = round( dhry_main( DHRYSTONE_RUNS ) );
         test_alu->setText( 1, QString( "%1 dhrys" ).arg( QString::number( d ) ) );
         test_alu->setOn( false );
     }
 
     if ( test_fpu->isOn() )
     {
         t.start();
         BenchFFT();
         test_fpu->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) );
         test_fpu->setOn( false );
     }
 
     if ( test_txt->isOn() )
     {
         int value = textRendering( TEST_DURATION );
         test_txt->setText( 1, QString( "%1 chars/sec" ).arg( QString::number( value / TEST_DURATION ) ) );
         test_txt->setOn( false );
     }
 
     if ( test_gfx->isOn() )
     {
         int value = gfxRendering( TEST_DURATION );
         test_gfx->setText( 1, QString( "%1 gops/sec" ).arg( QString::number( value / 4 / TEST_DURATION ) ) ); // 4 tests
diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h
index 3c5ca37..d143602 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.h
+++ b/noncore/settings/sysinfo/benchmarkinfo.h
@@ -1,64 +1,69 @@
 /**********************************************************************
 ** BenchmarkInfo
 **
 ** A benchmark for Qt/Embedded
 **
 ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
 ** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include <qwidget.h>
 #include <qdialog.h>
+#include <qdict.h>
+#include <qstringlist.h>
 
 class QClipboard;
+class QComboBox;
 class QCheckListItem;
 class QPushButton;
 class QListView;
 
 class BenchmarkInfo : public QWidget
 {
     Q_OBJECT
 
 public:
     BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 );
     ~BenchmarkInfo();
 
     QCheckListItem* test_alu;
     QCheckListItem* test_fpu;
     QCheckListItem* test_txt;
     QCheckListItem* test_gfx;
     QCheckListItem* test_ram;
     QCheckListItem* test_sd;
     QCheckListItem* test_cf;
 
     bool main_rd;
     bool main_wt;
     bool sd_rd;
     bool sd_wt;
     bool cf_rd;
     bool cf_wt;
 
     QClipboard* clb;
-
+    QComboBox* machineCombo;
     QListView* tests;
     QPushButton* startButton;
+    QDict <QStringList> machines;
 
     int textRendering( int );
     int gfxRendering( int );
     void performFileTest( const QString& fname, QCheckListItem* item );
 
 private slots:
     bool writeFile( const QString& );
     bool readFile( const QString& );
     void run();
+    void machineActivated( int );
 };
 
diff --git a/share/sysinfo/results b/share/sysinfo/results
new file mode 100644
index 0000000..1866da3
--- a/dev/null
+++ b/share/sysinfo/results
@@ -0,0 +1,30 @@
+<Choose a model>
+n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a
+Sharp SL-5500
+240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec
+Sharp SL-5600
+not,yet,contributed,please,mail,to,opie@handhelds.org
+Sharp C-700
+not,yet,contributed,please,mail,to,opie@handhelds.org
+Sharp C-750
+not,yet,contributed,please,mail,to,opie@handhelds.org
+Sharp C-760
+not,yet,contributed,please,mail,to,opie@handhelds.org
+Sharp C-860
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP iPAQ 36xx
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP iPAQ 37xx
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP iPAQ 38xx
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP iPAQ 54xx
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP iPAQ 55xx
+not,yet,contributed,please,mail,to,opie@handhelds.org
+HP Jornada 5x0
+not,yet,contributed,please,mail,to,opie@handhelds.org
+M&N Ramses
+not,yet,contributed,please,mail,to,opie@handhelds.org
+SIEMENS SIMpad
+not,yet,contributed,please,mail,to,opie@handhelds.org