Changeset 496 in PSPA


Ignore:
Timestamp:
Mar 13, 2014, 9:46:55 AM (10 years ago)
Author:
lemeur
Message:

deplacement bouton expand machine vers computing view

Location:
Interface_Web/trunk/pspaWT
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/History

    r495 r496  
    55     PSPA - Plateforme de simulation en physique des accélérateurs
    66     =========================================================
     713 mars 2014 : Guy Le Meur
     8- deplacement du bouton "expand machine" vers fenêtre computing view"
     9- suppression des fichiers GWt_sectionToexecute.h/cc
    710
    81112 mars 2014 : Guy Le Meur

  • Interface_Web/trunk/pspaWT/sources/controler/include/expandedMachine.h

    r495 r496  
    3535  //  computingBlock* openBlock(dataManager* dmg);
    3636
     37  //  void addNewSector(sector* secteur  );
    3738
    3839

  • Interface_Web/trunk/pspaWT/sources/controler/src/expandedMachine.cc

    r495 r496  
    118118  elements_.clear();
    119119  for (k=0; k < secteurs.size() ; k++) {
    120 
    121120    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// }
    132134
    133135

  • Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_accelerator.h

    r495 r496  
    3838  void addSector();
    3939  void readConfiguration();
    40     void expandMachine();
     40  //    void expandMachine();
    4141  void run();
    4242  void closeGraphicDialog();

  • Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_machine.h

    r495 r496  
    1818
    1919    GWt_machine() {;}
     20
    2021
    2122public:

  • Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_softwarePanel.h

    r495 r496  
    1313#include <Wt/WContainerWidget>
    1414#include <Wt/WPushButton>
    15 #include "GWt_sectionToExecute.h"
    1615#include "dataManager.h"
    1716

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_accelerator.cc

    r495 r496  
    6161 
    6262
    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);
     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);
    7474
    7575
    … …  
    151151}
    152152
    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// }
    157157
    158158void GWt_accelerator::run()

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_machine.cc

    r495 r496  
    5151  actionParameters->setMinimumSize(32,32);
    5252 
     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);
    5364
    5465 
    … …  
    7485}
    7586
     87void 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  
    1818#include "GWt_computingBlock.h"
    1919#include "GWt_globalParameters.h"
    20 #include "GWt_sectionToExecute.h"
    2120#include "GWt_pspaApplication.h"
    2221#include "GWt_machine.h"
Note: See TracChangeset for help on using the changeset viewer.