compbench-devel Mailing List for CompBenchmarks (Page 3)
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:53:11
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22038 Modified Files: PlanDefineBatch.cpp Log Message: Fixes on OptionSet and option handling. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** PlanDefineBatch.cpp 13 Sep 2007 19:13:31 -0000 1.17 --- PlanDefineBatch.cpp 16 Sep 2007 18:52:54 -0000 1.18 *************** *** 443,447 **** case PIOptions: App->planOptionsRenamed(I->Nearest(PIPlanBatch)->Batch(), ! I->Nearest(PIOptionSet)->OptionSet(), I->OptionsGroup(), I->text(0)); --- 443,447 ---- case PIOptions: App->planOptionsRenamed(I->Nearest(PIPlanBatch)->Batch(), ! I->Parent(PIOptionSet)->OptionSet(), I->OptionsGroup(), I->text(0)); *************** *** 582,586 **** if (I) { - printf("Rename should be OK\n"); _options->setId(_newname.toStdString()); } --- 582,585 ---- *************** *** 755,770 **** } else if (event->mimeData()->text()=="option") { PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); event->setDropAction(Qt::MoveAction); CBM::CompilerOption *O = App->PlanCompilerOptionSelected(); ! PlanDefineBatchListItem *P = I->Nearest(PIOptions); if (P) { ! P->setExpanded(true); ! /* if (P->Options()->add(O)) { ! PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O); ! P->addChild(OI); ! */ ! printf("there!\n"); } } --- 754,772 ---- } else if (event->mimeData()->text()=="option") { + printf("yeah\n"); PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); event->setDropAction(Qt::MoveAction); CBM::CompilerOption *O = App->PlanCompilerOptionSelected(); ! PlanDefineBatchListItem *P = I->Parent(PIOptions); ! printf("P=%x\n", P); if (P) { ! P->setExpanded(true); ! if (P->OptionsGroup()->add(I->Parent(PIPlanBatch)->Batch(), ! O->Option())) { ! PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O); ! P->addChild(OI); ! printf("there!\n"); ! } } } |
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:52:29
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21643 Modified Files: UI.h Log Message: currentMsg() is now protected. Index: UI.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** UI.h 12 Sep 2007 18:58:43 -0000 1.18 --- UI.h 16 Sep 2007 18:51:57 -0000 1.19 *************** *** 31,34 **** --- 31,35 ---- Mutex mui; /*<! Mutex managing concurrent accesses. */ + protected: /** \brief Returns current message. * *************** *** 38,42 **** virtual UIMsg *currentMsg(void); ! protected: /** Compute depth of a message. * --- 39,43 ---- virtual UIMsg *currentMsg(void); ! /** Compute depth of a message. * |
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:51:26
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21610 Modified Files: Compiler-Options.cpp Log Message: Option analyzis messages has been revisited. Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Compiler-Options.cpp 12 Sep 2007 20:20:53 -0000 1.8 --- Compiler-Options.cpp 16 Sep 2007 18:51:20 -0000 1.9 *************** *** 196,200 **** o=cbmSystem->Split(_options, " ", i++); if ((o=="") && (i==1)) { ! cbmUI->msgPlanOptionRegister(o); c=addSingle(_batch, _options); r+=c; --- 196,200 ---- o=cbmSystem->Split(_options, " ", i++); if ((o=="") && (i==1)) { ! // cbmUI->msgPlanOptionRegister(o); c=addSingle(_batch, _options); r+=c; |
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:50:49
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21246 Modified Files: Compiler.cpp Log Message: Option analyzis messages has been revisited (1 is returned on success). Index: Compiler.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Compiler.cpp 17 May 2007 14:31:12 -0000 1.15 --- Compiler.cpp 16 Sep 2007 18:50:46 -0000 1.16 *************** *** 227,230 **** --- 227,231 ---- int times = 0; int lastOk = 0; + int timesOk = 0; std::string tmp; std::string ck; *************** *** 247,254 **** r+=" (not supported)\n"; lastOk=1; } else { tmp=D->Use(); lastOk=(tmp=="1"); ! if (D->CompilationTwoPassNeeded()) { if (D->CompilationPass()==1) { --- 248,256 ---- r+=" (not supported)\n"; lastOk=1; + timesOk++; } else { tmp=D->Use(); lastOk=(tmp=="1"); ! timesOk+=lastOk; if (D->CompilationTwoPassNeeded()) { if (D->CompilationPass()==1) { *************** *** 300,304 **** colDestroy(); ! if (!times) r="1\n"; --- 302,306 ---- colDestroy(); ! if (timesOk==times) r="1\n"; |
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:50:03
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20816 Modified Files: cloptions.cpp Log Message: Option analyzis messages has been revisited. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan/cloptions.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cloptions.cpp 10 Sep 2007 19:42:41 -0000 1.11 --- cloptions.cpp 16 Sep 2007 18:49:58 -0000 1.12 *************** *** 823,828 **** if (O->add(B, option)) { storePlan(P, planFileName); - } else { - cbmUI->outputKO("Operation interrupted; can't add option(s)"); } delete(O); --- 823,826 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-13 19:13:36
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18642 Modified Files: PlanDefineBatch.cpp Log Message: Fixed : option group renaming. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PlanDefineBatch.cpp 13 Sep 2007 19:08:01 -0000 1.16 --- PlanDefineBatch.cpp 13 Sep 2007 19:13:31 -0000 1.17 *************** *** 441,444 **** --- 441,450 ---- I->text(0)); break; + case PIOptions: + App->planOptionsRenamed(I->Nearest(PIPlanBatch)->Batch(), + I->Nearest(PIOptionSet)->OptionSet(), + I->OptionsGroup(), + I->text(0)); + break; default: break; |
|
From: Frederic T. <xf...@us...> - 2007-09-13 19:08:04
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16240 Modified Files: PlanDefineBatch.cpp Log Message: Fixed : option group unregistering. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PlanDefineBatch.cpp 13 Sep 2007 19:00:42 -0000 1.15 --- PlanDefineBatch.cpp 13 Sep 2007 19:08:01 -0000 1.16 *************** *** 592,599 **** ! PlanDefineBatchListItem *R = B->Nearest(PIOptions); if (R) { R->takeChild(R->indexOfChild(B)); delete(R->OptionsGroup()); delete(B); --- 592,600 ---- ! PlanDefineBatchListItem *R = B->Parent(PIOptionSet); if (R) { R->takeChild(R->indexOfChild(B)); + _set->remove(B->OptionsGroup()); delete(R->OptionsGroup()); delete(B); |
|
From: Frederic T. <xf...@us...> - 2007-09-13 19:00:47
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13095/Plan Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Simplified message passing interface to option groups. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PlanDefineBatch.cpp 13 Sep 2007 18:48:30 -0000 1.14 --- PlanDefineBatch.cpp 13 Sep 2007 19:00:42 -0000 1.15 *************** *** 92,96 **** { CBM::Compiler *C = item->Compiler(); ! App->planCompilerRemove(item->Parent(PIPlanBatch)->Batch(), C); } --- 92,96 ---- { CBM::Compiler *C = item->Compiler(); ! PL->doCompilerRemove(item->Parent(PIPlanBatch)->Batch(), C); } *************** *** 121,125 **** if ((B) && (OS)) ! App->planOptionsRegister(B,OS->OptionSet()); } --- 121,125 ---- if ((B) && (OS)) ! PL->doOptionsRegister(B,OS->OptionSet()); } *************** *** 131,135 **** if ((B) && (OS) && (O)) ! App->planOptionsUnregister(B, OS, O); } --- 131,135 ---- if ((B) && (OS) && (O)) ! PL->doOptionsUnregister(B, OS, O); } *************** *** 308,315 **** Qt::QueuedConnection); - connect(this, SIGNAL(sigCompilerRemove(CBM::PlanBatch*, CBM::Compiler*)), - this, SLOT(doCompilerRemove(CBM::PlanBatch*, CBM::Compiler*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigOptionSetRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 308,311 ---- *************** *** 321,341 **** - - - - connect(this, SIGNAL(sigOptionsRegister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - this, SLOT(doOptionsRegister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - Qt::QueuedConnection); - - connect(this, SIGNAL(sigOptionsUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*, - CBM::CompilerOptions*)), - this, SLOT(doOptionsUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*, - CBM::CompilerOptions*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigOptionsRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 317,320 ---- *************** *** 570,577 **** CBM::CompilerOptionSet *_set) { - printf("R In\n"); PlanDefineBatchListItem *R = Item(_batch, _set); - printf("R=%x\n", R); if (R) { std::string n = "option group "; --- 549,554 ---- *************** *** 636,645 **** } - void PlanDefineBatchList::compilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler) - { - emit sigCompilerRemove(_batch, _compiler); - } - void PlanDefineBatchList::optionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 613,616 ---- *************** *** 650,666 **** } - void PlanDefineBatchList::optionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set) - { - emit sigOptionsRegister(_batch, _set); - } - - void PlanDefineBatchList::optionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options) - { - emit sigOptionsUnregister(_batch, _set, _options); - } - void PlanDefineBatchList::optionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 621,624 ---- Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlanDefineBatch.h 13 Sep 2007 18:48:30 -0000 1.12 --- PlanDefineBatch.h 13 Sep 2007 19:00:42 -0000 1.13 *************** *** 112,127 **** void sigCompilerUnregister(CBM::Compiler *_compiler); - void sigCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); - void sigOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, QString _newname); - void sigOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - void sigOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); void sigOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 112,119 ---- *************** *** 138,143 **** virtual void doCompilerUnregister(CBM::Compiler *_compiler); - virtual void doCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); // !!! --- 130,133 ---- *************** *** 147,157 **** - virtual void doOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - - virtual void doOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); - virtual void doOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 137,140 ---- *************** *** 168,171 **** --- 151,166 ---- CBM::CompilerOptionSet *_options); + virtual void doOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + + virtual void doOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + + + + virtual void doCompilerRemove(CBM::PlanBatch *_batch, + CBM::Compiler *_compiler); + public: *************** *** 177,192 **** virtual void compilerUnregister(CBM::Compiler *_compiler); - virtual void compilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); - virtual void optionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, QString _newname); - virtual void optionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - virtual void optionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); virtual void optionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 172,179 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-13 19:00:47
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13095 Modified Files: main.cpp main.h Log Message: Simplified message passing interface to option groups. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main.cpp 13 Sep 2007 18:48:30 -0000 1.15 --- main.cpp 13 Sep 2007 19:00:42 -0000 1.16 *************** *** 211,220 **** Qt::QueuedConnection); - connect(this, SIGNAL(sigPlanBatchCompilerRemove(CBM::PlanBatch*, - CBM::Compiler*)), - this, SLOT(doPlanBatchCompilerRemove(CBM::PlanBatch*, - CBM::Compiler*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigPlanOptionSetRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 211,214 ---- *************** *** 226,241 **** - connect(this, SIGNAL(sigPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)), - this, SLOT(doPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)), - Qt::QueuedConnection); - - connect(this, SIGNAL(sigPlanOptionsUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*, - CBM::CompilerOptions*)), - this, SLOT(doPlanOptionsUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*, - CBM::CompilerOptions*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigPlanOptionsRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 220,223 ---- *************** *** 347,357 **** } - void Application::doPlanBatchCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler) - { - planManager->Define()->Batch()->compilerRemove(_batch, - _compiler); - } - void Application::doPlanOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 329,332 ---- *************** *** 363,379 **** } - void Application::doPlanOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set) - { - planManager->Define()->Batch()->optionsRegister(_batch, _set); - } - - void Application::doPlanOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options) - { - planManager->Define()->Batch()->optionsUnregister(_batch, _set, _options); - } - void Application::doPlanOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 338,341 ---- *************** *** 481,491 **** } - void Application::planCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler) - { - emit sigPlanBatchCompilerRemove(_batch, - _compiler); - } - void Application::planOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 443,446 ---- *************** *** 495,511 **** } - void Application::planOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set) - { - emit sigPlanOptionsRegister(_batch, _set); - } - - void Application::planOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options) - { - emit sigPlanOptionsUnregister(_batch, _set, _options); - } - void Application::planOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 450,453 ---- Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** main.h 13 Sep 2007 18:48:30 -0000 1.10 --- main.h 13 Sep 2007 19:00:42 -0000 1.11 *************** *** 96,101 **** void sigPlanBatchRenamed(CBM::PlanBatch *_batch, QString _newname); - void sigPlanBatchCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch, --- 96,99 ---- *************** *** 103,111 **** QString _newname); - void sigPlanOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - void sigPlanOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); void sigPlanOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 101,104 ---- *************** *** 131,148 **** QString _newname); - virtual void doPlanBatchCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); - virtual void doPlanOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, QString _newname); - virtual void doPlanOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - - virtual void doPlanOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); - virtual void doPlanOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 124,131 ---- *************** *** 168,173 **** virtual void planBatchRenamed(CBM::PlanBatch *_batch, QString _newname); - virtual void planCompilerRemove(CBM::PlanBatch *_batch, - CBM::Compiler *_compiler); virtual void planOptionSetRenamed(CBM::PlanBatch *_batch, --- 151,154 ---- *************** *** 175,183 **** QString _newname); - virtual void planOptionsRegister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set); - virtual void planOptionsUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_set, - CBM::CompilerOptions *_options); virtual void planOptionsRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_set, --- 156,159 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:48:35
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6940/Plan Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Simplified message passing interface to Batch instances. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlanDefineBatch.cpp 13 Sep 2007 18:24:47 -0000 1.13 --- PlanDefineBatch.cpp 13 Sep 2007 18:48:30 -0000 1.14 *************** *** 76,85 **** CBM::PlanBatch *P = new CBM::PlanBatch(PlanHolderGet(), n); ! App->planBatchRegister(P); } void PlanDefineBatchContextMenu::doBatchUnregister(void) { ! App->planBatchUnregister(item->Batch()); } --- 76,85 ---- CBM::PlanBatch *P = new CBM::PlanBatch(PlanHolderGet(), n); ! PL->doPlanBatchRegister(P); } void PlanDefineBatchContextMenu::doBatchUnregister(void) { ! PL->doPlanBatchUnregister(item->Batch()); } *************** *** 101,105 **** if (B) PL->doOptionSetRegister(B); - // App->planOptionSetRegister(B); } --- 101,104 ---- *************** *** 110,114 **** if (B) ! App->planOptionSetUnregister(B, OS); } --- 109,113 ---- if (B) ! PL->doOptionSetUnregister(B, OS); } *************** *** 298,309 **** PL=this; - 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)), --- 297,301 ---- *************** *** 320,333 **** Qt::QueuedConnection); - connect(this, SIGNAL(sigOptionSetRegister(CBM::PlanBatch*)), - this, SLOT(doOptionSetRegister(CBM::PlanBatch*)), - Qt::QueuedConnection); - - connect(this, SIGNAL(sigOptionSetUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - this, SLOT(doOptionSetUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigOptionSetRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 312,315 ---- *************** *** 576,582 **** PlanDefineBatchListItem *R = B->Nearest(PIOptionSets); if (R) { R->takeChild(R->indexOfChild(B)); ! delete(R->OptionSet()); delete(B); } --- 558,566 ---- PlanDefineBatchListItem *R = B->Nearest(PIOptionSets); + printf("unreg B=%x (R=%x)\n", B, R); + if (R) { R->takeChild(R->indexOfChild(B)); ! _batch->remove(_options); delete(B); } *************** *** 640,653 **** } - void PlanDefineBatchList::planBatchRegister(CBM::PlanBatch *_batch) - { - emit sigPlanBatchRegister(_batch); - } - - void PlanDefineBatchList::planBatchUnregister(CBM::PlanBatch *_batch) - { - emit sigPlanBatchUnregister(_batch); - } - void PlanDefineBatchList::planBatchRenamed(CBM::PlanBatch *_batch, QString _newname) --- 624,627 ---- *************** *** 668,682 **** } - void PlanDefineBatchList::optionSetRegister(CBM::PlanBatch *_batch) - { - emit sigOptionSetRegister(_batch); - } - - void PlanDefineBatchList::optionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options) - { - emit sigOptionSetUnregister(_batch, _options); - } - void PlanDefineBatchList::optionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 642,645 ---- Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PlanDefineBatch.h 13 Sep 2007 18:24:47 -0000 1.11 --- PlanDefineBatch.h 13 Sep 2007 18:48:30 -0000 1.12 *************** *** 57,61 **** }; ! class PlanDefineBatchListItem : public QTreeWidgetItem, public CompilerHolder, public OptionSetHolder, --- 57,61 ---- }; ! class PlanDefineBatchListItem : public QTreeWidgetItem, public CompilerHolder, public OptionSetHolder, *************** *** 107,112 **** signals: - void sigPlanBatchRegister(CBM::PlanBatch *_batch); - void sigPlanBatchUnregister(CBM::PlanBatch *_batch); void sigPlanBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 107,110 ---- *************** *** 117,123 **** CBM::Compiler *_compiler); - void sigOptionSetRegister(CBM::PlanBatch *_batch); - void sigOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); void sigOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 115,118 ---- *************** *** 139,144 **** virtual void itemEdited(QTreeWidgetItem *item, int); - virtual void doPlanBatchRegister(CBM::PlanBatch *_batch); - virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch); virtual void doPlanBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 134,137 ---- *************** *** 149,154 **** // !!! - virtual void doOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); virtual void doOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 142,145 ---- *************** *** 170,179 **** public slots: virtual void doOptionSetRegister(CBM::PlanBatch *_batch); public: PlanDefineBatchList(QWidget *parent = 0); - virtual void planBatchRegister(CBM::PlanBatch *_batch); - virtual void planBatchUnregister(CBM::PlanBatch *_batch); virtual void planBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 161,175 ---- public slots: + virtual void doPlanBatchRegister(CBM::PlanBatch *_batch); + virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch); + virtual void doOptionSetRegister(CBM::PlanBatch *_batch); + virtual void doOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options); + + public: PlanDefineBatchList(QWidget *parent = 0); virtual void planBatchRenamed(CBM::PlanBatch *_batch, QString _newname); *************** *** 184,190 **** CBM::Compiler *_compiler); - virtual void optionSetRegister(CBM::PlanBatch *_batch); - virtual void optionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); virtual void optionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 180,183 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:48:33
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6940 Modified Files: main.cpp main.h Log Message: Simplified message passing interface to Batch instances. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.cpp 13 Sep 2007 18:25:32 -0000 1.14 --- main.cpp 13 Sep 2007 18:48:30 -0000 1.15 *************** *** 205,216 **** 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)), --- 205,208 ---- *************** *** 225,238 **** Qt::QueuedConnection); - connect(this, SIGNAL(sigPlanOptionSetRegister(CBM::PlanBatch*)), - this, SLOT(doPlanOptionSetRegister(CBM::PlanBatch*)), - Qt::QueuedConnection); - - connect(this, SIGNAL(sigPlanOptionSetUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - this, SLOT(doPlanOptionSetUnregister(CBM::PlanBatch*, - CBM::CompilerOptionSet*)), - Qt::QueuedConnection); - connect(this, SIGNAL(sigPlanOptionSetRenamed(CBM::PlanBatch*, CBM::CompilerOptionSet*, --- 217,220 ---- *************** *** 358,371 **** } - 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) --- 340,343 ---- *************** *** 382,396 **** } - void Application::doPlanOptionSetRegister(CBM::PlanBatch *_batch) - { - planManager->Define()->Batch()->optionSetRegister(_batch); - } - - void Application::doPlanOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options) - { - planManager->Define()->Batch()->optionSetUnregister(_batch, _options); - } - void Application::doPlanOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 354,357 ---- *************** *** 514,527 **** } - 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) --- 475,478 ---- *************** *** 537,551 **** } - void Application::planOptionSetRegister(CBM::PlanBatch *_batch) - { - emit sigPlanOptionSetRegister(_batch); - } - - void Application::planOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options) - { - emit sigPlanOptionSetUnregister(_batch, _options); - } - void Application::planOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 488,491 ---- Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.h 13 Sep 2007 18:25:32 -0000 1.9 --- main.h 13 Sep 2007 18:48:30 -0000 1.10 *************** *** 94,99 **** void sigCompilerUnregister(CBM::Compiler *_compiler); - void sigPlanBatchRegister(CBM::PlanBatch *_batch); - void sigPlanBatchUnregister(CBM::PlanBatch *_batch); void sigPlanBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 94,97 ---- *************** *** 101,107 **** CBM::Compiler *_compiler); - void sigPlanOptionSetRegister(CBM::PlanBatch *_batch); - void sigPlanOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 99,102 ---- *************** *** 133,138 **** void doCompilerRegisterManual(void); - virtual void doPlanBatchRegister(CBM::PlanBatch *_batch); - virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch); virtual void doPlanBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 128,131 ---- *************** *** 141,147 **** CBM::Compiler *_compiler); - virtual void doPlanOptionSetRegister(CBM::PlanBatch *_batch); - virtual void doPlanOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); virtual void doPlanOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 134,137 ---- *************** *** 176,181 **** virtual void optionInfo(CBM::CompilerOption *_option); - virtual void planBatchRegister(CBM::PlanBatch *_batch); - virtual void planBatchUnregister(CBM::PlanBatch *_batch); virtual void planBatchRenamed(CBM::PlanBatch *_batch, QString _newname); --- 166,169 ---- *************** *** 183,189 **** CBM::Compiler *_compiler); - virtual void planOptionSetRegister(CBM::PlanBatch *_batch); - virtual void planOptionSetUnregister(CBM::PlanBatch *_batch, - CBM::CompilerOptionSet *_options); virtual void planOptionSetRenamed(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options, --- 171,174 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:27:28
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27944 Modified Files: compbenchmarks-ui-qt4.pro Log Message: New files added. Index: compbenchmarks-ui-qt4.pro =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** compbenchmarks-ui-qt4.pro 12 Sep 2007 17:49:47 -0000 1.9 --- compbenchmarks-ui-qt4.pro 13 Sep 2007 18:25:53 -0000 1.10 *************** *** 15,19 **** INCLUDEPATH += . ../libcompbenchmarks ../testing/libcompbenchmarks ! base_sources = Basic/OptionHolder Basic/OptionSetHolder Basic/BenchmarkHolder Basic/PlanBatchHolder Basic/Info option_sources = CompilerOption/CompilerOptionInfo --- 15,19 ---- INCLUDEPATH += . ../libcompbenchmarks ../testing/libcompbenchmarks ! base_sources = Basic/OptionHolder Basic/OptionsHolder Basic/OptionSetHolder Basic/BenchmarkHolder Basic/PlanBatchHolder Basic/Info option_sources = CompilerOption/CompilerOptionInfo |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:26:48
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27870 Modified Files: main.cpp main.h Log Message: Option group messages handling. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main.cpp 12 Sep 2007 18:59:21 -0000 1.13 --- main.cpp 13 Sep 2007 18:25:32 -0000 1.14 *************** *** 133,136 **** --- 133,137 ---- console=new StatusConsole(sa); planCompilerSelected=0; + planCompilerOptionSelected=0; App=this; *************** *** 200,203 **** --- 201,208 ---- Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanCompilerOptionSelected(CBM::CompilerOption*)), + this, SLOT(doPlanCompilerOptionSelected(CBM::CompilerOption*)), + Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)), this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)), *************** *** 237,240 **** --- 242,268 ---- QString)), Qt::QueuedConnection); + + + connect(this, SIGNAL(sigPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)), + this, SLOT(doPlanOptionsRegister(CBM::PlanBatch*,CBM::CompilerOptionSet*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigPlanOptionsUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*)), + this, SLOT(doPlanOptionsUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigPlanOptionsRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*, + QString)), + this, SLOT(doPlanOptionsRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*, + QString)), + Qt::QueuedConnection); } *************** *** 374,377 **** --- 402,429 ---- } + void Application::doPlanOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set) + { + planManager->Define()->Batch()->optionsRegister(_batch, _set); + } + + void Application::doPlanOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options) + { + planManager->Define()->Batch()->optionsUnregister(_batch, _set, _options); + } + + void Application::doPlanOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname) + { + planManager->Define()->Batch()->optionsRenamed(_batch, + _set, + _options, + _newname); + } + void Application::doPlanCompilerSelected(CBM::Compiler *_compiler) *************** *** 380,383 **** --- 432,440 ---- } + void Application::doPlanCompilerOptionSelected(CBM::CompilerOption *_option) + { + planCompilerOptionSelected=_option; + } + void Application::doCompilerUnregister(CBM::Compiler *_compiler) { *************** *** 452,455 **** --- 509,517 ---- } + void Application::planOptionSelect(CBM::CompilerOption *_option) + { + emit sigPlanCompilerOptionSelected(_option); + } + void Application::planBatchRegister(CBM::PlanBatch *_batch) { *************** *** 493,496 **** --- 555,579 ---- } + void Application::planOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set) + { + emit sigPlanOptionsRegister(_batch, _set); + } + + void Application::planOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options) + { + emit sigPlanOptionsUnregister(_batch, _set, _options); + } + + void Application::planOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname) + { + emit sigPlanOptionsRenamed(_batch, _set, _options, _newname); + } + CBM::Compiler *Application::PlanCompilerSelected(void) { *************** *** 498,501 **** --- 581,589 ---- } + CBM::CompilerOption *Application::PlanCompilerOptionSelected(void) + { + return(planCompilerOptionSelected); + } + Application::~Application() { Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.h 11 Sep 2007 20:18:53 -0000 1.8 --- main.h 13 Sep 2007 18:25:32 -0000 1.9 *************** *** 63,66 **** --- 63,67 ---- CBM::Compiler *planCompilerSelected; + CBM::CompilerOption *planCompilerOptionSelected; QTabWidget *mainTab; *************** *** 107,111 **** --- 108,123 ---- QString _newname); + void sigPlanOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + void sigPlanOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + void sigPlanOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + void sigPlanCompilerSelected(CBM::Compiler *_compiler); + void sigPlanCompilerOptionSelected(CBM::CompilerOption *_option); public slots: *************** *** 136,140 **** --- 148,165 ---- QString _newname); + virtual void doPlanOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + + virtual void doPlanOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + + virtual void doPlanOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + void doPlanCompilerSelected(CBM::Compiler *_compiler); + void doPlanCompilerOptionSelected(CBM::CompilerOption *_option); public: *************** *** 165,171 **** --- 190,209 ---- QString _newname); + virtual void planOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + virtual void planOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + virtual void planOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + + virtual void planCompilerSelect(CBM::Compiler *_compiler); + virtual void planOptionSelect(CBM::CompilerOption *_option); virtual CBM::Compiler *PlanCompilerSelected(void); + virtual CBM::CompilerOption *PlanCompilerOptionSelected(void); virtual ~Application(); |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:25:31
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27384 Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Simplified message passing interface to optionset registering. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlanDefineBatch.cpp 13 Sep 2007 18:18:34 -0000 1.12 --- PlanDefineBatch.cpp 13 Sep 2007 18:24:47 -0000 1.13 *************** *** 12,15 **** --- 12,17 ---- int new_options_idx = 0; + PlanDefineBatchList *PL = 0; + PlanDefineBatchContextMenuEvent::PlanDefineBatchContextMenuEvent(Reason reason, const QPoint &globalPos) *************** *** 98,102 **** if (B) ! App->planOptionSetRegister(B); } --- 100,105 ---- if (B) ! PL->doOptionSetRegister(B); ! // App->planOptionSetRegister(B); } *************** *** 294,297 **** --- 297,301 ---- plan=new CBM::Plan; + PL=this; connect(this, SIGNAL(sigPlanBatchRegister(CBM::PlanBatch*)), this, SLOT(doPlanBatchRegister(CBM::PlanBatch*)), Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlanDefineBatch.h 13 Sep 2007 18:18:34 -0000 1.10 --- PlanDefineBatch.h 13 Sep 2007 18:24:47 -0000 1.11 *************** *** 148,152 **** CBM::Compiler *_compiler); ! virtual void doOptionSetRegister(CBM::PlanBatch *_batch); virtual void doOptionSetUnregister(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options); --- 148,152 ---- CBM::Compiler *_compiler); ! // !!! virtual void doOptionSetUnregister(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options); *************** *** 169,173 **** ! public: PlanDefineBatchList(QWidget *parent = 0); --- 169,174 ---- ! public slots: ! virtual void doOptionSetRegister(CBM::PlanBatch *_batch); public: PlanDefineBatchList(QWidget *parent = 0); |
|
From: Frederic T. <xf...@us...> - 2007-09-13 18:18:37
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24218 Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Option groups can be registered. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PlanDefineBatch.cpp 12 Sep 2007 19:33:12 -0000 1.11 --- PlanDefineBatch.cpp 13 Sep 2007 18:18:34 -0000 1.12 *************** *** 44,47 **** --- 44,57 ---- addAction(QIcon(":/icons/remove.png"), tr("Remove option set"), this, SLOT(doOptionSetUnregister())); + + + if ((item->type()==PIOptionSet) || + (item->type()==PIOptions)) + addAction(QIcon(":/icons/add.png"), tr("Add options"), + this, SLOT(doOptionsRegister())); + + if (item->type()==PIOptions) + addAction(QIcon(":/icons/remove.png"), tr("Remove options"), + this, SLOT(doOptionsUnregister())); *************** *** 100,103 **** --- 110,139 ---- } + + + void PlanDefineBatchContextMenu::doOptionsRegister(void) + { + CBM::PlanBatch *B = item->Parent(PIPlanBatch)->Batch(); + + PlanDefineBatchListItem *OS = item; + + if ((B) && (OS)) + App->planOptionsRegister(B,OS->OptionSet()); + } + + void PlanDefineBatchContextMenu::doOptionsUnregister(void) + { + CBM::CompilerOptions *O = item->OptionsGroup(); + CBM::CompilerOptionSet *OS = item->Parent(PIOptionSet)->OptionSet(); + CBM::PlanBatch *B = item->Parent(PIPlanBatch)->Batch(); + + if ((B) && (OS) && (O)) + App->planOptionsUnregister(B, OS, O); + } + + + + + PlanDefineBatchContextMenu::~PlanDefineBatchContextMenu() { *************** *** 108,111 **** --- 144,148 ---- CompilerHolder(0), OptionSetHolder(0), + OptionsHolder(0), OptionHolder(0), BenchmarkHolder(0), *************** *** 137,140 **** --- 174,178 ---- CompilerHolder(0), OptionSetHolder(0), + OptionsHolder(0), OptionHolder(0), BenchmarkHolder(0), *************** *** 158,161 **** --- 196,200 ---- CompilerHolder(_compiler), OptionSetHolder(0), + OptionsHolder(0), OptionHolder(0), BenchmarkHolder(0), *************** *** 169,172 **** --- 208,225 ---- CompilerHolder(0), OptionSetHolder(_options), + OptionsHolder(0), + OptionHolder(0), + BenchmarkHolder(0), + PlanBatchHolder(0) + { + setFlags(Qt::ItemIsEditable | flags()); + } + + PlanDefineBatchListItem::PlanDefineBatchListItem(CBM::CompilerOptions *_options) + : QTreeWidgetItem(QStringList(_options->Id().c_str()), + PIOptions), + CompilerHolder(0), + OptionSetHolder(0), + OptionsHolder(_options), OptionHolder(0), BenchmarkHolder(0), *************** *** 181,184 **** --- 234,238 ---- CompilerHolder(0), OptionSetHolder(0), + OptionsHolder(0), OptionHolder(_option), BenchmarkHolder(0), *************** *** 280,286 **** Qt::QueuedConnection); connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(itemEdited(QTreeWidgetItem*, int))); ! headerItem()->setHidden(true); --- 334,368 ---- Qt::QueuedConnection); + + + + + connect(this, SIGNAL(sigOptionsRegister(CBM::PlanBatch*, + CBM::CompilerOptionSet*)), + this, SLOT(doOptionsRegister(CBM::PlanBatch*, + CBM::CompilerOptionSet*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigOptionsUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*)), + this, SLOT(doOptionsUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigOptionsRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*, + QString)), + this, SLOT(doOptionsRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + CBM::CompilerOptions*, + QString)), + Qt::QueuedConnection); + connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(itemEdited(QTreeWidgetItem*, int))); ! headerItem()->setHidden(true); *************** *** 314,317 **** --- 396,400 ---- + printf("Item(batch,_set) > B=%x\n", _batch); PlanDefineBatchListItem *R = B->Nearest(PIOptionSets); PlanDefineBatchListItem *C; *************** *** 321,328 **** int i, n = R->childCount(); ! for(i=0; i<n; i++) { C=(PlanDefineBatchListItem*) R->child(i); if (C->type()==PIOptionSet) { if (C->OptionSet()==_options) { return(C); --- 404,414 ---- int i, n = R->childCount(); ! ! printf("R childs=%d\n", n); for(i=0; i<n; i++) { C=(PlanDefineBatchListItem*) R->child(i); + printf("Child : %x, %d\n", C, C->type()); if (C->type()==PIOptionSet) { + printf("Item(batch,_set) > Child=%x, checking\n", C); if (C->OptionSet()==_options) { return(C); *************** *** 333,336 **** --- 419,459 ---- } + + + + + + + + + PlanDefineBatchListItem *PlanDefineBatchList::Item(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options) + { + PlanDefineBatchListItem *S = Item(_batch, _set); + + if (!S) + return(0); + + + PlanDefineBatchListItem *R = S->Parent(PIOptionSet); + PlanDefineBatchListItem *C; + + if (!R) + return(0); + + int i, n = R->childCount(); + + for(i=0; i<n; i++) { + C=(PlanDefineBatchListItem*) R->child(i); + if (C->type()==PIOptions) { + if (C->OptionsGroup()==_options) { + return(C); + } + } + } + return(0); + } + void PlanDefineBatchList::dragUpdateSelection(int x, int y) { *************** *** 456,459 **** --- 579,638 ---- } + void PlanDefineBatchList::doOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set) + { + printf("R In\n"); + PlanDefineBatchListItem *R = Item(_batch, _set); + + printf("R=%x\n", R); + if (R) { + std::string n = "option group "; + char c[16]; + + new_options_idx++; + sprintf(c, "%d", new_options_idx); + n+=c; + + CBM::CompilerOptions *O = new CBM::CompilerOptions(n); + if (_set->add(O)) { + PlanDefineBatchListItem *I = new PlanDefineBatchListItem(O); + R->addChild(I); + } else + delete(O); + } + } + + void PlanDefineBatchList::doOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname) + { + PlanDefineBatchListItem *I = Item(_batch, _set, _options); + + if (I) { + printf("Rename should be OK\n"); + _options->setId(_newname.toStdString()); + } + } + + + void PlanDefineBatchList::doOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options) + { + PlanDefineBatchListItem *B = Item(_batch, _set, _options); + + if (!B) + return; + + + PlanDefineBatchListItem *R = B->Nearest(PIOptions); + + if (R) { + R->takeChild(R->indexOfChild(B)); + delete(R->OptionsGroup()); + delete(B); + } + } void PlanDefineBatchList::planBatchRegister(CBM::PlanBatch *_batch) *************** *** 504,507 **** --- 683,708 ---- } + void PlanDefineBatchList::optionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set) + { + emit sigOptionsRegister(_batch, _set); + } + + void PlanDefineBatchList::optionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options) + { + emit sigOptionsUnregister(_batch, _set, _options); + } + + void PlanDefineBatchList::optionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname) + { + emit sigOptionsRenamed(_batch, _set, _options, + _newname); + } + void PlanDefineBatchList::contextMenuEvent(QContextMenuEvent *event) { Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlanDefineBatch.h 12 Sep 2007 19:33:12 -0000 1.9 --- PlanDefineBatch.h 13 Sep 2007 18:18:34 -0000 1.10 *************** *** 9,12 **** --- 9,13 ---- #include <Compiler/CompilerHolder.h> #include <Basic/OptionHolder.h> + #include <Basic/OptionsHolder.h> #include <Basic/OptionSetHolder.h> #include <Basic/BenchmarkHolder.h> *************** *** 47,50 **** --- 48,54 ---- void doOptionSetUnregister(void); + void doOptionsRegister(void); + void doOptionsUnregister(void); + public: PlanDefineBatchContextMenu(class PlanDefineBatchListItem *_item); *************** *** 56,59 **** --- 60,64 ---- public CompilerHolder, public OptionSetHolder, + public OptionsHolder, public OptionHolder, public BenchmarkHolder, *************** *** 65,68 **** --- 70,74 ---- PlanDefineBatchListItem(PlanItemType _type); PlanDefineBatchListItem(CBM::CompilerOptionSet *_options); + PlanDefineBatchListItem(CBM::CompilerOptions *_options); PlanDefineBatchListItem(CBM::CompilerOption *_option); PlanDefineBatchListItem(CBM::PlanBatch *_batch); *************** *** 84,87 **** --- 90,96 ---- virtual PlanDefineBatchListItem *Item(CBM::PlanBatch *_batch, CBM::CompilerOptionSet *_options); + virtual PlanDefineBatchListItem *Item(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); virtual void dragUpdateSelection(int x, int y); *************** *** 115,118 **** --- 124,138 ---- QString _newname); + void sigOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + void sigOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + void sigOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + + protected slots: *************** *** 135,138 **** --- 155,173 ---- QString _newname); + + virtual void doOptionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + + virtual void doOptionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + + virtual void doOptionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + + + public: PlanDefineBatchList(QWidget *parent = 0); *************** *** 155,158 **** --- 190,203 ---- QString _newname); + virtual void optionsRegister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set); + virtual void optionsUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options); + virtual void optionsRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + QString _newname); + virtual ~PlanDefineBatchList(); }; |
|
From: Frederic T. <xf...@us...> - 2007-09-12 20:20:59
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22288 Modified Files: Compiler-Options.cpp Compiler-Options.h Log Message: setId() method added. Index: Compiler-Options.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Compiler-Options.h 10 Sep 2007 16:40:10 -0000 1.7 --- Compiler-Options.h 12 Sep 2007 20:20:53 -0000 1.8 *************** *** 92,95 **** --- 92,100 ---- virtual std::string Id(void); + /** Set identifier. + * \param _id New identifier. + */ + virtual void setId(std::string _id); + /** Retrieve an option by its identifier. * \param _id Option's identifier Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Compiler-Options.cpp 10 Sep 2007 16:40:10 -0000 1.7 --- Compiler-Options.cpp 12 Sep 2007 20:20:53 -0000 1.8 *************** *** 95,98 **** --- 95,103 ---- } + void CompilerOptions::setId(std::string _id) + { + id=_id; + } + void CompilerOptions::add(CBM::CompilerOption *_option) { |
|
From: Frederic T. <xf...@us...> - 2007-09-12 19:33:17
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3414 Modified Files: PlanAvailableOption.cpp PlanAvailableOption.h PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Preparing for options and groups' handling. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PlanDefineBatch.cpp 12 Sep 2007 17:49:23 -0000 1.10 --- PlanDefineBatch.cpp 12 Sep 2007 19:33:12 -0000 1.11 *************** *** 38,46 **** if ((item->type()==PIOptionSets) || (item->type()==PIOptionSet)) ! addAction(QIcon(":/icons/add.png"), tr("Add options"), this, SLOT(doOptionSetRegister())); if (item->type()==PIOptionSet) ! addAction(QIcon(":/icons/remove.png"), tr("Remove options"), this, SLOT(doOptionSetUnregister())); --- 38,46 ---- if ((item->type()==PIOptionSets) || (item->type()==PIOptionSet)) ! addAction(QIcon(":/icons/add.png"), tr("Add option set"), this, SLOT(doOptionSetRegister())); if (item->type()==PIOptionSet) ! addAction(QIcon(":/icons/remove.png"), tr("Remove option set"), this, SLOT(doOptionSetUnregister())); *************** *** 176,179 **** --- 176,191 ---- } + PlanDefineBatchListItem::PlanDefineBatchListItem(CBM::CompilerOption *_option) + : QTreeWidgetItem(QStringList(_option->Option().c_str()), + PIOption), + CompilerHolder(0), + OptionSetHolder(0), + OptionHolder(_option), + BenchmarkHolder(0), + PlanBatchHolder(0) + { + // setFlags(Qt::ItemIsEditable | flags()); + } + PlanDefineBatchListItem *PlanDefineBatchListItem::Parent(PlanItemType _which) { *************** *** 398,402 **** if (R) { ! std::string n = "options "; char c[16]; --- 410,414 ---- if (R) { ! std::string n = "option set "; char c[16]; *************** *** 594,610 **** if (I) { ! PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); ! event->setDropAction(Qt::MoveAction); ! CBM::Compiler *C = App->PlanCompilerSelected(); ! ! PlanDefineBatchListItem *P = I->Nearest(PICompilers); ! if (P) { ! P->setExpanded(true); ! if (PlanItem->Batch()->add(C)) { ! PlanDefineBatchListItem *CI = new PlanDefineBatchListItem(C); P->addChild(CI); ! } ! } else event->accept(); } else event->ignore(); --- 606,641 ---- if (I) { ! if (event->mimeData()->text()=="compiler") { ! PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); ! event->setDropAction(Qt::MoveAction); ! CBM::Compiler *C = App->PlanCompilerSelected(); ! ! PlanDefineBatchListItem *P = I->Nearest(PICompilers); ! if (P) { ! P->setExpanded(true); ! if (PlanItem->Batch()->add(C)) { ! PlanDefineBatchListItem *CI = new PlanDefineBatchListItem(C); P->addChild(CI); ! } ! } else event->accept(); + } else + if (event->mimeData()->text()=="option") { + PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); + event->setDropAction(Qt::MoveAction); + CBM::CompilerOption *O = App->PlanCompilerOptionSelected(); + + PlanDefineBatchListItem *P = I->Nearest(PIOptions); + if (P) { + P->setExpanded(true); + /* if (P->Options()->add(O)) { + PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O); + P->addChild(OI); + */ + printf("there!\n"); + } + } + else + event->accept(); } else event->ignore(); Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlanDefineBatch.h 31 Jul 2007 17:28:22 -0000 1.8 --- PlanDefineBatch.h 12 Sep 2007 19:33:12 -0000 1.9 *************** *** 65,68 **** --- 65,69 ---- PlanDefineBatchListItem(PlanItemType _type); PlanDefineBatchListItem(CBM::CompilerOptionSet *_options); + PlanDefineBatchListItem(CBM::CompilerOption *_option); PlanDefineBatchListItem(CBM::PlanBatch *_batch); PlanDefineBatchListItem(CBM::Compiler *_compiler); Index: PlanAvailableOption.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableOption.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlanAvailableOption.h 22 May 2007 17:28:52 -0000 1.2 --- PlanAvailableOption.h 12 Sep 2007 19:33:12 -0000 1.3 *************** *** 47,50 **** --- 47,51 ---- private: protected: + virtual void mousePressEvent(QMouseEvent *event); virtual void contextMenuEvent(QContextMenuEvent *event); signals: *************** *** 53,56 **** --- 54,58 ---- public slots: void doOptionsRefresh(CBM::Compiler *_compiler); + void doSelectionChanged(void); public: *************** *** 58,61 **** --- 60,64 ---- virtual void optionsRefresh(CBM::Compiler *_compiler); + virtual CBM::CompilerOption *optionSelected(void); virtual ~PlanAvailableOptionList(); Index: PlanAvailableOption.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableOption.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlanAvailableOption.cpp 31 Jul 2007 17:28:04 -0000 1.3 --- PlanAvailableOption.cpp 12 Sep 2007 19:33:12 -0000 1.4 *************** *** 66,73 **** --- 66,103 ---- this, SLOT(doOptionsRefresh(CBM::Compiler*)), Qt::QueuedConnection); + connect(this, SIGNAL(currentItemChanged(QListWidgetItem*, + QListWidgetItem*)), + this, SLOT(doSelectionChanged()), + Qt::QueuedConnection); setContextMenuPolicy(Qt::DefaultContextMenu); } + void PlanAvailableOptionList::mousePressEvent(QMouseEvent *event) + { + QListWidget::mousePressEvent(event); + + CBM::CompilerOption *O = optionSelected(); + + if (!O) + return; + + QString plainText = "option"; + + QMimeData *mimeData = new QMimeData; + mimeData->setText(plainText); + + QDrag *drag = new QDrag(this); + drag->setMimeData(mimeData); + drag->setHotSpot(event->pos() - rect().topLeft()); + + Qt::DropAction dropAction = drag->start(Qt::CopyAction | Qt::MoveAction); + + if (dropAction == Qt::MoveAction) { + close(); + update(); + } + } + void PlanAvailableOptionList::contextMenuEvent(QContextMenuEvent *event) { *************** *** 81,84 **** --- 111,124 ---- } + CBM::CompilerOption *PlanAvailableOptionList::optionSelected(void) + { + PlanAvailableOptionListItem *I = (PlanAvailableOptionListItem*) currentItem(); + + if (!I) + return(0); + + return(I->Option()); + } + void PlanAvailableOptionList::doOptionsRefresh(CBM::Compiler *_compiler) { *************** *** 113,116 **** --- 153,161 ---- } + void PlanAvailableOptionList::doSelectionChanged(void) + { + emit App->planOptionSelect(optionSelected()); + } + PlanAvailableOptionList::~PlanAvailableOptionList() { |
|
From: Frederic T. <xf...@us...> - 2007-09-12 18:59:24
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23317 Modified Files: main.cpp Log Message: Compiler autodection message handling. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main.cpp 12 Sep 2007 17:50:17 -0000 1.12 --- main.cpp 12 Sep 2007 18:59:21 -0000 1.13 *************** *** 86,115 **** 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(); - */ } --- 86,106 ---- CBM::CompilerSelector SC(CBM::cbmSystem); CBM::Compiler *C; + CBM::UIMsg *msg; int i; ! msg=CBM::cbmUI->msgCompilerAutodetect(); for(i=0; i<known_compiler_number; i++) { C=SC.select(known_compilers[i]); if (C) { ! App->compilerRegister(C); ! } ! msg->setProgress((float) ((i*100.0)/known_compiler_number)); } ! CBM::cbmUI->outputOK(); if (parent()) parent()->deleteLater(); } *************** *** 290,296 **** // W->show(); ! /* T=new PackageInstallThread(_package); ! T->start(); ! */ } --- 281,286 ---- // W->show(); ! T=new PackageInstallThread(_package); ! T->start(); } |
|
From: Frederic T. <xf...@us...> - 2007-09-12 18:59:06
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23077 Modified Files: Status-Console.cpp Log Message: Compiler autodection message handling. Index: Status-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Status-Console.cpp 12 Sep 2007 17:00:45 -0000 1.4 --- Status-Console.cpp 12 Sep 2007 18:59:03 -0000 1.5 *************** *** 152,155 **** --- 152,159 ---- break; + case CBM::UIMsg::CompilerAutodetect: + r+="Autodetecting compilers"; + break; + case CBM::UIMsg::PlanCompilerRegister: r+="Registering compiler "; |
|
From: Frederic T. <xf...@us...> - 2007-09-12 18:58:46
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22928 Modified Files: UI-Console.cpp UI.cpp UI.h UI-Msg.cpp UI-Msg.h Log Message: Improvements on compiler autodection message handling. Index: UI.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** UI.h 11 Sep 2007 20:16:51 -0000 1.17 --- UI.h 12 Sep 2007 18:58:43 -0000 1.18 *************** *** 265,268 **** --- 265,275 ---- virtual UIMsg *msgPlanBatchUnregister(std::string _name); + /** Emit a compiler autodetection message + * + * \return Created message + */ + virtual UIMsg *msgCompilerAutodetect(void); + + /** Emit a compiler registration message * Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** UI.cpp 11 Sep 2007 20:16:51 -0000 1.16 --- UI.cpp 12 Sep 2007 18:58:43 -0000 1.17 *************** *** 331,334 **** --- 331,342 ---- } + UIMsg *UI::msgCompilerAutodetect(void) + { + UIMsg *msg = new UIMsgCompilerAutodetect(); + postMsg(msg); + + return(msg); + } + UIMsg *UI::msgPlanCompilerRegister(std::string _name) { Index: UI-Msg.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Msg.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** UI-Msg.h 6 Sep 2007 17:12:35 -0000 1.8 --- UI-Msg.h 12 Sep 2007 18:58:43 -0000 1.9 *************** *** 275,278 **** --- 275,284 ---- }; + class UIMsgCompilerAutodetect : public UIMsg { + public: + UIMsgCompilerAutodetect(); + virtual ~UIMsgCompilerAutodetect(); + }; + class UIMsgPlanCompilerRegister : public UIMsg { public: Index: UI-Msg.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Msg.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UI-Msg.cpp 21 Aug 2007 19:53:14 -0000 1.7 --- UI-Msg.cpp 12 Sep 2007 18:58:43 -0000 1.8 *************** *** 307,313 **** } - - - UIMsgPlanRegister::UIMsgPlanRegister(std::string _file, int _default) --- 307,310 ---- *************** *** 379,382 **** --- 376,389 ---- } + UIMsgCompilerAutodetect::UIMsgCompilerAutodetect() + : UIMsg(Progress) + { + addAction(CompilerAutodetect); + } + + UIMsgCompilerAutodetect::~UIMsgCompilerAutodetect() + { + } + UIMsgPlanCompilerUnregister::UIMsgPlanCompilerUnregister(std::string _name) : UIMsg() Index: UI-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Console.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** UI-Console.cpp 11 Sep 2007 20:16:51 -0000 1.9 --- UI-Console.cpp 12 Sep 2007 18:58:43 -0000 1.10 *************** *** 161,165 **** curmsg+=objectField(_msg, "name"); break; ! case UIMsg::PlanCompilerRegister: curmsg+="Registering compiler "; --- 161,167 ---- curmsg+=objectField(_msg, "name"); break; ! case UIMsg::CompilerAutodetect: ! curmsg+="Auto-detecting compilers"; ! break; case UIMsg::PlanCompilerRegister: curmsg+="Registering compiler "; |
|
From: Frederic T. <xf...@us...> - 2007-09-12 17:50:21
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29196 Modified Files: main.cpp Log Message: Working message console. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** main.cpp 12 Sep 2007 16:24:38 -0000 1.11 --- main.cpp 12 Sep 2007 17:50:17 -0000 1.12 *************** *** 89,103 **** 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, "", --- 89,103 ---- 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, "", *************** *** 140,144 **** // sa->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); ! console=new StatusConsole; planCompilerSelected=0; App=this; --- 140,144 ---- // sa->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); ! console=new StatusConsole(sa); planCompilerSelected=0; App=this; *************** *** 290,295 **** // W->show(); ! T=new PackageInstallThread(_package); ! T->start(); } --- 290,296 ---- // W->show(); ! /* T=new PackageInstallThread(_package); ! T->start(); ! */ } *************** *** 398,410 **** void Application::doCompilerAutodetect(void) { ! /* StatusWidget *W; ! CompilerAutodetectThread *T; ! W=new StatusWidget(0); ! ! W->show(); ! T=new CompilerAutodetectThread(W); ! T->start(); ! */ } --- 399,406 ---- void Application::doCompilerAutodetect(void) { ! CompilerAutodetectThread *T; ! T=new CompilerAutodetectThread(); ! T->start(); } |
|
From: Frederic T. <xf...@us...> - 2007-09-12 17:49:50
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28780 Modified Files: compbenchmarks-ui-qt4.pro Log Message: Plan/PlanHolder added Index: compbenchmarks-ui-qt4.pro =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** compbenchmarks-ui-qt4.pro 11 Sep 2007 20:18:53 -0000 1.8 --- compbenchmarks-ui-qt4.pro 12 Sep 2007 17:49:47 -0000 1.9 *************** *** 23,27 **** compiler_sources = Compiler/CompilerHolder Compiler/CompilerInfo Compiler/CompilerList Compiler/CompilerManager ! plan_sources = Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager all_sources = $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status Status/Status-Console main --- 23,27 ---- compiler_sources = Compiler/CompilerHolder Compiler/CompilerInfo Compiler/CompilerList Compiler/CompilerManager ! plan_sources = Plan/PlanHolder Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager all_sources = $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status Status/Status-Console main |
|
From: Frederic T. <xf...@us...> - 2007-09-12 17:49:31
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28765 Modified Files: PlanDefineBatch.cpp Log Message: PlanHolder used. Fixed : batch removal. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PlanDefineBatch.cpp 29 Aug 2007 20:34:06 -0000 1.9 --- PlanDefineBatch.cpp 12 Sep 2007 17:49:23 -0000 1.10 *************** *** 1,6 **** #include <Plan/PlanDefineBatch.h> ! #include <Plan/Plan.h> #include <System/System.h> #include <main.h> --- 1,8 ---- #include <Plan/PlanDefineBatch.h> ! #include <Plan/PlanHolder.h> ! #include <System/System.h> + #include <main.h> *************** *** 60,65 **** n+="Batch "; n+=c; ! // CBM::PlanBatch *P = new CBM::PlanBatch(n); !!! ! // App->planBatchRegister(P); } --- 62,68 ---- n+="Batch "; n+=c; ! ! CBM::PlanBatch *P = new CBM::PlanBatch(PlanHolderGet(), n); ! App->planBatchRegister(P); } *************** *** 366,370 **** delete(invisibleRootItem()->takeChild(invisibleRootItem()->indexOfChild(I))); plan->removeBatch(_batch); - delete(_batch); } --- 369,372 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-12 17:48:59
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28413 Added Files: PlanHolder.cpp PlanHolder.h Log Message: First import. --- NEW FILE: PlanHolder.cpp --- #include <Plan/PlanHolder.h> using namespace CQT; CBM::Plan *plan = 0; CBM::Plan *CQT::PlanHolderGet(void) { if (!plan) plan=new CBM::Plan(); return(plan); } --- NEW FILE: PlanHolder.h --- #ifndef H_CQT_PLANHOLDER #define H_CQT_PLANHOLDER #include <Plan/Plan.h> namespace CQT { CBM::Plan *PlanHolderGet(void); } #endif |
|
From: Frederic T. <xf...@us...> - 2007-09-12 17:00:50
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10473 Modified Files: Status-Console.cpp Status-Console.h Status.cpp Log Message: Better useability (fatal messages shown, last line is always visible). Index: Status-Console.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Status-Console.h 12 Sep 2007 16:24:52 -0000 1.2 --- Status-Console.h 12 Sep 2007 17:00:45 -0000 1.3 *************** *** 5,13 **** #include <UI/UI.h> ! #include <QGroupBox> #include <QPixmap> #include <QLabel> #include <QVBoxLayout> #include <QProgressBar> // Q_DECLARE_METATYPE(CBM::UIMsg) --- 5,14 ---- #include <UI/UI.h> ! // #include <QGroupBox> #include <QPixmap> #include <QLabel> #include <QVBoxLayout> #include <QProgressBar> + #include <QScrollArea> // Q_DECLARE_METATYPE(CBM::UIMsg) *************** *** 15,29 **** namespace CQT { ! class StatusConsole : public QWidget, public CBM::UI { private: Q_OBJECT protected: // virtual class StatusAction *ActionObject(CBM::UIMsg *msg); QVBoxLayout *lay; - virtual std::string MsgLabel(CBM::UIMsg *_msg); virtual class StatusAction *MsgStatus(CBM::UIMsg *_msg); signals: --- 16,35 ---- namespace CQT { ! class StatusConsole : // public QGroupBox, ! public QWidget, public CBM::UI { private: Q_OBJECT + protected: // virtual class StatusAction *ActionObject(CBM::UIMsg *msg); QVBoxLayout *lay; + QScrollArea *sa; virtual class StatusAction *MsgStatus(CBM::UIMsg *_msg); + virtual std::string MsgLabel(CBM::UIMsg *_msg); + + virtual void autoscroll(void); signals: *************** *** 38,42 **** public: ! StatusConsole(QWidget *parent = 0); virtual void Display(CBM::UIMsg *_msg); --- 44,48 ---- public: ! StatusConsole(QScrollArea *_sa, QWidget *parent = 0); virtual void Display(CBM::UIMsg *_msg); Index: Status.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Status.cpp 12 Sep 2007 16:24:52 -0000 1.5 --- Status.cpp 12 Sep 2007 17:00:45 -0000 1.6 *************** *** 52,61 **** switch(_status) { ! case CBM::UIMsg::OK: ! ncolor=OK; ! break; ! case CBM::UIMsg::KO: ! ncolor=KO; ! break; } changeColor(ncolor); --- 52,61 ---- switch(_status) { ! case CBM::UIMsg::OK: ! ncolor=OK; ! break; ! case CBM::UIMsg::KO: ! ncolor=KO; ! break; } changeColor(ncolor); Index: Status-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Status-Console.cpp 12 Sep 2007 16:24:52 -0000 1.3 --- Status-Console.cpp 12 Sep 2007 17:00:45 -0000 1.4 *************** *** 6,10 **** using namespace CQT; ! StatusConsole::StatusConsole(QWidget *parent) : QWidget(parent), // QGroupBox(parent), --- 6,10 ---- using namespace CQT; ! StatusConsole::StatusConsole(QScrollArea *_sa, QWidget *parent) : QWidget(parent), // QGroupBox(parent), *************** *** 13,18 **** --- 13,21 ---- // setTitle(tr("Message window")); + sa=_sa; lay=new QVBoxLayout(); setLayout(lay); + lay->addWidget(new QLabel("Message board")); + /* int i = 30; while (i--) *************** *** 213,229 **** if (_msg->getFlags()==CBM::UIMsg::Progress) r+=" : "; return(r); } void StatusConsole::uiMessageShow(CBM::UIMsg *msg) { std::string label = MsgLabel(msg); ! if (label!="") { StatusAction *widget = new StatusAction(msg, label, this); - printf("%x d=%d\n", msg, CBM::UI::depth(msg)*16); widget->setContentsMargins(CBM::UI::depth(msg)*16, 0, 0, 0); lay->addWidget(widget); } } --- 216,251 ---- if (_msg->getFlags()==CBM::UIMsg::Progress) r+=" : "; + + if (action(_msg)==CBM::UIMsg::FatalError) { + outputKO(); + } + return(r); } + void StatusConsole::autoscroll(void) + { + int y = 0; + int i, n = lay->count(); + + for(i=0;i<n;i++) { + y+=(lay->itemAt(i)->geometry().height()+8); + } + y+=24; + sa->ensureVisible(0, y); + } + void StatusConsole::uiMessageShow(CBM::UIMsg *msg) { std::string label = MsgLabel(msg); ! if (label!="") { StatusAction *widget = new StatusAction(msg, label, this); widget->setContentsMargins(CBM::UI::depth(msg)*16, 0, 0, 0); lay->addWidget(widget); + + autoscroll(); + // sa->show(); } } *************** *** 237,242 **** act=MsgStatus(msg); ! if (act) act->updateProgress((int)progress(msg)); } --- 259,266 ---- act=MsgStatus(msg); ! if (act) { act->updateProgress((int)progress(msg)); + autoscroll(); + } } *************** *** 276,281 **** if (act) { act->changeStatus(status); ! if (flags(msg)==CBM::UIMsg::Progress) act->updateProgress(100); } } --- 300,307 ---- if (act) { act->changeStatus(status); ! if (flags(msg)==CBM::UIMsg::Progress) { act->updateProgress(100); + } + autoscroll(); } } |
