[Compbench-devel] CompBenchmarks++/Qt-4 compbenchmarks-ui-qt4.pro, 1.1, 1.2 main.cpp, 1.1, 1.2 main
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/Qt-4 compbenchmarks-ui-qt4.pro, 1.1, 1.2 main.cpp, 1.1, 1.2 main.h, 1.1, 1.2
|
From: Frederic T. <xf...@us...> - 2007-05-16 20:25:53
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15041 Modified Files: compbenchmarks-ui-qt4.pro main.cpp main.h Log Message: Many improvements. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main.cpp 16 May 2007 16:12:06 -0000 1.1 --- main.cpp 16 May 2007 20:25:50 -0000 1.2 *************** *** 2,8 **** #include <config.h> #include <libcompbenchmarks.h> - #include <Status/Status.h> using namespace CQT; --- 2,9 ---- #include <config.h> #include <libcompbenchmarks.h> #include <Status/Status.h> + #include <QFileDialog> + using namespace CQT; *************** *** 45,51 **** --- 46,118 ---- } + CompilerAutodetectThread::CompilerAutodetectThread(QObject *parent) + : QThread(parent) + { + } + + void CompilerAutodetectThread::run() + { + static int known_compiler_number = 24; + const char *known_compilers[] = {"/usr/bin/gcc", + "/usr/bin/tcc", + "gcc-2.95", + "gcc-2.96", + "gcc-3.1", + "gcc-3.2", + "gcc-3.3", + "gcc-3.4", + "gcc-4.0", + "gcc-4.1", + "gcc-4.2", + "/usr/local/bin/gcc", + "/usr/local/bin/tcc", + "/usr/bin/g++", + "g++-2.95", + "g++-2.96", + "g++-3.1", + "g++-3.2", + "g++-3.3", + "g++-3.4", + "g++-4.0", + "g++-4.1", + "g++-4.2", + "/usr/local/bin/g++"}; + CBM::CompilerSelector SC(CBM::cbmSystem); + CBM::Compiler *C; + + int i; + + CBM::cbmUI->Information(CBM::UI::CompilerAutodetect, + "", + CBM::UI::Start); + + + for(i=0; i<known_compiler_number; i++) { + C=SC.select(known_compilers[i]); + if (C) { + App->compilerRegister(C); + } + CBM::cbmUI->Information(CBM::UI::CompilerAutodetect, + "", + CBM::UI::Running, + (float) (i*100)/known_compiler_number); + } + CBM::cbmUI->Information(CBM::UI::CompilerAutodetect, + "", + CBM::UI::OK); + + if (parent()) + parent()->deleteLater(); + } + + CompilerAutodetectThread::~CompilerAutodetectThread() + { + } + Application::Application(int &argc, char **argv) : QApplication(argc, argv) { + mainTab = new QTabWidget; + App=this; *************** *** 53,57 **** --- 120,129 ---- qRegisterMetaType<CBM::Package*>("CBM::Package*"); + packageManager=new PackageManager; + mainTab->addTab(packageManager,tr("Packages")); + + compilerManager=new CompilerManager; + mainTab->addTab(compilerManager,tr("Compilers")); connect(this, SIGNAL(sigPackageInstallation(CBM::Package*)), *************** *** 66,69 **** --- 138,147 ---- this, SLOT(doPackagesRefresh()), Qt::QueuedConnection); + + connect(this, SIGNAL(sigCompilerRegister(CBM::Compiler*)), + compilerManager, SLOT(doCompilerRegister(CBM::Compiler*))); + + connect(this, SIGNAL(sigCompilerUnregister(CBM::Compiler*)), + compilerManager, SLOT(doCompilerUnregister(CBM::Compiler*))); } *************** *** 102,105 **** --- 180,217 ---- } + void Application::doCompilerAutodetect(void) + { + StatusWidget *W; + CompilerAutodetectThread *T; + + W=new StatusWidget(0); + + W->show(); + T=new CompilerAutodetectThread(W); + T->start(); + } + + void Application::doCompilerRegisterManual(void) + { + CBM::Compiler *C; + + QFileDialog F(0, Qt::Dialog); + + F.setAcceptMode(QFileDialog::AcceptOpen); + F.setFileMode(QFileDialog::ExistingFile); + F.setModal(true); + + if (F.exec()==QDialog::Accepted) { + QStringList L = F.selectedFiles(); + + CBM::CompilerSelector SC(CBM::cbmSystem); + + C=SC.select(L[0].toStdString()); + if (C) { + compilerRegister(C); + } + } + } + void Application::packageInstallation(CBM::Package *_package) { *************** *** 112,115 **** --- 224,236 ---- } + void Application::compilerRegister(CBM::Compiler *_compiler) + { + emit sigCompilerRegister(_compiler); + } + + void Application::compilerUnregister(CBM::Compiler *_compiler) + { + emit sigCompilerUnregister(_compiler); + } Application::~Application() *************** *** 143,148 **** */ ! ! app.packageManager->show(); result=app.exec(); --- 264,268 ---- */ ! app.mainTab->show(); result=app.exec(); Index: compbenchmarks-ui-qt4.pro =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compbenchmarks-ui-qt4.pro 16 May 2007 16:12:06 -0000 1.1 --- compbenchmarks-ui-qt4.pro 16 May 2007 20:25:50 -0000 1.2 *************** *** 9,15 **** # Input ! HEADERS += Package/PackageHolder.h Package/PackageInfo.h Package/PackageList.h Package/PackageManager.h Status/Status.h main.h # FORMS += tests-designer/checkItem.ui tests-designer/test.ui ! SOURCES += Package/PackageHolder.cpp Package/PackageInfo.cpp Package/PackageList.cpp Package/PackageManager.cpp Status/Status.cpp main.cpp LIBS += -L../testing/libcompbenchmarks/.libs -lcompbenchmarks RESOURCES += icons/icons.qrc --- 9,15 ---- # Input ! HEADERS += Package/PackageHolder.h Package/PackageInfo.h Package/PackageList.h Package/PackageManager.h Compiler/CompilerHolder.h Compiler/CompilerInfo.h Compiler/CompilerList.h Compiler/CompilerManager.h Status/Status.h main.h # FORMS += tests-designer/checkItem.ui tests-designer/test.ui ! SOURCES += Package/PackageHolder.cpp Package/PackageInfo.cpp Package/PackageList.cpp Package/PackageManager.cpp Compiler/CompilerHolder.cpp Compiler/CompilerInfo.cpp Compiler/CompilerList.cpp Compiler/CompilerManager.cpp Status/Status.cpp main.cpp LIBS += -L../testing/libcompbenchmarks/.libs -lcompbenchmarks RESOURCES += icons/icons.qrc Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main.h 16 May 2007 16:12:06 -0000 1.1 --- main.h 16 May 2007 20:25:50 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- #include <Package/PackageManager.h> + #include <Compiler/CompilerManager.h> namespace CQT { *************** *** 34,37 **** --- 35,47 ---- }; + class CompilerAutodetectThread : public QThread + { + Q_OBJECT + public: + CompilerAutodetectThread(QObject *parent = 0); + virtual void run(); + virtual ~CompilerAutodetectThread(); + }; + class Application : public QApplication { *************** *** 39,44 **** Q_OBJECT - public: PackageManager *packageManager; protected: protected slots: --- 49,58 ---- Q_OBJECT PackageManager *packageManager; + CompilerManager *compilerManager; + + public: + QTabWidget *mainTab; + protected: protected slots: *************** *** 50,57 **** --- 64,77 ---- void sigPackagesRefresh(); + void sigCompilerRegister(CBM::Compiler *_compiler); + void sigCompilerUnregister(CBM::Compiler *_compiler); + public slots: void doPackageInstallation(CBM::Package *_package); void doPackageUninstallation(CBM::Package *_package); + void doCompilerAutodetect(void); + void doCompilerRegisterManual(void); + public: Application(int &argc, char **argv); *************** *** 60,63 **** --- 80,85 ---- virtual void packageUninstallation(CBM::Package *_package); virtual void packagesRefresh(void); + virtual void compilerRegister(CBM::Compiler *_compiler); + virtual void compilerUnregister(CBM::Compiler *_compiler); virtual ~Application(); |
