Changeset 496 in PSPA for Interface_Web
- Timestamp:
- Mar 13, 2014, 9:46:55 AM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 2 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r495 r496 5 5 PSPA - Plateforme de simulation en physique des accélérateurs 6 6 ========================================================= 7 13 mars 2014 : Guy Le Meur 8 - deplacement du bouton "expand machine" vers fenêtre computing view" 9 - suppression des fichiers GWt_sectionToexecute.h/cc 7 10 8 11 12 mars 2014 : Guy Le Meur -
Interface_Web/trunk/pspaWT/sources/controler/include/expandedMachine.h
r495 r496 35 35 // computingBlock* openBlock(dataManager* dmg); 36 36 37 // void addNewSector(sector* secteur ); 37 38 38 39 -
Interface_Web/trunk/pspaWT/sources/controler/src/expandedMachine.cc
r495 r496 118 118 elements_.clear(); 119 119 for (k=0; k < secteurs.size() ; k++) { 120 121 120 sector* sect = secteurs.at(k); 122 // vector<sectionToExecute*> vecsec = sect->getSectionsToExecute(); 123 // for (j=0; j < vecsec.size() ; j++) { 124 vector< abstractElement* > lesElements = sect->getElements(); 125 for ( m=0; m < lesElements.size(); m++) elements_.push_back(lesElements.at(m)); 126 // } 127 } 128 cout << " expandedMachine::fromSectors la machine a " << elements_.size() << " elements " << endl; 129 computingBlocks_.clear(); 130 computingBlocks_.push_back(new computingBlock(0, elements_.size(),NULL, this)); 131 } 121 vector< abstractElement* > lesElements = sect->getElements(); 122 for ( m=0; m < lesElements.size(); m++) elements_.push_back(lesElements.at(m)); 123 } 124 cout << " expandedMachine::fromSectors la machine a " << elements_.size() << " elements " << endl; 125 computingBlocks_.clear(); 126 computingBlocks_.push_back(new computingBlock(0, elements_.size(),NULL, this)); 127 } 128 129 // void expandedMachine::addNewSector(sector* secteur ) { 130 // vector< abstractElement* > lesElements = secteur->getElements(); 131 // for ( unsigned m=0; m < lesElements.size(); m++) elements_.push_back(lesElements.at(m)); 132 // if ( !computingBlocks_.size() ) computingBlocks_.push_back(new computingBlock(0, elements_.size(),NULL, this)); 133 // } 132 134 133 135 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_accelerator.h
r495 r496 38 38 void addSector(); 39 39 void readConfiguration(); 40 void expandMachine();40 // void expandMachine(); 41 41 void run(); 42 42 void closeGraphicDialog(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_machine.h
r495 r496 18 18 19 19 GWt_machine() {;} 20 20 21 21 22 public: -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_softwarePanel.h
r495 r496 13 13 #include <Wt/WContainerWidget> 14 14 #include <Wt/WPushButton> 15 #include "GWt_sectionToExecute.h"16 15 #include "dataManager.h" 17 16 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_accelerator.cc
r495 r496 61 61 62 62 63 // expand machine64 WPushButton* expandMachine = new WPushButton("init/expand machine",menu);65 // set tooltips66 expandMachine->setToolTip("expand the machine");67 // Set class for actions elements68 expandMachine->setStyleClass("Button WhiteButton expand");69 expandMachine->setMaximumSize(128,32);70 expandMachine->setMinimumSize(128,32);71 72 // action73 expandMachine->clicked().connect(this,&GWt_accelerator::expandMachine);63 // // expand machine 64 // WPushButton* expandMachine = new WPushButton("init/expand machine",menu); 65 // // set tooltips 66 // expandMachine->setToolTip("expand the machine"); 67 // // Set class for actions elements 68 // expandMachine->setStyleClass("Button WhiteButton expand"); 69 // expandMachine->setMaximumSize(128,32); 70 // expandMachine->setMinimumSize(128,32); 71 72 // // action 73 // expandMachine->clicked().connect(this,&GWt_accelerator::expandMachine); 74 74 75 75 … … 151 151 } 152 152 153 void GWt_accelerator::expandMachine() {154 cout << " coucou depuis GWt_accelerator::expandMachine() " << endl;155 if (getDataManager()->expandMachine()) new GWt_machine(this, dataManager_->getCurrentMachine());156 }153 // void GWt_accelerator::expandMachine() { 154 // cout << " coucou depuis GWt_accelerator::expandMachine() " << endl; 155 // if (getDataManager()->expandMachine()) new GWt_machine(this, dataManager_->getCurrentMachine()); 156 // } 157 157 158 158 void GWt_accelerator::run() -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_machine.cc
r495 r496 51 51 actionParameters->setMinimumSize(32,32); 52 52 53 // expand machine 54 WPushButton* expandMachine = new WPushButton("init/expand machine",menu); 55 // set tooltips 56 expandMachine->setToolTip("expand the machine"); 57 // Set class for actions elements 58 expandMachine->setStyleClass("Button WhiteButton expand"); 59 expandMachine->setMaximumSize(128,32); 60 expandMachine->setMinimumSize(128,32); 61 62 // action 63 expandMachine->clicked().connect(this,&GWt_machine::expandMachine); 53 64 54 65 … … 74 85 } 75 86 87 void GWt_machine::expandMachine() { 88 if (getAccelerator()->getDataManager()->expandMachine()) new GWt_machine(getAccelerator(), getAccelerator()->getDataManager()->getCurrentMachine()); 89 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc
r495 r496 18 18 #include "GWt_computingBlock.h" 19 19 #include "GWt_globalParameters.h" 20 #include "GWt_sectionToExecute.h"21 20 #include "GWt_pspaApplication.h" 22 21 #include "GWt_machine.h"
Note: See TracChangeset
for help on using the changeset viewer.