Changeset 493 in PSPA

Timestamp:

Mar 11, 2014, 11:21:43 AM (10 years ago)

Author:

lemeur

Message:

refection generale des secteurs et applications de softwares (suite)

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (3 diffs)
• sources/controler/include/abstractSoftware.h (modified) (3 diffs)
• sources/controler/include/computingBlock.h (added)
• sources/controler/include/dataManager.h (modified) (7 diffs)
• sources/controler/include/expandedMachine.h (added)
• sources/controler/include/nomDeLogiciel.h (modified) (1 diff)
• sources/controler/include/sector.h (modified) (4 diffs)
• sources/controler/include/softwareGenerator.h (modified) (1 diff)
• sources/controler/include/softwareMadx.h (modified) (1 diff)
• sources/controler/include/softwareParmela.h (modified) (3 diffs)
• sources/controler/include/softwareTest.h (modified) (1 diff)
• sources/controler/include/softwareTransport.h (modified) (1 diff)
• sources/controler/include/softwareUsersprogram.h (modified) (1 diff)
• sources/controler/src/abstractSoftware.cc (modified) (1 diff)
• sources/controler/src/computingBlock.cc (added)
• sources/controler/src/dataManager.cc (modified) (19 diffs)
• sources/controler/src/elementSoleno.cc (modified) (1 diff)
• sources/controler/src/expandedMachine.cc (added)
• sources/controler/src/nomDeLogiciel.cc (modified) (3 diffs)
• sources/controler/src/sector.cc (modified) (2 diffs)
• sources/controler/src/softwareGenerator.cc (modified) (3 diffs)
• sources/controler/src/softwareMadx.cc (modified) (5 diffs)
• sources/controler/src/softwareParmela.cc (modified) (6 diffs)
• sources/controler/src/softwareTest.cc (modified) (2 diffs)
• sources/controler/src/softwareTransport.cc (modified) (4 diffs)
• sources/controler/src/softwareUsersprogram.cc (modified) (3 diffs)
• sources/userInterface/include/GWt_accelerator.h (modified) (2 diffs)
• sources/userInterface/include/GWt_computingBlock.h (added)
• sources/userInterface/include/GWt_machine.h (added)
• sources/userInterface/include/GWt_pspaApplication.h (modified) (1 diff)
• sources/userInterface/include/GWt_sector.h (modified) (3 diffs)
• sources/userInterface/include/GWt_softwarePanel.h (modified) (3 diffs)
• sources/userInterface/src/GWt_accelerator.cc (modified) (11 diffs)
• sources/userInterface/src/GWt_computingBlock.cc (added)
• sources/userInterface/src/GWt_ligneFaisceau.cc (modified) (5 diffs)
• sources/userInterface/src/GWt_machine.cc (added)
• sources/userInterface/src/GWt_sector.cc (modified) (1 diff)
• sources/userInterface/src/GWt_softwarePanel.cc (modified) (8 diffs)
• workingArea/philFit.aml (modified) (4 diffs)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -39 +39 @@
  ../sources/controler/src/softwareGenerator.cc \
  ../sources/controler/src/softwareUsersprogram.cc \
- ../sources/controler/src/sectionToExecute.cc \
  ../sources/controler/src/softwareTest.cc \
  ../sources/controler/src/softwareMadx.cc \
@@ -45 +44 @@
  ../sources/controler/src/sectorParameters.cc \
  ../sources/controler/src/sector.cc \
+ ../sources/controler/src/expandedMachine.cc \
+ ../sources/controler/src/computingBlock.cc \
  ../sources/userInterface/src/GWt_elementCell.cc \
  ../sources/userInterface/src/GWt_elementRfgun.cc \
@@ -70 +71 @@
  ../sources/userInterface/src/GWt_serverFileSelector.cc \
  ../sources/userInterface/src/GWt_sector.cc \
+ ../sources/userInterface/src/GWt_machine.cc \
  ../sources/userInterface/src/GWt_accelerator.cc \
- ../sources/userInterface/src/GWt_sectionToExecute.cc
+ ../sources/userInterface/src/GWt_computingBlock.cc
  
 #######################################################################

Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h

@@ -16 +16 @@
 class dataManager;
 class sectionToExecute;
-
+class computingBlock;
 class abstractSoftware
 {
@@ -42 +42 @@
   //  void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
 
-  sectionToExecute* getSectionToExecute() {
-    return sectionToExecute_;
+  /* sectionToExecute* getSectionToExecute() { */
+  /*      return sectionToExecute_; */
+  /* } */
+
+  computingBlock* getComputingBlock() {
+       return compBlock_;;
   }
 
   public :
 
-  abstractSoftware(string, sectionToExecute*, dataManager* );
+  //  abstractSoftware(string, sectionToExecute*, dataManager* );
+  abstractSoftware(string, computingBlock*, dataManager* );
+
   ~abstractSoftware() {
     delete nameOfSoftware_;
@@ -74 +80 @@
   }
   private :
-  sectionToExecute* sectionToExecute_;
-  
+  //  sectionToExecute* sectionToExecute_;
+  computingBlock* compBlock_;
 };
 #endif

Interface_Web/trunk/pspaWT/sources/controler/include/dataManager.h

@@ -14 +14 @@
 #include "nomDeLogiciel.h"
 #include "sector.h"
+#include "expandedMachine.h"
+#include "computingBlock.h"
 
 #include "sectorParameters.h" //xx
@@ -24 +26 @@
  public:
   
-  dataManager() {;}
+ dataManager() :   
+  pspa_ (NULL),
+    currentMachine_(NULL)
+      {;}
   dataManager(PspaApplication*);
   virtual ~dataManager();
@@ -33 +38 @@
   particleBeam* getDiagnosticBeam_deprecated(string elementLabel);
 
+
+  //provisoire 
+  inline expandedMachine* getCurrentMachine() {return currentMachine_;}
+
+  inline expandedMachine* expandMachine() {
+    if ( !currentMachine_ ) currentMachine_ = new expandedMachine(this);
+    currentMachine_->fromSectors( sectors_, this );
+    return currentMachine_;
+  }
+
+  bool areDataCoherent() {
+    bool resultat = false;
+    if ( !currentMachine_ ) return false;
+    resultat = currentMachine_->areDataCoherent();
+    return resultat;
+  }
+
+
 /** Add a new sector
  */
@@ -39 +62 @@
   /** return all sectors
    */
-  inline std::vector <sector*> getSectors() {return jobList_;};
+  inline std::vector <sector*> getSectors() {return sectors_;};
   
   
@@ -60 +83 @@
   void writeToAMLFile(string fileName);
     
-  /** return the jobList size
+  /** return the sectors size
    */
-  inline unsigned long getJobListSize() const {
-    return jobList_.size();
-  }
+  //  inline unsigned long getSectorsSize() const {
+  //    return sectors_.size();
+  // }
   
   // si newBeam = true, on cree un nouveau diag
@@ -84 +107 @@
   };
 
-  
+  abstractElement* getElementInSectorsByLabel(string etiq);
+
+
+  void messageEcran(string niveau, string msg) const;
+
+
+
  private:
 
@@ -92 +121 @@
   vector<particleBeam> diagnosticBeam_;
   vector<unsigned> indexElementToIndexDiag_;
-  vector <sector*> jobList_;
+  //  vector <sector*> jobList_;
+  vector <sector*> sectors_;
+  expandedMachine* currentMachine_;
   void removeFile(string nameOfFile);
 };

Interface_Web/trunk/pspaWT/sources/controler/include/nomDeLogiciel.h

@@ -63 +63 @@
   }
 
-  trivaluedBool doAcceptElement(nomdElements::typedElement typdel); 
+  trivaluedBool doAcceptElement(nomdElements::typedElement typdel) const; 
 
 

Interface_Web/trunk/pspaWT/sources/controler/include/sector.h

@@ -10 +10 @@
 
 
-class sectionToExecute;
+//class sectionToExecute;
 class abstractElement;
 class dataManager;
@@ -60 +60 @@
    Return the vector of sectionToExecute of this
    */
-  inline std::vector <sectionToExecute*> getSectionsToExecute() { return sectionToExecute_;};
-  
+  //  inline std::vector <sectionToExecute*> getSectionsToExecute() { return sectionToExecute_;};
+  inline std::vector <abstractElement*>& getElements() { return elements_;};
   /**
    Add a sectionToExecute
    */
-  inline void addSectionToExecute(sectionToExecute* s) {
-    if (s) sectionToExecute_.push_back(s);
-  };
+  //  inline void addSectionToExecute(sectionToExecute* s) {
+  //    if (s) sectionToExecute_.push_back(s);
+  //  };
   
   /** Add an element after another one. Will put it in the same sectionToExecuteList. If the element after is NULL
@@ -85 +85 @@
  set the specific software for the given sectionToExecute number
  */
-  bool setSoftware(nomDeLogiciel, unsigned int sectionToExecuteNumber);
+  //  bool setSoftware(nomDeLogiciel, unsigned int sectionToExecuteNumber);
 
-  void clearSectionToExecute();
+  //  void clearSectionToExecute();
   /** Clear a specific jobList */
-  void clearSectionToExecute(int a);
+  //void clearSectionToExecute(int a);
 
   void removeElement(abstractElement* currentElement);
@@ -105 +105 @@
   }
   
+
+  bool isInside(abstractElement* previousElement);
+
 private:
 
-  std::vector <sectionToExecute*> sectionToExecute_;
+  bool insertAfter(abstractElement* previousElement,abstractElement* currentElement);
+
+
+
+
+  std::vector<abstractElement*>  elements_;
+  //  std::vector <sectionToExecute*> sectionToExecute_;
+
   particleBeam* currentBeam_;
 

Interface_Web/trunk/pspaWT/sources/controler/include/softwareGenerator.h

@@ -18 +18 @@
   
   softwareGenerator();  
-  softwareGenerator(string inputFileName, sectionToExecute*, dataManager*);
+  //  softwareGenerator(string inputFileName, sectionToExecute*, dataManager*);
+  softwareGenerator(string inputFileName, computingBlock*, dataManager*);
 
   virtual ~softwareGenerator() {;}

Interface_Web/trunk/pspaWT/sources/controler/include/softwareMadx.h

@@ -17 +17 @@
   
   softwareMadx();
-  softwareMadx(string,sectionToExecute*,dataManager*);
+  //  softwareMadx(string,sectionToExecute*,dataManager*);
+  softwareMadx(string,computingBlock* ,dataManager*);
   virtual ~softwareMadx() {;}
 

Interface_Web/trunk/pspaWT/sources/controler/include/softwareParmela.h

@@ -9 +9 @@
  protected : 
 
+     vector<int> relativeParmelaElementIndices_;
+
 
   bool beamFromParmela(string workingDir,unsigned numeroElement, double referencefrequency, vector<double>& centroid, bareParticle& refPart,vector<bareParticle>& particles );
@@ -14 +16 @@
   bool beamToParmela(string workingDir, particleBeam* partic );
 
+    void setRelativeParmelaElementIndices();
 
   string elementsData(const vector< pair<string, vector<string> > >& donnees) const ;
@@ -27 +30 @@
     softwareParmela();
     
-    softwareParmela(string inputFileName, sectionToExecute*, dataManager*);
+    //    softwareParmela(string inputFileName, sectionToExecute*, dataManager*);
+    softwareParmela(string inputFileName, computingBlock*, dataManager*);
 
   virtual ~softwareParmela() {;}

Interface_Web/trunk/pspaWT/sources/controler/include/softwareTest.h

@@ -18 +18 @@
     softwareTest();
     
-    softwareTest(string inputFileName, sectionToExecute*, dataManager*);
+    //    softwareTest(string inputFileName, sectionToExecute*, dataManager*);
+    softwareTest(string inputFileName, computingBlock*, dataManager*);
 
   virtual ~softwareTest() {;}

Interface_Web/trunk/pspaWT/sources/controler/include/softwareTransport.h

@@ -20 +20 @@
  public : 
     softwareTransport();
-    softwareTransport(string inputFileName, sectionToExecute*, dataManager*);
+    //    softwareTransport(string inputFileName, sectionToExecute*, dataManager*);
+    softwareTransport(string inputFileName, computingBlock*, dataManager*);
 
   virtual ~softwareTransport() {;}

Interface_Web/trunk/pspaWT/sources/controler/include/softwareUsersprogram.h

@@ -13 +13 @@
  public : 
     softwareUsersprogram();
-    softwareUsersprogram(string inputFileName, sectionToExecute*, dataManager*);
+    //    softwareUsersprogram(string inputFileName, sectionToExecute*, dataManager*);
+    softwareUsersprogram(string inputFileName, computingBlock*, dataManager*);
 
   virtual ~softwareUsersprogram() {;}

Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc

@@ -10 +10 @@
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect, dataManager* data)
+// abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect, dataManager* data)
+// {
+//   inputFileName_ = inputFileName;
+//   //  sectionToExecute_ = sect;
+//   compBlock_ = NULL;
+//   dataManager_ = data;
+//   nameOfSoftware_ = new nomDeLogiciel("unknownSoftware");
+// }
+
+abstractSoftware::abstractSoftware(string inputFileName, computingBlock* cmpb, dataManager* data)
 {
   inputFileName_ = inputFileName;
-  sectionToExecute_ = sect;
+  compBlock_ = cmpb;
   dataManager_ = data;
+  cout << " abstractSoftware::abstractSoftware adresse manager " << dataManager_  << endl;
   nameOfSoftware_ = new nomDeLogiciel("unknownSoftware");
 }
 
 
-// void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) 
-// {
-//   //  std::cout << " abstractSoftware::registerElement soft : " << nameOfSoftware_.getString() << std::endl;
-//   if (b == TBoolIgnore) {
-//     //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "   ignore " << std::endl;
-//     ignoredElements_.push_back(nomdel);
-//   } else if (b == TBoolOk) {
-//     //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "  OK " << std::endl;
-//     acceptedElements_.push_back(nomdel);
-//   }
-// }
-
-// trivaluedBool abstractSoftware::doAcceptElement(nomdElements::typedElement typdel) 
-// {
-
-//   //xx
-//   if (acceptedElements_.size() == 0 && nameOfSoftware_ != nomDeLogiciel::unknownSoftware) {
-//     return TBoolError;
-//   }
-
-//   if (std::find(acceptedElements_.begin(),acceptedElements_.end(),typdel) != acceptedElements_.end()) {
-//     return TBoolOk;
-//   }
-
-//   if (ignoredElements_.size() == 0) {
-//     return TBoolError;
-//   }
-
-//   if (std::find(ignoredElements_.begin(),ignoredElements_.end(),typdel) != ignoredElements_.end()) {
-//     return TBoolIgnore;
-//   }
-
-//   return TBoolOk;
-// }
 
 bool abstractSoftware::launchJob(string commandLine, string& resul)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -5 +5 @@
 #include "mathematicalConstants.h"
 #include "PhysicalConstants.h"
+#include "softwareUnknown.h"
 
 #include "GWt_pspaApplication.h"
@@ -16 +17 @@
 #include "AMLtools.h"
 
-#define BAVARD 0
+#define BAVARD 1
 
 dataManager::dataManager(PspaApplication* pspa) :
-pspa_ (pspa)
+  pspa_ (pspa),
+  currentMachine_(NULL)
 {}
 
@@ -25 +27 @@
 {
   unsigned k;
-  for (k=0; k < jobList_.size();k++) {
-    if ( jobList_[k] != NULL ) delete jobList_[k];
-  }
+  for (k=0; k < sectors_.size();k++) {
+    if ( sectors_[k] != NULL ) delete sectors_[k];
+  }
+  if ( currentMachine_ ) delete currentMachine_;
 }
 
 void dataManager::consoleMessage(string message)
 {
+  cout << " passage console message : " << endl;
+  cout << message << endl;
   GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
   if (console) console->addConsoleMessage(message + "\n");
   pspa_->processEvents();
 }
-
+ 
 
 void dataManager::initializeExecution()
@@ -54 +59 @@
   diagnosticBeam_.clear();
   indexElementToIndexDiag_.clear();
-  for (unsigned int a=0; a< jobList_.size(); a++) {
-      jobList_[a]->clearSectionToExecute();
-  }
+  // for (unsigned int a=0; a< jobList_.size(); a++) {
+  //     jobList_[a]->clearSectionToExecute();
+  // }
 }
 
@@ -80 +85 @@
   
   // Main loop !
-  cout << " dataManager::executeAll #jobList_= " << jobList_.size() << endl;
-  for(unsigned k = 0; k < jobList_.size(); k++) 
-    {
-      sector* sector = jobList_[k];
-      cout << " dataManager::executeAll sector name= " << sector->getName() << endl;
-      cout << " dataManager::executeAll #sectionsToExecute= " << sector->getSectionsToExecute().size() << endl;
+  cout << " dataManager::executeAll #sectors_= " << sectors_.size() << endl;
+  //  expandedMachine machine;
+  //  machine.fromJoblist(jobList_);
+
+  // vecteur de blocs de calcul 
+  vector<computingBlock*> compblock = getCurrentMachine()->getComputingBlocks();
+  cout << " dataManager::executeAll() : nb blocs de calcul : " << compblock.size() << endl;
+
+  particleBeam* computedBeam = sectors_[0]->getParticleBeam();
+
+
+  //  for(unsigned k = 0; k < jobList_.size(); k++) 
+  // {
+      // sector* sector = jobList_[k];
+      // cout << " dataManager::executeAll sector name= " << sector->getName() << endl;
+      // cout << " dataManager::executeAll #sectionsToExecute= " << sector->getSectionsToExecute().size() << endl;
       
       // for the moment, we put everything in one line without loops
-      for(unsigned int l = 0; l < sector->getSectionsToExecute().size(); l++) 
+      //      for(unsigned int l = 0; l < sector->getSectionsToExecute().size(); l++) 
+      for (unsigned int l = 0; l < compblock.size(); l++) 
         {
-          sectionToExecute* section = sector->getSectionsToExecute()[l];
-          abstractSoftware* softw = section->getSoftware();
-          
+          abstractSoftware* softw = compblock.at(l)->getSoftware();
           cout << " execution du SOFWARE " << softw->getName() << endl;
-          cout << " adresse section " << section << endl;
-          cout << " adresse faisceau " << sector->getParticleBeam() << endl;
           if (softw == NULL) {
             success = false;
@@ -102 +114 @@
           }
     
-          success = softw->createInputFile(sector->getParticleBeam(),workingDir);
+          //      success = softw->createInputFile(sector->getParticleBeam(),workingDir);
+          cout << " dataManager::executeAll() APPEL softw->createInputFile " << endl;
+          success = softw->createInputFile(computedBeam,workingDir);
           if ( success ) {
             success = softw->execute(workingDir);
@@ -111 +125 @@
           cout << " dataManager::executeAll success = " << success << " y-a-ty du faisceau : " << diagnosticBeam_.size() << endl;
           if ( success  && (diagnosticBeam_.size() > 0)) {
-            sector->setParticleBeam(&diagnosticBeam_.at(indexElementToIndexDiag_.back()));
+            // sector->setParticleBeam(&diagnosticBeam_.at(indexElementToIndexDiag_.back()));
+            computedBeam = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
             cout << " dataManager::executeAll termine avec succes " << endl;
           } else {
-            sector->setParticleBeam(NULL);
+            //      sector->setParticleBeam(NULL);
+            computedBeam = NULL;
             cout << " dataManager::executeAll termine en ECHEC " << endl;
           }
@@ -121 +137 @@
 #if BAVARD > 0
           cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
-          cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
-          std::vector< abstractElement* > elements = section->getElements();
-          for (unsigned j = 0; j < elements.size(); j++) {
-            cout << "[" << j << "] " << elements[j]->getNomdElement().getExpandedName() << endl;
+          //      cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
+          //      std::vector< abstractElement* > elements = section->getElements();
+          //      std::vector< abstractElement* > elements = compblock.at(l)->getElements();
+          for (unsigned j = 0; j < compblock.at(l)->getNumberOfElements(); j++) {
+            cout << "[" << j << "] " << compblock.at(l)->getElement(j)->getNomdElement().getExpandedName() << endl;
           }
 #endif
         } //l
-    } //k
+      //    } //k
   
   // if ( currentBeam_deprecated_ ) {
@@ -179 +196 @@
 // }
 
+
+
+
+
+
 // ecriture sur fichier AML
 void dataManager::writeToAMLFile(string fileName)
@@ -199 +221 @@
   //sectorParam_.InputRep(lab);
 
-  // sequence of elements
-  UAPNode* sect = lab->addChild("sector");
-  sect->addAttribute("name","a_sect");
-
-  abstractElement* elPtr;
-  for (unsigned k = 0; k < jobList_.size(); k++) {
-    sector* sector = jobList_[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      for (unsigned m = 0; m < section->getElements().size(); m++) {
-        elPtr = section->getElements()[m];
-        elPtr->InputRep(sect);
-      }
-    }
-  }
+  // sequence of sectors with elements
+
+  for ( unsigned k=0; k < sectors_.size(); k++) {
+    sector* secteur = sectors_.at(k);
+    UAPNode* sect = lab->addChild("sector");
+    sect->addAttribute("name",secteur->getName());
+    abstractElement* elPtr;
+    for ( unsigned j=0; j < secteur->getElements().size(); j++) {
+      elPtr = secteur->getElements().at(j);
+      elPtr->InputRep(sect);
+    }
+  }
+
+  if ( currentMachine_ ) currentMachine_->FileAMLOutput(lab);
   cout << "!Create the AML file ---------------------------" << endl;
   AMLReader reader;
@@ -220 +241 @@
 }
 
-// bool dataManager::restoreElements(string inputFileName)
-// {
-//   cout << "***********************************" << endl;
-//   cout << " dataManager::restoreElements() fichier :" << inputFileName << endl << endl;
-
-//   ifstream infile;
-//   string name = inputFileName;
-//   infile.open(name.c_str(), ios::in);
-//   if (!infile) {
-//     cerr << " error opening input stream " << name << endl;
-//     return false;
-//   }
-//   else cout << " successful opening input stream : " << name << endl;
-  
-//   //NOTE:: je ne sais pas si les "secteurs" seront conservés, aussi pour ne pas trop changer les fichiers je lis les données aprÚs "globals" dans la boucle 
-  
-//   // Clear the BeamLine
-//   jobList_.clear();
-
-//   // FIXME : For test purpose !!!
-//   sector* mySect = addNewSector();
-  
-//   nomdElements::typedElement elementType;
-//   string elementLabel;
-//   abstractElement* nouveau = NULL;
-//   while (infile >> elementLabel) {
-//     if (elementLabel == string("globals") ) {
-//       globParam_.raz();
-//       globParam_.FileInput(infile);
-//     } else if (elementLabel == string("sectors") ) {
-//       // FIXME Francois !!!!!!!
-// //      sectorParam_.raz();
-// //      sectorParam_.FileInput(infile);
-//       // END
-//     } else {
-//       elementType = nomdElements::getTypeFromLabel(elementLabel);
-//       nouveau = mySect->addElementAfter(elementType,nouveau);
-//       if ( nouveau == NULL ) {
-//      cerr << " dataManager::restoreElements() : restore element " << elementLabel << " failed " << endl;
-//      return false;
-//       } else {
-//      nouveau->FileInput(infile);
-//       }
-//     }
-//   }// while
-  
-// #if BAVARD > 1
-// /*  unsigned k;
-//   for(k = 0; k < getBeamLineSize(); k++) {
-//     abstractElement* ptr = pspa_->getBeamLine_deprecated()->getAbstractElement(k);
-//     cout << "recupere " << ptr->getLabel() << endl;
-//   }
-// */
-// #endif
-
-//   infile.close();
-//   return true;
-// }
 
 bool dataManager::restoreAMLElements(string inputFileName)
@@ -296 +259 @@
 
 NodeVec laboratories = uap_root->getSubNodesByName(string("laboratory"));
- cout << " dataManager::restoreAMLElements nombre de <laboratory> : " << laboratories.size() << endl;
+// cout << " dataManager::restoreAMLElements nombre de <laboratory> : " << laboratories.size() << endl;
 
  uap_labname = *laboratories.begin();
@@ -302 +265 @@
  if ( !uap_labname ) {
    cout << " dataManager::restoreAMLElements : fichier non conforme, on ne trouve pas <laboratory...> " << endl;
- } else {
-   cout << " dataManager::restoreAMLElements : GO !" << endl;
+   // } else {
+   //   cout << " dataManager::restoreAMLElements : GO !" << endl;
  }
 
@@ -310 +273 @@
   
   // Clear the BeamLine
-  jobList_.clear();
+  sectors_.clear();
 
   // FIXME : For test purpose !!!
-  sector* mySect = addNewSector();
-  
+  //  sector* mySect = addNewSector();
+  //  if (  currentMachine_ ) delete currentMachine_;
+  //  currentMachine_ = new expandedMachine();
 
    UAPNode* parametresGlobaux = uap_labname->getChildByName(string("global"));
   if ( !parametresGlobaux ) {
     cout << " dataManager::restoreAMLElements GLOBAUX NON TROUVES " << endl;
-  } else {
-    cout << " dataManager::restoreAMLElements GENIAL ! " << endl;
+  // } else {
+  //   cout << " dataManager::restoreAMLElements GENIAL ! " << endl;
   }
   globParam_.raz();
@@ -326 +290 @@
 
 
+
   nomdElements::typedElement elementType;
   string elementLabel;
-  abstractElement* nouveau = NULL;
 
 
@@ -337 +301 @@
     return false;
   }
-
-
-  NodeVec& listElem = ( *sectorNode.begin() )->getChildren();
-  if (  !listElem.size() ) {
-    cout << " dataManager::restoreAMLElements ERREUR lecture fichier : pas d'elements ? " << endl;
-    return false;
-  } else {
-    cout << " dataManager::restoreAMLElements : liste elements non vide : SUCCES " << endl;
-  }
-
-  for (NodeVecIter iter = listElem.begin(); iter != listElem.end(); iter++) {
-
-    string nomNoeud = (*iter)->getName();
-    if ( nomNoeud != string("element") ) {
-      cout << " le secteur contient un non-element : " << nomNoeud << endl;
-      continue;
-    }
-
-    UAPAttribute* att = NULL;
-    att = (*iter)->getAttribute("name");
-
-    cout << " dataManager::restoreAMLElements trouve element " << att->getValue();
-
-    string nomGenerique;
-    AMLtools::readAMLParameterAttribut(*iter, "description", "type", nomGenerique);
-
-    // UAPNode*  genericName = (*iter)->getChildByName("description");
-    // att = genericName->getAttribute("type");
-
-    cout <<  " de type " << nomGenerique << endl;
-
-
-    elementType = nomdElements::getTypeFromLabel(nomGenerique);
-    nouveau = mySect->addElementAfter(elementType,nouveau);
-
+  for (NodeVecIter iterSect = sectorNode.begin(); iterSect != sectorNode.end(); iterSect++) {
+    UAPAttribute* att = (*iterSect)->getAttribute("name");
+    if ( !att ) continue;
+    sectors_.push_back( new sector(this, att->getValue()) );
+    NodeVec& listElem = (*iterSect)->getChildren();
+    if (  !listElem.size() ) {
+      cout << " dataManager::restoreAMLElements WARNING lecture fichier secteur " <<  att->getValue() << "  : pas d'elements ? " << endl;
+    }
+    abstractElement* nouveau = NULL;
+    for (NodeVecIter iterelem = listElem.begin(); iterelem != listElem.end(); iterelem++) {
+
+      string nomNoeud = (*iterelem)->getName();
+      if ( nomNoeud != string("element") ) {
+        cout << " le secteur contient un non-element : " << nomNoeud << endl;
+        continue;
+      }
+
+      att = NULL;
+      att = (*iterelem)->getAttribute("name");
+
+
+      string nomGenerique;
+      AMLtools::readAMLParameterAttribut(*iterelem, "description", "type", nomGenerique);
+      elementType = nomdElements::getTypeFromLabel(nomGenerique);
+      nouveau = sectors_.back()->addElementAfter(elementType,nouveau);
       if ( nouveau == NULL ) {
         cerr << " dataManager::restoreAMLElements() : restore element " << att->getValue() << " failed " << endl;
         return false;
       } else {
-        nouveau->FileAMLInput(*iter); 
+        nouveau->FileAMLInput(*iterelem); 
       }
-  }
-
-  
+    } // iterelem
+  } // itersect
+
+
+  // cout << " dataManager::restoreAMLElements BILAN DES SECTEURS " << endl;
+  // for ( unsigned m=0; m < sectors_.size(); m++ ) {
+  //   cout << " secteur " << m+1 << " nom : " << sectors_.at(m)->getName() << endl;
+  //   for ( unsigned j=0; j<sectors_.at(m)->getElements().size(); j++) {
+  //     cout << " el. : " << sectors_.at(m)->getElements().at(j)->getLabel() << endl;
+  //   }
+  // }
+
+  NodeVec machine = uap_root->getSubNodesByName(string("machine"));
+  if ( !machine.size()  ) {
+    cout << " dataManager::restoreAMLElements ne trouve pas de machine " << endl;
+  } else {
+    if ( machine.size() > 1 ) {
+      cout << " dataManager::restoreAMLElements PLUSIEURS MACHINES : cas non prevu " << endl;
+    }
+    //    cout << " dataManager::restoreAMLElements il y a une machine a lire dans   " << endl;
+    //    cout << currentMachine_ << endl;
+    if ( !currentMachine_ ) currentMachine_ = new expandedMachine(this);
+    currentMachine_->FileAMLInput(machine.at(0)); 
+  }
+  
+
+
   return true;
 }
@@ -397 +375 @@
 particleBeam* dataManager::getDiagnosticBeam_deprecated(string elementLabel)
 {
+  if ( !currentMachine_ ) return NULL;
+
   // FIXME : Devra etre changé par une récupération par "abstractElement" et non pas par label
   unsigned int number = 0;
   abstractElement* elPtr;
-  for (unsigned k = 0; k < jobList_.size(); k++) {
-    sector* sector = jobList_[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      for (unsigned m = 0; m < section->getElements().size(); m++) {
-        elPtr = section->getElements()[m];
-        if (elPtr->getLabel() == elementLabel) {
-          return getDiagnosticBeam(number);
-        }
-        number ++;
+
+  for (unsigned k = 0; k < currentMachine_->getComputingBlocks().size(); k++) {
+    computingBlock* block = currentMachine_->getComputingBlocks().at(k);
+    for (unsigned m = 0; m < block->getNumberOfElements(); m++) {
+      elPtr = block->getElement(m);
+      if (elPtr->getLabel() == elementLabel) {
+        return getDiagnosticBeam(number);
       }
-    }
-  }
+      number ++;
+    }
+  }
+
+
   return NULL;
 }
 
 
-// on ne tient pas compte des elements "snapshot" presents dans la beamLine
 void dataManager::donneesRmsEnveloppe(string type,vector<double>& xcor,vector<double>& ycor, string& titre, string& legendx, string& legendy)
 {
@@ -431 +410 @@
     unsigned i = 0;
     cout << " dataManager::donneesRmsEnveloppe " << endl;
-    //    for (unsigned k = 0; k < getBeamLineSize(); k++) {
-    for (unsigned k = 0; k < jobList_.size(); k++) {
-      sector* sector = jobList_[k];
-      for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-        sectionToExecute* section = sector->getSectionsToExecute()[l];
-        for (unsigned m = 0; m < section->getElements().size(); m++) {
-          abstractElement* elPtr = section->getElements()[m];
-          //     if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-          //      if(elPtr->getNomdElement().getElementType() == fit) continue;
-          particleBeam* beamToDraw = getDiagnosticBeam(i);
-          if ( !beamToDraw->momentRepresentationOk() ) {
-            beamToDraw->buildMomentRepresentation();
-          }
+
+    if ( !currentMachine_ ) {
+    cout << " dataManager::donneesRmsEnveloppe PAS DE MACHINE " << endl;
+    return;
+    }
+
+  for (unsigned k = 0; k < currentMachine_->getComputingBlocks().size(); k++) {
+    computingBlock* block = currentMachine_->getComputingBlocks().at(k);
+    for (unsigned m = 0; m < block->getNumberOfElements(); m++) {
+      abstractElement* elPtr = block->getElement(m);
+      particleBeam* beamToDraw = getDiagnosticBeam(i);
+      if ( !beamToDraw->momentRepresentationOk() ) {
+        beamToDraw->buildMomentRepresentation();
+      }
           
-          longueur += elPtr->getLenghtOfElement();
-          valeur = beamToDraw->getXmaxRms();
-          cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
-          xcor.push_back(0.01*longueur);  // on passe en metres
-          ycor.push_back(valeur);
-          i++;
-        }
-      }
-    }
+      longueur += elPtr->getLenghtOfElement();
+      valeur = beamToDraw->getXmaxRms();
+      cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
+      xcor.push_back(0.01*longueur);  // on passe en metres
+      ycor.push_back(valeur);
+      i++;      
+    }
+  }
+
+
+
+
+    // for (unsigned k = 0; k < jobList_.size(); k++) {
+    //   sector* sector = jobList_[k];
+    //   for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+    //     sectionToExecute* section = sector->getSectionsToExecute()[l];
+    //     for (unsigned m = 0; m < section->getElements().size(); m++) {
+    //       abstractElement* elPtr = section->getElements()[m];
+    //       //     if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+    //       //      if(elPtr->getNomdElement().getElementType() == fit) continue;
+    //       particleBeam* beamToDraw = getDiagnosticBeam(i);
+    //       if ( !beamToDraw->momentRepresentationOk() ) {
+    //         beamToDraw->buildMomentRepresentation();
+    //       }
+          
+    //       longueur += elPtr->getLenghtOfElement();
+    //       valeur = beamToDraw->getXmaxRms();
+    //       cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
+    //       xcor.push_back(0.01*longueur);  // on passe en metres
+    //       ycor.push_back(valeur);
+    //       i++;
+    //     }
+    //   }
+    // }
+
     legendy.clear();
     legendy = " x (cm) ";
@@ -468 +474 @@
   
   sector* sect = new sector(this, std::string("sector ") + result);
-  jobList_.push_back(sect);
+  sectors_.push_back(sect);
   return sect;
 }
 
+abstractElement* dataManager::getElementInSectorsByLabel(string etiq) {
+  for ( unsigned k=0; k < sectors_.size(); k++) {
+    for ( unsigned j=0; j < sectors_.at(k)->getElements().size(); j++) {
+      if ( etiq == sectors_.at(k)->getElements().at(j)->getLabel() ) return sectors_.at(k)->getElements().at(j);
+    }
+  }
+  return NULL;
+}
+
+
+  void dataManager::messageEcran(string niveau, string msg) const {
+    GWt_dialog::iconType icon;
+    if ( niveau == "ERROR" ) {
+      icon = GWt_dialog::Error;
+    } else if  ( niveau == "WARNING" ) {
+      icon = GWt_dialog::Warning;
+    } else if  ( niveau == "INFO" ) {
+      icon = GWt_dialog::Info;
+    } else {
+      icon = GWt_dialog::NoIcon;
+    }
+    GWt_dialog checkConfigNameDialog(niveau, msg, icon,true,true);
+    checkConfigNameDialog.exec();
+  }

Interface_Web/trunk/pspaWT/sources/controler/src/elementSoleno.cc

@@ -5 +5 @@
 elementSoleno::elementSoleno() :  abstractElement() 
 {
-  cout << " passage constructeur elementSoleno " << endl;
   setDefaultValues();
   setDefaults();

Interface_Web/trunk/pspaWT/sources/controler/src/nomDeLogiciel.cc

@@ -81 +81 @@
 void nomDeLogiciel::setCompatiblesElements() 
 {
-  //cout << " nomDeLogiciel::setCompatiblesElements() " << program_ << endl;
   switch (program_) 
     {
@@ -134 +133 @@
 }
 
-trivaluedBool nomDeLogiciel::doAcceptElement(nomdElements::typedElement typdel) 
+trivaluedBool nomDeLogiciel::doAcceptElement(nomdElements::typedElement typdel) const
 {
-  //xx
-
-  //cout << " nomDeLogiciel::doAcceptElement type : " << typdel << endl;
-  //cout << " nomDeLogiciel::doAcceptElement nb el/ acc. " << acceptedElements_.size() << endl;
   if (acceptedElements_.size() == 0 ) {
     return TBoolError;
@@ -156 +151 @@
   }
   
-  return TBoolOk;
+  return TBoolError;
 }
 

Interface_Web/trunk/pspaWT/sources/controler/src/sector.cc

@@ -9 +9 @@
 #include "sector.h"
 
-#include "sectionToExecute.h"
+//#include "sectionToExecute.h"
 #include "dataManager.h"
 #include "elementDrift.h"
@@ -100 +100 @@
   
   if (previousElement == NULL) {
-    if (sectionToExecute_.size() == 0) {
-      sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_,this));
-    } else {
-        sectionToExecute* section = sectionToExecute_.front();
-      section->insertAtFirst(currentElement);
-    }
+    elements_.insert ( elements_.begin() ,currentElement);
+    // if (sectionToExecute_.size() == 0) {
+    //   sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_,this));
+    // } else {
+    //     sectionToExecute* section = sectionToExecute_.front();
+    //   section->insertAtFirst(currentElement);
+    // }
   } else {
- 
-    for (unsigned int i=0; i<sectionToExecute_.size(); i++) {
-      sectionToExecute* section = sectionToExecute_[i];
-      if (section->insertAfter(previousElement,currentElement)) {
-        return;
-      }
-    }
-  }
-}
-
-void sector::removeElement(abstractElement* currentElement) {
-  if (currentElement == NULL) return;
-  
-  for (unsigned int i=0; i<sectionToExecute_.size(); i++) {
-    sectionToExecute* section = sectionToExecute_[i];
-    
-    if (section->isInside(currentElement)) {
-      section->removeElement(currentElement);
-    }
+    insertAfter(previousElement,currentElement);
+    // for (unsigned int i=0; i<sectionToExecute_.size(); i++) {
+    //   sectionToExecute* section = sectionToExecute_[i];
+    //   if (section->insertAfter(previousElement,currentElement)) {
+    //     return;
+    //   }
+    // }
   }
 }
 
 
-void sector::clearSectionToExecute()
-{
-  unsigned k;
-  for(k = 0; k < sectionToExecute_.size(); k++)
-  {
-    if ( sectionToExecute_[k] != NULL ) clearSectionToExecute(k);
+bool sector::insertAfter(abstractElement* previousElement,abstractElement* currentElement) {
+
+  std::vector<abstractElement*>::iterator it;
+  for (it = elements_.begin(); it < elements_.end(); it++) {
+    if (*it == previousElement ) {
+      elements_.insert (it+1,currentElement);
+      return true;
+    }
   }
-  sectionToExecute_.clear();
+  return false;
 }
 
-void sector::clearSectionToExecute(int a)
-{
-  cout << " dataManager::clearSectionToExecute : effacement de la section d'index = " << a << endl;
-  if (a < 0) return;
-  if (a >= (int)sectionToExecute_.size()) return;
+bool sector::isInside(abstractElement* previousElement) {
+  for (unsigned int a=0; a< elements_.size(); a++) {
+    if (elements_[a] == previousElement ) {
+      return true;
+    }
+  }
+  return false;
+}
+
+
+
+void sector::removeElement(abstractElement* currentElement) {
+  if (currentElement == NULL) return;
+  std::vector<abstractElement*>::iterator it;
+  for (it = elements_.begin(); it < elements_.end(); it++) {
+    if (*it == currentElement ) {
+      elements_.erase(it);
+      return;
+    }
+  }
+  // for (unsigned int i=0; i<sectionToExecute_.size(); i++) {
+  //   sectionToExecute* section = sectionToExecute_[i];
+    
+  //   if (section->isInside(currentElement)) {
+  //     section->removeElement(currentElement);
+  //   }
+  // }
+}
+
+
+// void sector::clearSectionToExecute()
+// {
+//   unsigned k;
+//   for(k = 0; k < sectionToExecute_.size(); k++)
+//   {
+//     if ( sectionToExecute_[k] != NULL ) clearSectionToExecute(k);
+//   }
+//   sectionToExecute_.clear();
+// }
+
+// void sector::clearSectionToExecute(int a)
+// {
+//   cout << " dataManager::clearSectionToExecute : effacement de la section d'index = " << a << endl;
+//   if (a < 0) return;
+//   if (a >= (int)sectionToExecute_.size()) return;
   
-  // lors de la creation de la section on a fait un 'new' d'un
-  // softwareXXXX : on fait ici le 'delete'
+//   // lors de la creation de la section on a fait un 'new' d'un
+//   // softwareXXXX : on fait ici le 'delete'
   
-  const abstractSoftware* soft = sectionToExecute_.at(a)->getSoftware();
-  if ( soft != NULL ) delete soft;
-  delete sectionToExecute_[a];
-  sectionToExecute_.erase (sectionToExecute_.begin()+a);
-}
+//   const abstractSoftware* soft = sectionToExecute_.at(a)->getSoftware();
+//   if ( soft != NULL ) delete soft;
+//   delete sectionToExecute_[a];
+//   sectionToExecute_.erase (sectionToExecute_.begin()+a);
+// }

Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc

@@ -12 +12 @@
 }
 
-softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect,dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect,dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// {
+//   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
+//   nameOfSoftware_ = new  nomDeLogiciel("generator");
+//   //  registerElement(nomdElements::RFgun,TBoolOk);
+// }
+
+softwareGenerator::softwareGenerator(string inputFileName, computingBlock* cmpb,dataManager* data) : abstractSoftware(inputFileName, cmpb,data)
 {
   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
@@ -21 +28 @@
 bool softwareGenerator::createInputFile(particleBeam* beamBefore, string workingDir)
 {
-  abstractElement* firstElement = getSectionToExecute()->getElements().front();
+  abstractElement* firstElement = getComputingBlock()->getFirstElement();
   
   if ( firstElement->getNomdElement().getElementType() != nomdElements::RFgun ) {
@@ -93 +100 @@
   bool result = true;
 
-  if ( getSectionToExecute()->getElements().size() != 1 ) {
+  if ( getComputingBlock()->getNumberOfElements() != 1 ) {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : only one element (rfgun) must be calculated " );
     return false;

Interface_Web/trunk/pspaWT/sources/controler/src/softwareMadx.cc

@@ -13 +13 @@
 }
 
-softwareMadx::softwareMadx(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName,sect,data)
+// softwareMadx::softwareMadx(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName,sect,data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("madx");
+// }
+
+softwareMadx::softwareMadx(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName,cmpb,data)
 {
   nameOfSoftware_ = new nomDeLogiciel("madx");
@@ -33 +38 @@
   }
 
-  sector* sector= getSectionToExecute()->getSector();
-  cout << " softwareMadx::createInputFile sector " << sector->getName() << endl;
+  //  sector* sector= getSectionToExecute()->getSector();
+  //  cout << " softwareMadx::createInputFile sector " << sector->getName() << endl;
   ///////////////////////////////////////////
   
@@ -40 +45 @@
   string sbeam;
   abstractElement* elPtr;
-  elPtr = getSectionToExecute()->getElements().front();
+  //  elPtr = getSectionToExecute()->getElements().front();
+  elPtr = getComputingBlock()->getFirstElement();
   nomdElements::typedElement eType = elPtr->getNomdElement().getElementType();
 
@@ -85 +91 @@
   ostringstream os;
   os << "L: line=(";
-  unsigned nElts= getSectionToExecute()->getElements().size();
+  //  unsigned nElts= getSectionToExecute()->getElements().size();
+  unsigned nElts= getComputingBlock()->getNumberOfElements();
   for(unsigned k = firstIndex; k < nElts; k++)
     {
-      elPtr = getSectionToExecute()->getElements()[k];
+      //      elPtr = getSectionToExecute()->getElements()[k];
+      elPtr = getComputingBlock()->getElement(k);
       cout << " debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       vector<statements> v= elPtr->parametersToSoftware();
@@ -103 +111 @@
   
   // relection and repetition ///////////////
-  os << "all: " << "line=(" << sector->getRepetitionNumber() << "*L);";
+  //  os << "all: " << "line=(" << sector->getRepetitionNumber() << "*L);";
+  int bid = 1;
+os << "all: " << "line=(" << bid << "*L);";
   ///////////////////////////////////////////
   

Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

@@ -13 +13 @@
 }
 
-softwareParmela::softwareParmela(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect, data)
+// softwareParmela::softwareParmela(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect, data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("parmela");
+//   cout << " CONSTRUCTEUR softwareParmela() COMPLET " << endl;
+// }
+
+softwareParmela::softwareParmela(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName, cmpb, data)
 {
   nameOfSoftware_ = new nomDeLogiciel("parmela");
-  cout << " CONSTRUCTEUR softwareParmela() COMPLET " << endl;
-  // registerElement(nomdElements::RFgun,TBoolOk);
-  // registerElement(nomdElements::drift,TBoolOk);
-  // registerElement(nomdElements::cell,TBoolOk);
-  // registerElement(nomdElements::bend,TBoolOk);
-  // registerElement(nomdElements::soleno,TBoolOk);
-  // registerElement(nomdElements::fit,TBoolIgnore);
-  // registerElement(nomdElements::snapshot,TBoolIgnore);
-}
-
+  cout << " CONSTRUCTEUR softwareParmela() COMPLET avec COMPUTING BLOCK = " << cmpb << endl;
+    cout << " softwareParmela::CONSTRUCTEUR adresse mamager " << dataManager_  << endl;
+    cout << " softwareParmela::CONSTRUCTEUR adresse GLOBAUX " << dataManager_->getGlobalParameters()  << endl;
+}
+
+void softwareParmela::setRelativeParmelaElementIndices() {
+    relativeParmelaElementIndices_.clear();
+
+  relativeParmelaElementIndices_.resize(getComputingBlock()->getNumberOfElements(), -1);
+  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
+  abstractElement* elPtr = getComputingBlock()->getFirstElement();
+  bool there_is_rfgun = (elPtr->getNomdElement().getElementType() == nomdElements::RFgun );
+
+  //  unsigned offsetNumElem;
+  // index du premier element de parmela
+  int id;
+  // les elements de parmela sont indexes de 1 Ã  max, s'il n'y a pas de rfgun
+  if ( !there_is_rfgun ) {
+    id = 1;
+    // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
+  } else {
+    id = 0;
+  }
+
+  unsigned k;
+  unsigned curseur = 0;
+  //  for ( k=numeroDeb_; k <= numeroFin_ ; k++ ) {
+  for ( k = 0; k < getComputingBlock()->getNumberOfElements(); k ++) {
+    abstractElement* elem = getComputingBlock()->getElement(k);
+    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
+    // if ( elem->is_accepted_by_software(nameOfSoftware_) == TBoolOk ) {
+
+    if ( getNomDeLogiciel()->doAcceptElement(elem->getNomdElement().getElementType()) == TBoolOk  ) {
+      relativeParmelaElementIndices_.at(curseur) = id;
+      cout << " mis a " << id << endl;
+      id++;
+    }
+    curseur++;
+  }
+}
 
 
 bool softwareParmela::createInputFile(particleBeam* beamBefore, string workingDir)
 {
+
+  cout << " softwareParmela::createInputFile ENTREE " << endl;
   unsigned int k;
 
-//  setRelativeParmelaElementIndices();
+  setRelativeParmelaElementIndices();
   string name = workingDir + inputFileName_;
   ofstream outfile;
@@ -42 +80 @@
   }
   
-  abstractElement* elPtr = getSectionToExecute()->getElements().front();
+  //  abstractElement* elPtr = getSectionToExecute()->getElements().front();
+
+  abstractElement* elPtr = getComputingBlock()->getFirstElement();
   double initalKineticEnergy = 0.0;
+
   bool there_is_rfgun = (elPtr->getNomdElement().getElementType() == nomdElements::RFgun );
-  
+
   if ( !there_is_rfgun ) {
     string nameOfInput = workingDir + "parin.input0";
@@ -55 +96 @@
     elPtr->setPhaseStep( dataManager_->getGlobalParameters()->getIntegrationStep() );
     initalKineticEnergy = elPtr->getInitialKineticEnergy();
-    // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
-  }
-  
+  }
+
   outfile << "TITLE" << endl;
   outfile << " titre provisoire " << endl;
   outfile << "RUN /n0=1 /ip=999 /freq=" << dataManager_->getGlobalParameters()->getFrequency() << "  /z0=0.0 /W0=" << initalKineticEnergy << "  /itype=1" << endl;
   outfile << "OUTPUT 0" << endl;
+
+  unsigned int premier = 0 ;
   if ( there_is_rfgun ) {
     outfile << elementsData(elPtr->parametersToSoftware());
+    premier++;
   } else {
     outfile << "INPUT 0 /NP=" << beamBefore->getNbParticles() << endl;
   }
-  
- // retrouver le sector !!
-  for ( k =1; k < getSectionToExecute()->getElements().size(); k++)
+
+  for ( k =premier++; k < getComputingBlock()->getNumberOfElements(); k++)
     {
-      outfile << elementsData(getSectionToExecute()->getElements()[k]->parametersToSoftware());
-    }
-    
+      outfile << elementsData(getComputingBlock()->getElement(k)->parametersToSoftware());
+    }
+  
   outfile << "ZOUT" << endl;
   outfile << "START /wt=0.0 /dwt=" << dataManager_->getGlobalParameters()->getIntegrationStep() << "  /nsteps=" << dataManager_->getGlobalParameters()->getNbSteps() << "  nsc=" << dataManager_->getGlobalParameters()->getScPeriod() << "  /nout=10" << endl;
@@ -121 +163 @@
 
   unsigned curseur;
-  for ( unsigned int k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
-    abstractElement* elem = getSectionToExecute()->getElements()[k];
+  for ( unsigned int k=0; k < getComputingBlock()->getNumberOfElements() ; k++ ) {
+    abstractElement* elem = getComputingBlock()->getElement(k);
       if ( elem == NULL ) {
         dataManager_->consoleMessage(" softwareParmela::buildBeamAfterElements : null pointer on element " );
@@ -129 +171 @@
 
     curseur = k;
-    cout << " softwareParmela::buildBeamAfterElements : type element " << getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType() << endl;
-    if (!(nameOfSoftware_->doAcceptElement(getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
-
-      cout << " softwareParmela::buildBeamAfterElements ELEMENT ETRANGER " << endl;
-//      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
+    cout << " softwareParmela::buildBeamAfterElements : type element " << getComputingBlock()->getElement(curseur)->getNomdElement().getElementType() << endl;
+
+
+    //      if (!(nameOfSoftware_->doAcceptElement(getComputingBlock()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
+
+    if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
 
         // si l'element doit etre ignore de parmela, on renvoie sur le diag precedent
@@ -149 +192 @@
           double freq= dataManager_->getGlobalParameters()->getFrequency();
           unsigned numeroParmel;
-//        numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
-    numeroParmel = curseur;
-          cout << " lecture PARMELA el no absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
+          numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+          //    numeroParmel = curseur;
+          cout << " lecture PARMELA el no relativement absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
         // lecture sortie parmela
         if(!beamFromParmela(workingDir,numeroParmel,freq,centroid,refPart,particles))

Interface_Web/trunk/pspaWT/sources/controler/src/softwareTest.cc

@@ -14 +14 @@
 
 
-softwareTest::softwareTest(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// softwareTest::softwareTest(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("test");
+// }
+
+softwareTest::softwareTest(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName, cmpb,data)
 {
   nameOfSoftware_ = new nomDeLogiciel("test");
@@ -38 +43 @@
   dataManager_->consoleMessage(" softwareTest::buildBeamAfterElements  " );
   bool result = true;
-  for ( unsigned int k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
+  for ( unsigned int k=0; k < getComputingBlock()->getNumberOfElements() ; k++ ) {
       particleBeam* newDiag = dataManager_->updateCurrentDiagnostic(true);
   //      beams.push_back(particleBeam());

Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

@@ -11 +11 @@
 }
 
-softwareTransport::softwareTransport(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// softwareTransport::softwareTransport(string inputFileName,sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// {
+//   nameOfSoftware_ = new nomDeLogiciel("transport");
+// }
+
+softwareTransport::softwareTransport(string inputFileName,computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName, cmpb,data)
 {
   nameOfSoftware_ = new nomDeLogiciel("transport");
-  // registerElement(nomdElements::beam,TBoolOk);
-  // registerElement(nomdElements::drift,TBoolOk);
-  // registerElement(nomdElements::bend,TBoolOk);
-  // registerElement(nomdElements::soleno,TBoolOk);
-  // registerElement(nomdElements::fit,TBoolOk);
-  // registerElement(nomdElements::snapshot,TBoolIgnore);
 }
 
@@ -26 +25 @@
 
 
-  abstractElement* premierEl = getSectionToExecute()->getElements().front();
+  abstractElement* premierEl = getComputingBlock()->getFirstElement();
 
   // ceinture et bretelles
@@ -84 +83 @@
 
   abstractElement* elPtr;
-  for (unsigned k = 0; k < getSectionToExecute()->getElements().size(); k++)
+  for (unsigned k = 0; k < getComputingBlock()->getNumberOfElements(); k++)
     {
-      elPtr = getSectionToExecute()->getElements()[k];
+      elPtr = getComputingBlock()->getElement(k);
       cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       //      outfile << elPtr->transportOutputFlow();
@@ -142 +141 @@
   bool result = true;
 
-  for (unsigned k = 0; k < getSectionToExecute()->getElements().size(); k++)
+  for (unsigned k = 0; k < getComputingBlock()->getNumberOfElements(); k++)
     {
-      abstractElement* ptr = getSectionToExecute()->getElements()[k];
+      abstractElement* ptr = getComputingBlock()->getElement(k);
       if ( ptr == NULL ) {
         dataManager_->consoleMessage(" softwareTransport::buildBeamAfterElements : null pointer on element " );

Interface_Web/trunk/pspaWT/sources/controler/src/softwareUsersprogram.cc

@@ -10 +10 @@
 }
 
-softwareUsersprogram::softwareUsersprogram(string inputFileName, sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// softwareUsersprogram::softwareUsersprogram(string inputFileName, sectionToExecute* sect, dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// {
+//   cout << " softwareUsersprogram::softwareUsersprogram ENREGISTREMENT " << endl;
+//   nameOfSoftware_ = new nomDeLogiciel("usersprogram");
+//   //  registerElement(nomdElements::snapshot,TBoolOk);
+// }
+
+softwareUsersprogram::softwareUsersprogram(string inputFileName, computingBlock* cmpb, dataManager* data) : abstractSoftware(inputFileName, cmpb,data)
 {
   cout << " softwareUsersprogram::softwareUsersprogram ENREGISTREMENT " << endl;
@@ -20 +27 @@
 { 
 
-  abstractElement* element = getSectionToExecute()->getElements().front();
+  abstractElement* element = getComputingBlock()->getFirstElement();
 
   // Dans le cas où l'element n'est pas snapshot
@@ -99 +106 @@
   //  for (unsigned k = numeroDeb_; k <= numeroFin_; k++)
   
-  abstractElement* ptr = getSectionToExecute()->getElements().front();
+  abstractElement* ptr = getComputingBlock()->getFirstElement();
       if ( ptr == NULL ) {
         dataManager_->consoleMessage("ERROR  softwareUsersprogram::buildBeamAfterElements : null pointer on element " );

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

@@ -27 +27 @@
   virtual ~GWt_accelerator();
   inline WContainerWidget* getAcceleratorDetailledView() {return acceleratorDetailledView_;};
+  inline WContainerWidget* getAcceleratorComputingView() {return acceleratorComputingView_;};
   inline WLayout* getAcceleratorGlobalViewLayout() {return acceleratorGlobalViewLayout_;};
   inline dataManager* getDataManager() { return dataManager_;};
@@ -34 +35 @@
   private :
   WContainerWidget* acceleratorDetailledView_;
+  WContainerWidget* acceleratorComputingView_;
   void addSector();
   void readConfiguration();
+  void expandMachine();
   void run();
   void closeGraphicDialog();

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

@@ -18 +18 @@
 #include "GWt_dialog.h"
 #include "GWt_console.h"
-#include "GWt_softwarePanel.h"
+//#include "GWt_softwarePanel.h"
 #include "GWt_globalParameters.h"
 #include "GWt_sectorParameters.h"

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_sector.h

@@ -8 +8 @@
 #include "GWt_accelerator.h"
 #include "GWt_ligneFaisceau.h"
+//#include "GWt_softwarePanel.h"
 
 using namespace Wt;
@@ -22 +23 @@
   /* Return the controler sector element for this UI sector*/
   inline sector* getSectorControler() {return sectorControler_;};
-  inline GWt_softwarePanel* getExecuteWidget() {
-    return executeWidget_;
-  }
+
+  //    inline GWt_softwarePanel* getExecuteWidget() {
+  //      return executeWidget_;
+  //  }
+
   /**
    Get the accelerator for this sector
@@ -49 +52 @@
   GWt_accelerator* UI_Accelerator_;
   sector* sectorControler_;
-  GWt_softwarePanel* executeWidget_;
+  //    GWt_softwarePanel* executeWidget_;
 
 };

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

@@ -7 +7 @@
 //
 
-#ifndef GWt_softwarePanel_SEEN
-#define GWt_softwarePanel_SEEN
+#ifndef GWt_softwarePanelBis_SEEN
+#define GWt_softwarePanelBis_SEEN
 
 #include <iostream>
@@ -20 +20 @@
 
 class PspaApplication;
-class GWt_sector;
+class GWt_machine;
 
-class GWt_softwarePanel  : public WContainerWidget
+class GWt_softwarePanelBis  : public WContainerWidget
 {
  public :
   
-  GWt_softwarePanel(dataManager*, GWt_sector*);
-  virtual ~GWt_softwarePanel();
+  GWt_softwarePanelBis(dataManager*, GWt_machine*);
+  virtual ~GWt_softwarePanelBis();
 
   /**
    Read all sectionToExecute from the controler and build a newsoftware panel with it
    */
-  void displayFromControler();
-  void updateSections();
+    void displayFromControler();
+  //  void updateSections();
     
  private :
  
-  bool updateSectionSelection();
-  void addSectionToExecute();
-  void deleteSectionToExecute(int section);
-  string getSelection();
-  void fillComboWithElements(Wt::WComboBox* cBox);
+  //  bool updateSectionSelection();
+    void addComputingBlock(computingBlock* cpbl);
+    //    void deleteComputingBlock(int section);
+    void deleteComputingBlock(computingBlock* cpbl);
+  //  string getSelection();
+    void fillComboWithElements(Wt::WComboBox* cBox);
 
   /** Fill a ComboBox with the software list
@@ -47 +48 @@
    */
   void fillComboWithSoftwares(Wt::WComboBox* cBox, std::string );
-  Wt::WContainerWidget* createAddDeletePushButtons(int sectionIndex);
+  //  Wt::WContainerWidget* createAddDeletePushButtons(int sectionIndex);
+  Wt::WContainerWidget* createAddDeletePushButtons(computingBlock* cpbl);
 
   dataManager* dtmanage_;
-  WContainerWidget* contenuSections_;
-  GWt_sector* UIsector_;
+   WContainerWidget* contenuSections_;
+  GWt_machine* UImachine_;
 };
 #endif /* defined(__PSPA__GWt_softwarePanel__) */

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

@@ -1 +1 @@
 #include "GWt_accelerator.h"
 #include "GWt_sector.h"
+#include "GWt_machine.h"
 
 #include <Wt/WLabel>
@@ -24 +25 @@
 dataManager_(dt)
 {
+  cout << " GWt_accelerator::GWt_accelerator CONSTRUCTION NOUVEL ACCELERATOR " << endl;
   setObjectName("accelerator");
   addStyleClass("acceleratorPanel");
@@ -58 +60 @@
   addSectorParameters->setMinimumSize(32,32);
   
+
+  // expand machine 
+  WPushButton* expandMachine = new WPushButton("init/expand machine",menu);
+  // set tooltips
+  expandMachine->setToolTip("expand the machine");
+  // Set class for actions elements
+  expandMachine->setStyleClass("Button WhiteButton expand");
+  expandMachine->setMaximumSize(128,32);
+  expandMachine->setMinimumSize(128,32);
+
+  // action
+  expandMachine->clicked().connect(this,&GWt_accelerator::expandMachine);
+
+
+
+
   // Run
   WPushButton* runParameters = new WPushButton("",menu);
@@ -84 +102 @@
 
   WContainerWidget* acceleratorGlobalView = new WGroupBox("Global view",acceleratorScrollArea);
-  acceleratorDetailledView_ = new WGroupBox("Detailled view",acceleratorScrollArea);
-
+  acceleratorDetailledView_ = new WGroupBox("Detailled view of sector",acceleratorScrollArea);
+  acceleratorComputingView_ = new WGroupBox("Computing view",acceleratorScrollArea);
   acceleratorGlobalViewLayout_= new WHBoxLayout();
   acceleratorGlobalView->setLayout(acceleratorGlobalViewLayout_);
@@ -121 +139 @@
   if (sect.size() == 0) {
     // Add the first sector
-    addSector();
+       addSector();
   } else {
     for (unsigned long a=0; a< sect.size(); a++) {
@@ -127 +145 @@
     }
   }
-}
-
+  //  cout << " INTERVENTION GWt_accelerator::readConfiguration  " << endl;
+  //  if ( dataManager_->getCurrentMachine() )   cout << " GWt_accelerator::readConfiguration nb elem. " <<  dataManager_->getCurrentMachine()->getNumberOfElements() <<   endl;
+    
+    new GWt_machine(this, dataManager_->getCurrentMachine());
+}
+
+void GWt_accelerator::expandMachine() {
+  cout << " coucou depuis GWt_accelerator::expandMachine() " << endl;
+  if (getDataManager()->expandMachine()) new GWt_machine(this, dataManager_->getCurrentMachine());
+}
 
 void GWt_accelerator::run()
 {
   cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::executer() " << endl<<endl;
+  cout << " GWt_accelerator::executer() " << endl<<endl;
   
   if (!areDataCoherent()) {
@@ -156 +182 @@
 }
 
+
+// recuperer les noms d'elements pour remplir les combos des menus de graphique
 void GWt_accelerator::faireDessin()
 {
@@ -161 +189 @@
   choixHistoDessin_->clear();
   
-  for (unsigned k = 0; k < getDataManager()->getSectors().size(); k++) {
-    sector* sector = getDataManager()->getSectors()[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      for (unsigned m = 0; m < section->getElements().size(); m++) {
-        
-        abstractElement* elPtr = section->getElements()[m];
-        //    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-        
+  if ( getDataManager()->getCurrentMachine() ) {
+    for (unsigned k = 0; k < getDataManager()->getCurrentMachine()->getComputingBlocks().size(); k++) {
+      computingBlock* cpblk = getDataManager()->getCurrentMachine()->getComputingBlocks().at(k);
+      for (unsigned l = 0; l < cpblk->getNumberOfElements(); l++) {
+        abstractElement* elPtr = cpblk->getElement(k);
         choixElementDessin_->addItem(elPtr->getLabel());
         choixHistoDessin_->addItem(elPtr->getLabel());
@@ -175 +199 @@
     }
   }
+  // for (unsigned k = 0; k < getDataManager()->getSectors().size(); k++) {
+  //   sector* sector = getDataManager()->getSectors()[k];
+  //   for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+  //     sectionToExecute* section = sector->getSectionsToExecute()[l];
+  //     for (unsigned m = 0; m < section->getElements().size(); m++) {
+        
+  //       abstractElement* elPtr = section->getElements()[m];
+  //       //    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+        
+  //       choixElementDessin_->addItem(elPtr->getLabel());
+  //       choixHistoDessin_->addItem(elPtr->getLabel());
+  //     }
+  //   }
+  // }
+
 }
 
@@ -675 +714 @@
   // FIXME
   cout << "***********************************" << endl;
-  cout << "**  To be move in controler  **" << endl;
+  cout << "**  GWt_accelerator::areDataCoherent()   **" << endl;
   cout << "***********************************" << endl;
-  return true;
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::areDataCoherent() " << endl<<endl;
-#endif
-  
-  bool caMarche = true;
+  if ( !dataManager_ ) return false;
+  return dataManager_->areDataCoherent();
+    //  return true;
+  
+  //  bool caMarche = true;
   /*
    // initialize dataManager
@@ -737 +774 @@
    }//a
    */
-  return caMarche;
-}
-
+  //  return caMarche;
+}
+

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc

@@ -66 +66 @@
   
   buildBeamLineWidget();
-  getUISector()->getExecuteWidget()->displayFromControler();
+
+ 
+  //  getUISector()->getExecuteWidget()->displayFromControler();
 
   return UIabstractElement;
@@ -112 +114 @@
   
   // FIXME
-  UI_sector_->getExecuteWidget()->updateSections();
+  //  UI_sector_->getExecuteWidget()->updateSections();
 }
 
@@ -125 +127 @@
 
   GWt_elementLigneFaisceau* elemLigneFaisceau = NULL;
-  for (unsigned int i =0; i< UI_sector_->getSectorControler()->getSectionsToExecute().size(); i++) {
-    std::vector <abstractElement*> abstractElem = UI_sector_->getSectorControler()->getSectionsToExecute()[i]->getElements();
+  //  for (unsigned int i =0; i< UI_sector_->getSectorControler()->getSectionsToExecute().size(); i++) {
+  //    std::vector <abstractElement*> abstractElem = UI_sector_->getSectorControler()->getSectionsToExecute()[i]->getElements();
+  std::vector <abstractElement*> abstractElem = UI_sector_->getSectorControler()->getElements();
     for (unsigned int j=0; j< abstractElem.size(); j++) {
 
-      elemLigneFaisceau = new GWt_elementLigneFaisceau(dataManager_,
+           // elemLigneFaisceau = new GWt_elementLigneFaisceau(dataManager_,
+           //                                             this,
+           //                                             abstractElem[j],UI_sector_->getSectorControler()->getSectionsToExecute()[i]->getSoftware()->getColor());
+
+
+           elemLigneFaisceau = new GWt_elementLigneFaisceau(dataManager_,
                                                        this,
-                                                       abstractElem[j],UI_sector_->getSectorControler()->getSectionsToExecute()[i]->getSoftware()->getColor());
+                                                       abstractElem[j],"#FFFFFF");
+
+
       
       // remove default text
@@ -150 +160 @@
       
     }
-  }
+    //  }
+
   // remove last line
   if (elemLigneFaisceau != NULL) {
@@ -171 +182 @@
   
   buildBeamLineWidget();
-  getUISector()->getExecuteWidget()->displayFromControler();
+  //  getUISector()->getExecuteWidget()->displayFromControler();
 /*
   // remove Widget

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_sector.cc

@@ -116 +116 @@
   
   // add the software panel
-  executeWidget_ = new GWt_softwarePanel(getAccelerator()->getDataManager(),this);
-  vContainerLayout->addWidget(executeWidget_);
+  //    executeWidget_ = new GWt_softwarePanel(getAccelerator()->getDataManager(),this);
+  //   vContainerLayout->addWidget(executeWidget_);
   
 

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

@@ -2 +2 @@
 //  PSPA
 //
-//  Created by Garnier Laurent on 30/01/13.
-//  Copyright (c) 2013 Garnier Laurent. All rights reserved.
+//  Created by Garnier Laurent on 30/01/13.//  Copyright (c) 2013 Garnier Laurent. All rights reserved.
 //
 
@@ -17 +16 @@
 #include "GWt_dialog.h"
 #include "GWt_console.h"
-#include "GWt_sector.h"
+#include "GWt_computingBlock.h"
 #include "GWt_globalParameters.h"
 #include "GWt_sectionToExecute.h"
 #include "GWt_pspaApplication.h"
-
-#define BAVARD 0
-
-GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,GWt_sector* sect)
+#include "GWt_machine.h"
+#define BAVARD 1
+
+GWt_softwarePanelBis::GWt_softwarePanelBis(dataManager* dataManager,GWt_machine* mach)
   : WContainerWidget(),
 dtmanage_(dataManager),
-UIsector_(sect)
+UImachine_(mach)
 {
   
   // le panel
   WPanel *panelLogiciels = new WPanel(this);
-  panelLogiciels->setTitle(" sections of beam line for executing softwares ");
+  panelLogiciels->setTitle(" Computing blocks ");
   
   contenuSections_ = new WContainerWidget();
   contenuSections_->addWidget(new WBreak());
   contenuSections_->addWidget(new WBreak());
-  displayFromControler();
+  cout << " GWt_softwarePanelBis::GWt_softwarePanelBis DISPLAY SOFTWARE PANEL " << endl;
+      displayFromControler();
   
   panelLogiciels->setCentralWidget(contenuSections_);
 }
 
-GWt_softwarePanel::~GWt_softwarePanel() {
-}
-
-void GWt_softwarePanel::displayFromControler()
+GWt_softwarePanelBis::~GWt_softwarePanelBis() {
+}
+
+void GWt_softwarePanelBis::displayFromControler()
 {      
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::addSectionToExecuteW() " << endl<<endl;
-#endif
+  cout << " GWt_softwarePanelBis::displayFromControler() " << endl<<endl;
 
   // Clear all
   contenuSections_->clear();
-  
-  // Get all sectionsToExecute from this sector
-  if (!UIsector_->getSectorControler()) {
+
+
+  // Get all sectionsToExecute from this machine
+  if (!UImachine_->getMachineControler()) {
+    cout << " GWt_softwarePanelBis::displayFromControler() PAS DE MACHINE " << endl;
     return;
-  }
-  
-  if (UIsector_->getSectorControler()->getSectionsToExecute().size() == 0) {
+  } else {
+    cout << " GWt_softwarePanelBis::displayFromControler() MACHINE TROUVEE " << endl;
+  }
+  
+  if (UImachine_->getMachineControler()->getComputingBlocks().size() == 0) {
     // FIXME : Add a message to tell the user to add first an element
+    cout << " GWt_softwarePanelBis::displayFromControler() PAS DE BLOCK " << endl;
   } else {
-
-    unsigned int firstSectionToExecuteIndex = 0;
-    for (unsigned int a=0; a<UIsector_->getSectorControler()->getSectionsToExecute().size(); a++) {
+    cout << " GWt_softwarePanelBis::displayFromControler() NOMBRE DE BLOCK " << UImachine_->getMachineControler()->getComputingBlocks().size() << endl;
+
+    unsigned int firstElemeOfComputingBlockIndex = 0;
+
+    for (unsigned int a=0; a<UImachine_->getMachineControler()->getComputingBlocks().size(); a++) {
+      cout << " GWt_softwarePanelBis::displayFromControler() BLOC No " << a+1 << endl;
       abstractElement* premierElement = NULL;
       abstractElement* dernierElement = NULL;
-      
       std::string premierElementLabel = "";
       std::string dernierElementLabel = "";
-      if (premierElement) {
-        premierElementLabel = premierElement->getLabel();
+
+      if ( !UImachine_->getMachineControler()->getComputingBlocks()[a]->isEmpty() ) {
+        premierElement = UImachine_->getMachineControler()->getComputingBlocks()[a]->getFirstElement();
+        firstElemeOfComputingBlockIndex = UImachine_->getMachineControler()->getComputingBlocks()[a]->getRankOfFirstElement();
+        dernierElement = UImachine_->getMachineControler()->getComputingBlocks()[a]->getLastElement();
       }
-      if (dernierElement) {
-        dernierElementLabel = dernierElement->getLabel();
-      }
+
+
+      if (premierElement) premierElementLabel = premierElement->getLabel();
+      if (dernierElement) dernierElementLabel = dernierElement->getLabel();
+      cout << " GWt_softwarePanelBis::displayFromControler() dernier element a afficher " << dernierElementLabel << endl;
       
       WComboBox* lineFromCombo = new WComboBox();
@@ -84 +93 @@
       
       // set to first
-      lineFromCombo->setCurrentIndex(firstSectionToExecuteIndex);
+      lineFromCombo->setCurrentIndex(firstElemeOfComputingBlockIndex);
       // set to last
-      lineToCombo->setCurrentIndex(firstSectionToExecuteIndex + (unsigned int)UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements().size() - 1);
-      
+      lineToCombo->setCurrentIndex(UImachine_->getMachineControler()->getComputingBlocks()[a]->getRankOfLastElement());
       WComboBox* softCombo = new WComboBox();
       
-      fillComboWithSoftwares(softCombo,UIsector_->getSectorControler()->getSectionsToExecute()[a]->getSoftware()->getName());
+      fillComboWithSoftwares(softCombo,UImachine_->getMachineControler()->getComputingBlocks()[a]->getSoftware()->getName());
 
       // disable the "to" comboBox
@@ -96 +104 @@
 
       // disable the first "from" comboBox
-      if (a==0) {
-        lineFromCombo->disable();
+      // if (a==0) {
+      //   lineFromCombo->disable();
+      // }
+
+      // enable the last "to" comboBox
+      if (a==UImachine_->getMachineControler()->getComputingBlocks().size()-1) {
+                lineToCombo->enable();
       }
-      // disable the last "to" comboBox
-      if (a==UIsector_->getSectorControler()->getSectionsToExecute().size()-1) {
-        lineToCombo->disable();
-      }
-      
-      // Add the sectionToExecute Widget
-      GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(a),UIsector_->getSectorControler()->getSectionsToExecute()[a],UIsector_);
-      
-      /*      // FIXME ?
-       stringstream st;
-       st << UIsectionsToExecute_deprecated_.size();
-       
-       // this is the mean to identify this section!
-       newSection->setObjectName(st.str());
-       
-       // push back on sections vector
-       UIsectionsToExecute_deprecated_.push_back(newSection);
-       */
-      contenuSections_->addWidget(newSection);
-      //      updateSections();
-      
-      firstSectionToExecuteIndex += UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements().size();
+      
+      // // Add computingBlock Widget
+      
+      //      GWt_computingBlock* newBlock = new GWt_computingBlock(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(a),UImachine_->getMachineControler()->getComputingBlocks()[a],UImachine_);
+      computingBlock* blocPtr = UImachine_->getMachineControler()->getComputingBlocks()[a];
+      GWt_computingBlock* newBlock = new GWt_computingBlock(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(blocPtr),blocPtr,UImachine_);
+
+      cout << " GWt_softwarePanelBis::displayFromControler j'ajoute un bloc : " << newBlock << endl;
+      cout << " GWt_softwarePanelBis::displayFromControler nb widget avant : " << contenuSections_->count() << endl;
+      contenuSections_->addWidget(newBlock);
+      cout << " GWt_softwarePanelBis::displayFromControler nb widget apres : " << contenuSections_->count() << endl;
+      
     }
   }
- }
-
-void GWt_softwarePanel::updateSections()
-{
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::updateSections() " << endl<<endl;
-#endif
-
-  /*
-  // update all sections in order to manage new/deleted items
-  for (int a = 0; a < UIsectionsToExecute_deprecated_.size(); a++) {
-    fillComboWithElements(UIsectionsToExecute_deprecated_[a]->getFirstElement());
-    fillComboWithElements(UIsectionsToExecute_deprecated_[a]->getLastElement());
-    UIsectionsToExecute_deprecated_[a]->getFirstElement()->setEnabled (true);
-    UIsectionsToExecute_deprecated_[a]->getLastElement()->setEnabled (true);
-  }
-  
-  if (UIsectionsToExecute_deprecated_;.size() == 0) {
+}
+
+void GWt_softwarePanelBis::fillComboWithElements(Wt::WComboBox* cBox) 
+{
+
+  if (cBox == NULL) return;
+
+  if (!UImachine_->getMachineControler()) {
     return;
   }
-  
-  // the first element will always be the first element of the beamLine
-  UIsectionsToExecute_deprecated_[0]->getFirstElement()->setCurrentIndex(0);
-  UIsectionsToExecute_deprecated_[0]->getFirstElement()->setEnabled (false);
-
-  // the last element will always be the last element of the beamLine
-  UIsectionsToExecute_deprecated_[UIsectionsToExecute_deprecated_.size()-1]->getLastElement()->setCurrentIndex(UIsectionsToExecute_deprecated_[UIsectionsToExecute_deprecated_;.size()-1]->getLastElement()->count());
-  UIsectionsToExecute_deprecated_[UIsectionsToExecute_deprecated_.size()-1]->getLastElement()->setEnabled(false);
-
-  // set default values
-  updateSectionSelection();
-*/
-}
-
-bool GWt_softwarePanel::updateSectionSelection()
-{
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::updateSectionSelection() " << endl<<endl;
-#endif
-
-  if ( dtmanage_->getJobListSize() == 0 ) return false;
-  
-  // traitement de la premiere ligne
-  // on impose le depart du calcul au premier element
-  string premier = "";
-  if (UIsector_->getSectorControler()) {
-    if (UIsector_->getSectorControler()->getSectionsToExecute().size() > 0) {
-      if (UIsector_->getSectorControler()->getSectionsToExecute()[0]->getElements().size() > 0) {
-        premier = UIsector_->getSectorControler()->getSectionsToExecute()[0]->getElements()[0]->getLabel();
-      }
-    }
-  }
-  
-  // FIXME :  A réécrire
-  /*
-  if (UIsectionsToExecute_deprecated_.size() > 0) {
-    UIsectionsToExecute_deprecated_[0]->setFirstElementCurrentSelection(premier);
-  }
-  
-  Wt::WString currentString =  UIsectionsToExecute_deprecated_[0]->getLastElementCurrentText();
-  int current = dtmanage_->getNumeroFromElementLabel(currentString.toUTF8());
-  
-  // si la fin est mal definie on prend toute la config par defaut
-  if ( current <= 0 || current > dtmanage_->getBeamLineSize() )
-    {
-      current = dtmanage_->getBeamLineSize();
-      currentString =  dtmanage_->getLabelFromElementNumero(current);
-      if (UIsectionsToExecute_deprecated_.size() > 0) {
-        UIsectionsToExecute_deprecated_[0]->setLastElementCurrentSelection(currentString);
-        //...
-      }
-    }
-  current++;
-  currentString = dtmanage_->getLabelFromElementNumero(current);
-  
-  // traitement des suivantes (on avance d'un cran dans la liste)
-  for (int a = 1; a< UIsectionsToExecute_deprecated_;.size(); a++)
-    {
-      // debut
-      if ( current > dtmanage_->getBeamLineSize() )
-        {
-          UIsectionsToExecute_deprecated_;[a]->setErrors("This section element could not be after previous session last element");
-          exec_go_->disable();
-          return false;
-        }
-      
-      UIsectionsToExecute_deprecated_;[a]->setFirstElementCurrentSelection(currentString);
-
-      // fin
-      string finString =  UIsectionsToExecute_deprecated_;[a]->getLastElementCurrentText().toUTF8();
-      
-      int numeroFin = dtmanage_->getNumeroFromElementLabel( finString);
-      
-      if ( numeroFin < current)
-      {
-        UIsectionsToExecute_deprecated_;[a]->setErrors("Last section element should be after first section element");
-        exec_go_->disable();
-        return false;
-      }
-
-      if (numeroFin > dtmanage_->getBeamLineSize())
-      {
-        UIsectionsToExecute_deprecated_;[a]->setErrors("Last section element number is greater than the beam line size");
-        exec_go_->disable();
-        return false;
-      }
-      
-      // preparation de la ligne suivante
-      current = numeroFin +1;
-      currentString = dtmanage_->getLabelFromElementNumero(current);
-    }
-  //  exec_go_->setDisabled(false);
-
-  if (!areDataCoherent()) {
-#if BAVARD > 0
-    cout << " GWt_softwarePanel::addSectionToExecuteW() DISABLE" << endl;
-#endif
-    exec_go_->disable();
-  } else {
-#if BAVARD > 0
-    cout << " GWt_softwarePanel::addSectionToExecuteW() ENABLE" << endl;
-#endif
-    exec_go_->enable();
-  }
-*/
-  return true;
-}
-
-
-void GWt_softwarePanel::addSectionToExecute() {
-  // We put the last element of the previous sectionToExecute inside
-  
-  // Get the last element from previous section
-  if (!UIsector_->getSectorControler()) {
-    return;
-  }
-  unsigned long s = UIsector_->getSectorControler()->getSectionsToExecute().size();
-  if (s > 0) {
-    abstractElement* abs = UIsector_->getSectorControler()->getSectionsToExecute()[s-1]->getLastElement();
-    UIsector_->getSectorControler()->addSectionToExecute(new sectionToExecute(abs,NULL,dtmanage_,UIsector_->getSectorControler()));
-    UIsector_->getSectorControler()->getSectionsToExecute()[s-1]->removeLastElement();
-  }
-
- 
-  displayFromControler();
-  UIsector_->getBeamLineWidget()->buildBeamLineWidget();
-}
-
-
-void GWt_softwarePanel::deleteSectionToExecute(int sectionLabel)
-{
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::deleteSectionToExecuteW()" << endl<<endl;
-#endif
-
-  stringstream st;
-  st << sectionLabel;
-  std::string sectionName = st.str();
-  //FIXME
-  
-/*  if ( dtmanage_->getJobListSize() == 0 ) return;
-  for (unsigned int sectionIndex = 0; sectionIndex< UIsectionsToExecute_deprecated_.size(); sectionIndex++) {
-    if (UIsectionsToExecute_deprecated_[sectionIndex]->objectName() == sectionName) {
-
-      // delete from dataManager
-      UIsector_->getSectorControler()->clearSectionToExecute(sectionIndex);
-
-      // delete from User Interface
-      contenuSections_->removeWidget(UIsectionsToExecute_deprecated_[sectionIndex]);
-      delete UIsectionsToExecute_deprecated_[sectionIndex];
-      UIsectionsToExecute_deprecated_.erase (UIsectionsToExecute_deprecated_.begin()+sectionIndex);
-    }
-  }  
-*/
-  displayFromControler();
-}
-
-
-void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) 
-{
-
-  if (cBox == NULL) return;
-
-  if (!UIsector_->getSectorControler()) {
-    return;
-  }
-  for (unsigned int a=0; a < UIsector_->getSectorControler()->getSectionsToExecute().size(); a++) {
-    for(unsigned int b=0; b < UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements().size(); b++) {
-      
-      abstractElement* abs = UIsector_->getSectorControler()->getSectionsToExecute()[a]->getElements()[b];
+    for(unsigned int b=0; b < UImachine_->getMachineControler()->getElements().size(); b++) {
+      
+      abstractElement* abs = UImachine_->getMachineControler()->getElements()[b];
       if (abs != NULL) {
         cBox->addItem(abs->getLabel());
       }
     }
-  }
-}
-
-void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox, std::string selected)
+}
+
+void GWt_softwarePanelBis::fillComboWithSoftwares(Wt::WComboBox* cBox, std::string selected)
 {
 #if BAVARD > 0
@@ -344 +166 @@
 }
 
-Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons(int sectionNumber) 
+
+Wt::WContainerWidget* GWt_softwarePanelBis::createAddDeletePushButtons(computingBlock* cpbl) 
 {
   WContainerWidget* buttonContainer= new WContainerWidget();
@@ -352 +175 @@
   // preparation du bouton add
   WPushButton* exec_add = new WPushButton("+");
-  exec_add->clicked().connect(this, &GWt_softwarePanel::addSectionToExecute);
+  //  exec_add->clicked().connect(this, &GWt_softwarePanelBis::addComputingBlock);
+  exec_add->clicked().connect(boost::bind(&GWt_softwarePanelBis::addComputingBlock, this, cpbl));
   exec_add->setStyleClass("roundButton");
   exec_add->setMaximumSize(20,20);
@@ -361 +185 @@
   //  warningsContainer_->setStyleClass("warningsContainer");
 
-  exec_delete->clicked().connect(boost::bind(&GWt_softwarePanel::deleteSectionToExecute, this, sectionNumber));
+  exec_delete->clicked().connect(boost::bind(&GWt_softwarePanelBis::deleteComputingBlock, this, cpbl));
   exec_delete->setStyleClass("roundButton");
   exec_delete->setMaximumSize(20,20);
@@ -372 +196 @@
   return buttonContainer;
 }
+
+void GWt_softwarePanelBis::addComputingBlock(computingBlock* cpbl) {
+  // We put the last element of the previous sectionToExecute inside
+  
+  if (!UImachine_->getMachineControler()) {
+    return;
+  }
+  //  UImachine_->getMachineControler()->openNewLastBlock();
+    UImachine_->getMachineControler()->openNewBlockAfter(cpbl);
+  displayFromControler();
+}
+
+
+// void GWt_softwarePanelBis::deleteComputingBlock(int sectionLabel)
+// {
+//   cout << " GWt_softwarePanelBis::deleteComputingBlock()" << endl;
+
+//   stringstream st;
+//   st << sectionLabel;
+//   std::string sectionName = st.str();
+//   //FIXME
+//   vector<computingBlock*>& compBloc = UImachine_->getMachineControler()->getComputingBlocks();
+//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nb blocs = " << compBloc.size() << endl;
+//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nb widgets = " << sectionName << endl;
+//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nom bloc a detruire = " << contenuSections_->count() << endl;
+
+//   for ( unsigned k=0; k <  compBloc.size(); k++) {
+
+//   }
+// /*  if ( dtmanage_->getJobListSize() == 0 ) return;
+//   for (unsigned int sectionIndex = 0; sectionIndex< UIsectionsToExecute_deprecated_.size(); sectionIndex++) {
+//     if (UIsectionsToExecute_deprecated_[sectionIndex]->objectName() == sectionName) {
+
+//       // delete from dataManager
+//       UIsector_->getSectorControler()->clearSectionToExecute(sectionIndex);
+
+//       // delete from User Interface
+//       contenuSections_->removeWidget(UIsectionsToExecute_deprecated_[sectionIndex]);
+//       delete UIsectionsToExecute_deprecated_[sectionIndex];
+//       UIsectionsToExecute_deprecated_.erase (UIsectionsToExecute_deprecated_.begin()+sectionIndex);
+//     }
+//   }  
+// */
+//   displayFromControler();
+// }
+
+void GWt_softwarePanelBis::deleteComputingBlock(computingBlock* cpbl)
+{
+  cout << " GWt_softwarePanelBis::deleteComputingBlock(computingBlock*)" << endl;
+
+  UImachine_->getMachineControler()->eraseComputingBlock(cpbl);
+  displayFromControler();
+}

Interface_Web/trunk/pspaWT/workingArea/philFit.aml

@@ -7 +7 @@
     <nsc value = "0" />
   </global>
-  <sector name = "a_sect">
+  <sector name = "sector 1">
     <element name = "rfgun01">
       <description type = "rfgun" />
@@ -55 +55 @@
       <length design = "3" />
       <aperture at = "EXIT" shape = "CIRCLE">
-        <xy_limit design = "1e+61" />
+        <xy_limit design = "1e+06" />
       </aperture>
       <solenoid>
         <ksol design = "1.0199" />
-        <vary is_on = "false" />
+        <vary is_on = "true" />
       </solenoid>
     </element>
@@ -82 +82 @@
       </bend>
     </element>
+  </sector>
+  <sector name = "sector 2">
     <element name = "drift03">
       <description type = "drift" />
@@ -94 +96 @@
     </element>
   </sector>
+  <machine name = "dummy">
+    <machineElements>
+      <melement name = "rfgun01" />
+      <melement name = "cell01" />
+      <melement name = "drift01" />
+      <melement name = "solnd01" />
+      <melement name = "drift02" />
+      <melement name = "bend01" />
+      <melement name = "drift03" />
+      <melement name = "fit01" />
+    </machineElements>
+    <mcomputingBlocks>
+      <computingBlock>
+        <software name = "parmela" />
+        <blocExtension rankOfFirstElement = "0" numberOfelements = "3" />
+      </computingBlock>
+      <computingBlock>
+        <software name = "transport" />
+        <blocExtension rankOfFirstElement = "3" numberOfelements = "5" />
+      </computingBlock>
+    </mcomputingBlocks>
+  </machine>
 </laboratory>