[Compbench-devel] CompBenchmarks++/Qt-4 main.cpp, 1.2, 1.3 main.h, 1.2, 1.3

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6563

Modified Files:
	main.cpp main.h 
Log Message:
Many improvements (mainly benchmark plan definition, drag & drop).

Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.cpp	16 May 2007 20:25:50 -0000	1.2
--- main.cpp	17 May 2007 22:38:55 -0000	1.3
***************
*** 4,7 ****
--- 4,9 ----
  #include <Status/Status.h>
  
+ #include <Plan/PlanAvailableCompiler.h>
+ 
  #include <QFileDialog>
  
***************
*** 115,118 ****
--- 117,121 ----
    mainTab = new QTabWidget;
  
+   planCompilerSelected=0;
    App=this;
  
***************
*** 123,129 ****
    packageManager=new PackageManager;
    mainTab->addTab(packageManager,tr("Packages"));
! 	 
    compilerManager=new CompilerManager;
    mainTab->addTab(compilerManager,tr("Compilers"));
  
    connect(this, SIGNAL(sigPackageInstallation(CBM::Package*)),
--- 126,138 ----
    packageManager=new PackageManager;
    mainTab->addTab(packageManager,tr("Packages"));
!   mainTab->setTabToolTip(0, tr("Install supported packages and benchmarking software sources"));
! 
    compilerManager=new CompilerManager;
    mainTab->addTab(compilerManager,tr("Compilers"));
+   mainTab->setTabToolTip(1, tr("Declare compilers to be used in benchmark"));
+ 
+   planManager=new PlanManager;
+   mainTab->addTab(planManager, tr("Benchmark Plan"));
+   mainTab->setTabToolTip(2, tr("Define and order contexts for benchmarks"));
  
    connect(this, SIGNAL(sigPackageInstallation(CBM::Package*)),
***************
*** 140,147 ****
  
    connect(this, SIGNAL(sigCompilerRegister(CBM::Compiler*)),
! 	  compilerManager, SLOT(doCompilerRegister(CBM::Compiler*)));
  
    connect(this, SIGNAL(sigCompilerUnregister(CBM::Compiler*)),
! 	  compilerManager, SLOT(doCompilerUnregister(CBM::Compiler*)));
  }
  
--- 149,176 ----
  
    connect(this, SIGNAL(sigCompilerRegister(CBM::Compiler*)),
! 	  this, SLOT(doCompilerRegister(CBM::Compiler*)),
! 	  Qt::QueuedConnection);
  
    connect(this, SIGNAL(sigCompilerUnregister(CBM::Compiler*)),
! 	  this, SLOT(doCompilerUnregister(CBM::Compiler*)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPlanCompilerSelected(CBM::Compiler*)),
! 	  this, SLOT(doPlanCompilerSelected(CBM::Compiler*)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)),
! 	  this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPlanBatchUnregister(CBM::PlanBatch*)),
! 	  this, SLOT(doPlanBatchUnregister(CBM::PlanBatch*)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPlanBatchRenamed(CBM::PlanBatch*,
! 					   QString)),
! 	  this, SLOT(doPlanBatchRenamed(CBM::PlanBatch*,
! 					QString)),
! 	  Qt::QueuedConnection);
  }
  
***************
*** 149,154 ****
--- 178,191 ----
  {
    packageManager->packagesRefresh();
+   planManager->AvailableBenchmark()->refreshBenchmarks(); 
  }
  
+ 
+ int Application::isPresent(CBM::Compiler *_compiler)
+ {
+   return(compilerManager->List()->isPresent(_compiler));
+ }
+ 
+ 
  void Application::packagesRefresh(void)
  {
***************
*** 180,183 ****
--- 217,257 ----
  }
  
+ void Application::doCompilerRegister(CBM::Compiler *_compiler)
+ {
+   if (isPresent(_compiler)) {
+     compilerManager->compilerRegister(_compiler);
+     planManager->AvailableCompiler()->compilerRegister(_compiler);
+   }
+ }
+ 
+ void Application::doPlanBatchRegister(CBM::PlanBatch *_batch)
+ {
+   planManager->Define()->Batch()->planBatchRegister(_batch);
+ }
+ 
+ void Application::doPlanBatchUnregister(CBM::PlanBatch *_batch)
+ {
+   planManager->Define()->Batch()->planBatchUnregister(_batch);
+ }
+ 
+ void Application::doPlanBatchRenamed(CBM::PlanBatch *_batch,
+ 				     QString _newname)
+ {
+   planManager->Define()->Batch()->planBatchRenamed(_batch,
+ 						   _newname);
+ }
+ 
+ 
+ void Application::doPlanCompilerSelected(CBM::Compiler *_compiler)
+ {
+   planCompilerSelected=_compiler;
+ }
+ 
+ void Application::doCompilerUnregister(CBM::Compiler *_compiler)
+ {
+   compilerManager->compilerUnregister(_compiler);
+   planManager->AvailableCompiler()->compilerUnregister(_compiler);
+ }
+ 
  void Application::doCompilerAutodetect(void)
  {
***************
*** 234,237 ****
--- 308,337 ----
  }
  
+ void Application::planCompilerSelect(CBM::Compiler *_compiler)
+ {
+   emit sigPlanCompilerSelected(_compiler);
+ }
+ 
+ void Application::planBatchRegister(CBM::PlanBatch *_batch)
+ {
+   emit sigPlanBatchRegister(_batch);
+ }
+ 
+ void Application::planBatchUnregister(CBM::PlanBatch *_batch)
+ {
+   emit sigPlanBatchUnregister(_batch);
+ }
+ 
+ void Application::planBatchRenamed(CBM::PlanBatch *_batch,
+ 				   QString _newname)
+ {
+   emit sigPlanBatchRenamed(_batch, _newname);
+ }
+ 
+ CBM::Compiler *Application::PlanCompilerSelected(void)
+ {
+   return(planCompilerSelected);
+ }
+ 
  Application::~Application()
  {
***************
*** 242,249 ****
  {
    int         result;
!   Application app(argc, argv);
    CBM_SYSTEM  sys;
  
    sys.init();
  
    /*
--- 342,350 ----
  {
    int         result;
!   Application *app;
    CBM_SYSTEM  sys;
  
    sys.init();
+   app=new Application(argc, argv);
  
    /*
***************
*** 264,270 ****
    */
  
!   app.mainTab->show();
  
!   result=app.exec();
    sys.done();
    return(result);
--- 365,372 ----
    */
  
!   app->mainTab->show();
  
!   result=app->exec();
!   delete(app);
    sys.done();
    return(result);

Index: main.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.h	16 May 2007 20:25:50 -0000	1.2
--- main.h	17 May 2007 22:38:55 -0000	1.3
***************
*** 10,13 ****
--- 10,16 ----
  #include <Package/PackageManager.h>
  #include <Compiler/CompilerManager.h>
+ #include <Plan/PlanManager.h>
+ 
+ #include <Plan/Plan-Batch.h>
  
  namespace CQT {
***************
*** 51,54 ****
--- 54,60 ----
      PackageManager *packageManager;
      CompilerManager *compilerManager;
+     PlanManager     *planManager;
+ 
+     CBM::Compiler   *planCompilerSelected;
  
    public:
***************
*** 59,62 ****
--- 65,70 ----
      void doPackagesRefresh(void);
  
+     virtual int isPresent(CBM::Compiler *_compiler);
+ 
    signals:
      void sigPackageInstallation(CBM::Package *_package);
***************
*** 67,77 ****
--- 75,102 ----
      void sigCompilerUnregister(CBM::Compiler *_compiler);
  
+     void sigPlanBatchRegister(CBM::PlanBatch *_batch);
+     void sigPlanBatchUnregister(CBM::PlanBatch *_batch);
+     void sigPlanBatchRenamed(CBM::PlanBatch *_batch,
+ 			     QString _newname);
+ 
+     void sigPlanCompilerSelected(CBM::Compiler *_compiler);
+ 
    public slots:
      void doPackageInstallation(CBM::Package *_package);
      void doPackageUninstallation(CBM::Package *_package);
  
+     void doCompilerRegister(CBM::Compiler *_compiler);
+     void doCompilerUnregister(CBM::Compiler *_compiler);
+ 
      void doCompilerAutodetect(void);
      void doCompilerRegisterManual(void);
  
+     virtual void doPlanBatchRegister(CBM::PlanBatch *_batch);
+     virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch);
+     virtual void doPlanBatchRenamed(CBM::PlanBatch *_batch,
+ 				    QString _newname);
+ 
+     void doPlanCompilerSelected(CBM::Compiler *_compiler);
+ 
    public:
      Application(int &argc, char **argv);
***************
*** 83,86 ****
--- 108,119 ----
      virtual void compilerUnregister(CBM::Compiler *_compiler);
  
+     virtual void planBatchRegister(CBM::PlanBatch *_batch);
+     virtual void planBatchUnregister(CBM::PlanBatch *_batch);
+     virtual void planBatchRenamed(CBM::PlanBatch *_batch,
+ 				  QString _newname);
+ 
+     virtual void planCompilerSelect(CBM::Compiler *_compiler);
+     virtual CBM::Compiler *PlanCompilerSelected(void);
+ 
      virtual ~Application();
    };