Changeset 431 in PSPA

Timestamp:

Nov 15, 2013, 3:30:50 PM (11 years ago)

Author:

touze

Message:

systeme periodique (mailles) + multipoles + madx

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/abstractElement.h (modified) (4 diffs)
• controler/include/abstractSoftware.h (modified) (3 diffs)
• controler/include/dataManager.h (modified) (7 diffs)
• controler/include/elementMultipole.h (added)
• controler/include/nomDeLogiciel.h (modified) (3 diffs)
• controler/include/nomdElements.h (modified) (1 diff)
• controler/include/sectionToExecute.h (modified) (1 diff)
• controler/include/sectorParameters.h (added)
• controler/include/softwareGenerator.h (modified) (1 diff)
• controler/include/softwareMadx.h (added)
• controler/include/softwareUnknown.h (added)
• controler/src/abstractElement.cc (modified) (5 diffs)
• controler/src/abstractSoftware.cc (modified) (6 diffs)
• controler/src/dataManager.cc (modified) (11 diffs)
• controler/src/elementDrift.cc (modified) (1 diff)
• controler/src/elementMultipole.cc (added)
• controler/src/nomDeLogiciel.cc (modified) (2 diffs)
• controler/src/nomdElements.cc (modified) (5 diffs)
• controler/src/sectorParameters.cc (added)
• controler/src/softwareMadx.cc (added)
• controler/src/softwareUnknown.cc (added)
• userInterface/include/GWt_abstractElement.h (modified) (4 diffs)
• userInterface/include/GWt_abstractElementFactory.h (modified) (4 diffs)
• userInterface/include/GWt_globalParameters.h (modified) (1 diff)
• userInterface/include/GWt_mpole.h (added)
• userInterface/include/GWt_pspaApplication.h (modified) (6 diffs)
• userInterface/include/GWt_sectorParameters.h (added)
• userInterface/include/GWt_softwarePanel.h (modified) (1 diff)
• userInterface/src/GWt_abstractElement.cc (modified) (3 diffs)
• userInterface/src/GWt_abstractElementFactory.cc (modified) (4 diffs)
• userInterface/src/GWt_elementLigneFaisceau.cc (modified) (3 diffs)
• userInterface/src/GWt_globalParameters.cc (modified) (2 diffs)
• userInterface/src/GWt_ligneFaisceau.cc (modified) (2 diffs)
• userInterface/src/GWt_mpole.cc (added)
• userInterface/src/GWt_pspaApplication.cc (modified) (17 diffs)
• userInterface/src/GWt_sectionToExecute.cc (modified) (1 diff)
• userInterface/src/GWt_sectorParameters.cc (added)
• userInterface/src/GWt_softwarePanel.cc (modified) (17 diffs)

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

@@ -7 +7 @@
 
 #include "nomdElements.h"
-//#include "nomDeLogiciel.h"
-//#include "trivaluedBool.h"
 #include "abstractSoftware.h"
-/* #include "softwareGenerator.h" */
-/* #include "softwareParmela.h" */
-/* #include "softwareTest.h" */
-/* #include "softwareTransport.h" */
 
 #include "UAP/UAPNode.hpp"
-
 using namespace std;
 
@@ -26 +19 @@
   int nbParam_;
   string* parametersString_;
-  double phaseStepMax_;
+  
+  string defaultSpecificName_;
+  string specificName_;
+  nomdElements elementName_;
     
   double defaultLength_;
   double defaultAperture_;
-  string defaultSpecificName_;
-  
-  string specificName_;
-  nomdElements elementName_;
+  double phaseStepMax_;
   
   double lenghtElem_; // cm
   double aperture_; // cm
-  
   double stepmaxcm_;
-  //  bool curvedTrajectory_;
   
   void setDefaultValues();
@@ -51 +42 @@
   
   void setParameters(double ll,double aper);
+  
+  nomdElements getNomdElement() const;
+  int getNbParams() const;
+
   void setLabel(string lab);
   string getLabel() const;
-  nomdElements getNomdElement() const;
-  
+
   double getLenghtOfElement() const;
-  int getNbParams() const;
   
   virtual void setPhaseStep(double);
@@ -67 +60 @@
   virtual void FileInput(ifstream& ifs) = 0;
   virtual string print() = 0;
-  
   virtual void InputRep(UAPNode* root) = 0;
 

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

@@ -3 +3 @@
 
 #include "globalParameters.h"
+#include "sectorParameters.h"
 #include "particleBeam.h"
 #include "nomDeLogiciel.h"
@@ -19 +20 @@
 
  protected :
-
+  
   unsigned numeroDeb_, numeroFin_;
   globalParameters* globParamPtr_;
+  sectorParameters* sectParamPtr_; //xx
   dataManager* dataManager_;
   string inputFileName_;
   nomDeLogiciel nameOfSoftware_;
 
-    /**
+  /**
      Accepted elements list for this software
-     */
+  */
   std::vector <nomdElements::typedElement> acceptedElements_;
 
-    /**
+  /**
      Ignore software list for this element
-     */
+  */
   std::vector <nomdElements::typedElement> ignoredElements_;
-
+  
   abstractSoftware();
 
@@ -42 +44 @@
   bool ComputationLimitsOk() const;
 
-
   void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
 
  public :
 
-  abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt);
+  abstractSoftware(string,globalParameters*,dataManager*);
+  abstractSoftware(string,sectorParameters*,dataManager*);
   ~abstractSoftware() {;}
 
   inline const nomDeLogiciel* getNomDeLogiciel() const {
     return &nameOfSoftware_;
-}
+  }
 
   trivaluedBool doAcceptElement(nomdElements::typedElement typdel);
 
+  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
+  virtual bool execute(string workingDir) = 0;
+  virtual bool buildBeamAfterElements(string workingDir) = 0;
 
-  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
-
-
-  virtual bool  execute(string workingDir) = 0;
-
- virtual bool buildBeamAfterElements(string workingDir) = 0;
-
-    /** Color of the background of this sofware
-     Should be a valid Css name as FFEEDD
-     */
-    virtual string getColor() = 0;
-
-    /** Name of this software
-     */
-    inline string getName() const {
-      return nameOfSoftware_.getString();
-    }
-
+  /** Color of the background of this sofware
+      Should be a valid Css name as FFEEDD
+  */
+  virtual string getColor() = 0;
+  
+  /** Name of this software
+   */
+  inline string getName() const {
+    return nameOfSoftware_.getString();
+  }
 };
 #endif

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

@@ -14 +14 @@
 #include "nomDeLogiciel.h"
 
+#include "sectorParameters.h" //xx
+
 class PspaApplication;
 
@@ -21 +23 @@
  public:
   
+  dataManager() {;}
   dataManager(PspaApplication*);
   virtual ~dataManager();
@@ -27 +30 @@
   inline globalParameters* getGlobalParameters()  {return &globParam_;}
   inline particleBeam* getCurrentBeam() {return currentBeam_;}
+
+  // xx
+  inline sectorParameters* getSectorParameters() {return &sectorParam_;}
     
   particleBeam* getDiagnosticBeam(unsigned index);
@@ -50 +56 @@
   
   void initializeExecution();
-//  trivaluedBool checkExecute(string& diagnostic);
-//  trivaluedBool checkElementsForExec(nomDeLogiciel logiciel, unsigned indexDeb, unsigned indexFin, string& diagnostic);
+
   bool executeAll();
  
@@ -81 +86 @@
     return &diagnosticBeam_.back();
   }
-  
-  /** return a specific jobList index
-      return NULL if the index does not exist
-  */
-  
-  /* inline sectionToExecute* getJobListAt(int a) { */
-    /*     if (a < 0) return NULL; */
-    /*     if (a >= getJobListSize()) return NULL; */
-    /*     return jobList_[a]; */
-    /* } */
-
-  
-  
-    /* inline const abstractSoftware* getSoftwareOfSection( int index) const { */
-    /*     if (index < 0) return NULL; */
-    /*     if (index >= getJobListSize()) return NULL; */
-    /*  return jobList_[index]->getSoftware(); */
-    /* } */
     
-    /** Clear a specific jobList */
+  /** Clear a specific jobList */
   void clearSectionToExecute(int a);
     
@@ -106 +93 @@
 
   globalParameters globParam_;
+  sectorParameters sectorParam_; //xx
   particleBeam* currentBeam_;
   PspaApplication* pspa_;
@@ -113 +101 @@
   vector<particleBeam> diagnosticBeam_;
   vector<unsigned> indexElementToIndexDiag_;
-  // numeroElementToIndexDiag_[k] contient, pour l'element d'index k, l'indice ind tel que diagnosticBeam_[ind]
-  // soit le faisceau resultat, en l'etat qu'il doit avoir apres l'element k
-  
   vector<sectionToExecute*> jobList_;
   

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

@@ -6 +6 @@
 using namespace std;
 
-
-
 class nomDeLogiciel
 {
 
- public: 
-
-
+ public : 
+  
   enum Logiciel
   {
-    parmela, transport, generator, useraction, test, unknownSoftware
+    parmela, transport, generator, useraction, test, madx, unknownSoftware
   };
-
+  
     
- private:
+ private :
 
   Logiciel program_;
   std::string progString_;
-  //  int value_;
-  
+   
   static Logiciel fromString( std::string s);
   static std::string toString( Logiciel lg);  
@@ -31 +27 @@
   
  public : 
-  // constructors
-  
+ 
   nomDeLogiciel();  
   nomDeLogiciel(const string& s);  
@@ -39 +34 @@
   
   inline std::string getString() const {return progString_;}
+  inline nomDeLogiciel::Logiciel getLogiciel() const {return program_;}
 
-  inline nomDeLogiciel::Logiciel getLogiciel() const { return program_; }
-
-    /** Color of the background of the sofware
-     Should be a valid Css name as FFEEDD
-     */
+  /** Color of the background of the sofware
+      Should be a valid Css name as FFEEDD
+  */
   inline std::string  getColor() const {return getWtColor(program_);}
   // operators
-  
   nomDeLogiciel& operator= (const nomDeLogiciel& nl);  
   bool operator== (const nomDeLogiciel& nl);  
   bool operator!= (const nomDeLogiciel& nl);
-  
 };
-
-
-
-
 #endif

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

@@ -13 +13 @@
  public :
 
-enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, snapshot, inconnu};
+  enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, snapshot, mpole, inconnu};
 
  private : 

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

@@ -8 +8 @@
 class sectionToExecute
 {
-    public :
-    sectionToExecute(abstractElement*, abstractElement*, abstractSoftware*);
+ public :
 
-    /** Deprecated : To be removed ! */
-    sectionToExecute(abstractElement*, int, abstractElement*, int, abstractSoftware*);
+  sectionToExecute(abstractElement*,abstractElement*,abstractSoftware*);
+  
+  /** Deprecated : To be removed ! */
+  sectionToExecute(abstractElement*, int, abstractElement*, int, abstractSoftware*);
 
-    ~sectionToExecute() {;}
+  ~sectionToExecute() {;}
 
-    inline abstractElement* getFirstElement() {
-        return firstElement;
-    }
+  inline abstractElement* getFirstElement() {
+    return firstElement;
+  }
     
-    inline abstractElement* getLastElement() {
-        return lastElement;
-    }
+  inline abstractElement* getLastElement() {
+    return lastElement;
+  }
     
-    /** Deprecated : To be removed ! */
-    inline int getElementNumberInSection() const {
-        return firstElementNumberInBeamLine;
-    }
+  /** Deprecated : To be removed ! */
+  inline int getElementNumberInSection() const {
+    return firstElementNumberInBeamLine;
+  }
     
-    /** Deprecated : To be removed ! */
-    inline int getLastElementNumberInSection()  const {
-        return lastElementNumberInBeamLine;
-    }
-    inline abstractSoftware* getSoftware() const {
-        return software;
-    }
-    
-    private :
-    abstractElement*  firstElement;
-    abstractElement*  lastElement;
+  /** Deprecated : To be removed ! */
+  inline int getLastElementNumberInSection()  const {
+    return lastElementNumberInBeamLine;
+  }
 
-    int firstElementNumberInBeamLine;
-    int lastElementNumberInBeamLine;
-    
-    abstractSoftware* software;
+  inline abstractSoftware* getSoftware() const {
+    return software;
+  }
+  
+ private :
+
+  abstractElement*  firstElement;
+  abstractElement*  lastElement;
+  abstractSoftware* software;
+
+  int firstElementNumberInBeamLine;
+  int lastElementNumberInBeamLine;  
 };
-
 #endif

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

@@ -7 +7 @@
 class softwareGenerator : public abstractSoftware
 {
+ protected : 
+  
+  bool beamFromGenerator(string beamFileName, string workingDir, vector<double>& centroid, bareParticle& refPart,vector<bareParticle>& particles, vector<bareParticle>& passiveParticles );
 
- protected : 
-
-
-
- bool beamFromGenerator(string beamFileName, string workingDir, vector<double>& centroid, bareParticle& refPart,vector<bareParticle>& particles, vector<bareParticle>& passiveParticles );
-
-
- string elementsData(const vector< pair<string, vector<string> > >& donnees) const;
- string rfgunData(const vector< pair<string, vector<string> > >& donnees) const;
-
+  string elementsData(const vector< pair<string, vector<string> > >& donnees) const;
+ 
+  string rfgunData(const vector< pair<string, vector<string> > >& donnees) const;
 
  public : 
-
-
-    softwareGenerator();
-    
-    softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt);
+  
+  softwareGenerator();  
+  softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt);
 
   virtual ~softwareGenerator() {;}
 
-
   virtual bool createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir);
-
-
-  virtual bool  execute(string workingDir);
-
-
+  virtual bool execute(string workingDir);
   virtual bool buildBeamAfterElements(string workingDir);
 
-    inline string getColor() {
-        return "#a3c0ed";
-    }
-
-    /* inline string getName() const { */
-    /*     return "generator"; */
-    /* } */
+  inline string getColor() {
+    return "#a3c0ed";
+  }
 };
-
 #endif

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

@@ -5 +5 @@
 #include "abstractElement.h"
 
-abstractElement::abstractElement() 
-//: nameOfSoftware_(NULL)
-  : abstractSoftware_(NULL)
+abstractElement::abstractElement() : abstractSoftware_(NULL)
 {
   setDefaultValues();
@@ -14 +12 @@
 }
 
-abstractElement::abstractElement(string lab)
-  //: nameOfSoftware_(NULL)
-  : abstractSoftware_(NULL)
+abstractElement::abstractElement(string lab) : abstractSoftware_(NULL)
 {
   specificName_ = lab;
@@ -27 +23 @@
 {
   if (parametersString_ != NULL) delete [] parametersString_ ;
-  //  if ( nameOfSoftware_ != NULL ) delete nameOfSoftware_;
 }
 
@@ -62 +57 @@
 }
 
-string abstractElement::getLabel() const
-{
+string abstractElement::getLabel() const {
   return specificName_;
 }
 
-
-nomdElements abstractElement::getNomdElement() const 
-{
+nomdElements abstractElement::getNomdElement() const {
   return elementName_;
 }
-
-
 
 double abstractElement::getLenghtOfElement() const { 
@@ -83 +73 @@
 }
 
-
 double abstractElement::getInitialKineticEnergy() const {
   return 0.0;
 }
-
-
-

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

@@ -2 +2 @@
 #include "dataManager.h"
 #include <algorithm>
+
 abstractSoftware::abstractSoftware()
 {
   globParamPtr_ = NULL;
+  sectParamPtr_ = NULL; //xx
   dataManager_ = NULL;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt) {
+abstractSoftware::abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt) 
+{
   inputFileName_ = inputFileName;
   globParamPtr_ = globals;
+  sectParamPtr_ = NULL; //xx
   dataManager_ = dt;
   numeroDeb_ = 0;
@@ -18 +22 @@
 }
 
-bool abstractSoftware::initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin) {
+abstractSoftware::abstractSoftware(string inputFileName,sectorParameters* lattice,dataManager* dt) 
+{
+  inputFileName_ = inputFileName;
+  globParamPtr_ = NULL;
+  sectParamPtr_ = lattice;
+  dataManager_ = dt;
+  numeroDeb_ = 0;
+  numeroFin_ = 0;
+  nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
+}
+
+bool abstractSoftware::initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin) 
+{
   numeroDeb_ = numeroDeb;
   numeroFin_ = numeroFin;
@@ -24 +40 @@
 }
 
-bool abstractSoftware::ComputationLimitsOk() const {
-  if (   numeroDeb_ < 1 ||  numeroFin_ < 1 || numeroDeb_ > dataManager_->getBeamLineSize() || numeroFin_ > dataManager_->getBeamLineSize() ) {
-  dataManager_->consoleMessage(" abstractSoftware::initComputationLimit : numero of element out of limits in software " + getName() );
+bool abstractSoftware::ComputationLimitsOk() const 
+{
+  if (numeroDeb_ < 1 || numeroFin_ < 1 || numeroDeb_ > dataManager_->getBeamLineSize() || numeroFin_ > dataManager_->getBeamLineSize() ) {
+    dataManager_->consoleMessage(" abstractSoftware::initComputationLimit : num of element out of limits in software " + getName() );
     return false;
   } else {
@@ -33 +50 @@
 }
 
-
-void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) {
+void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) 
+{
   if (b == TBoolIgnore) {
     ignoredElements_.push_back(nomdel);
@@ -42 +59 @@
 }
 
-trivaluedBool abstractSoftware::doAcceptElement(nomdElements::typedElement typdel) {
-  if (acceptedElements_.size() == 0) {
+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()) {
+
+  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()) {
+
+  if (std::find(ignoredElements_.begin(),ignoredElements_.end(),typdel) != ignoredElements_.end()) {
     return TBoolIgnore;
   }
+
   return TBoolOk;
 }
-
 
 bool abstractSoftware::launchJob(string commandLine, string& resul)
@@ -66 +89 @@
   ostringstream sortie;
   if (pp == NULL) {
-    sortie << " launching  failed : " << commandLine << endl;
+    sortie << " launching failed : " << commandLine << endl;
     ExecuteStatus = false;
   } else {
-    cout << " executing command :  "  << commandLine << endl;
     // on copie la sortie dans le fichier assigne
     char buf[132];

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

@@ +1 @@
+#include <stdio.h>
+#include <fstream>
+
 #include "dataManager.h"
 #include "mathematicalConstants.h"
 #include "PhysicalConstants.h"
+
+#include "GWt_pspaApplication.h"
+#include "GWt_console.h"
+
 #include "softwareParmela.h"
 #include "softwareTransport.h"
-#include "GWt_pspaApplication.h"
-#include "GWt_console.h"
 #include "softwareGenerator.h"
 #include "softwareTest.h"
+#include "softwareMadx.h" //xx
+#include "softwareUnknown.h" //xx
 
 #include <boost/filesystem.hpp>
-#include <stdio.h>
-#include <fstream>
 
 #include "UAP/UAPUtilities.hpp"
 #include "AML/AMLReader.hpp"
+
+#define BAVARD 0
 
 dataManager::dataManager(PspaApplication* pspa) :
@@ -23 +30 @@
 dataManager::~dataManager()
 {
-    unsigned k;
-    for (k=0; k < jobList_.size();k++) {
-        if ( jobList_[k] != NULL ) delete jobList_[k];
-    }
-    if ( currentBeam_ == NULL ) delete currentBeam_;
-}
-
-void dataManager::consoleMessage(string message) {
-    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-    if (console) console->addConsoleMessage(message + "\n");
-    pspa_->processEvents();
+  unsigned k;
+  for (k=0; k < jobList_.size();k++) {
+    if ( jobList_[k] != NULL ) delete jobList_[k];
+  }
+  if ( currentBeam_ == NULL ) delete currentBeam_;
+}
+
+void dataManager::consoleMessage(string message)
+{
+  GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+  if (console) console->addConsoleMessage(message + "\n");
+  pspa_->processEvents();
 }
 
 string dataManager::getLabelFromElementNumero(int numero)
 {
-    abstractElement* ptr = pspa_->getBeamLine()->getAbstractElement(numero-1);
-    if ( ptr == NULL ) return "";
-    return ptr->getLabel();
-}
-
+  abstractElement* ptr = pspa_->getBeamLine()->getAbstractElement(numero-1);
+  if ( ptr == NULL ) return "";
+  return ptr->getLabel();
+}
 
 int dataManager::getNumeroFromElementLabel(string label)
 {
-    int index = -1;
-    
-    for (int k = 0; k < getBeamLineSize() ; k++)
-    {
-        if (pspa_->getBeamLine()->getAbstractElement(k) != NULL){
-            if ( pspa_->getBeamLine()->getAbstractElement(k)->getLabel() == label )
-            {
-                index = (int)k + 1;
-                return index;
-            }
-        }
-    }
-    return index;
-}
-
+  int index = -1;    
+  for (int k = 0; k < getBeamLineSize() ; k++) {
+    if (pspa_->getBeamLine()->getAbstractElement(k) != NULL) {
+      if ( pspa_->getBeamLine()->getAbstractElement(k)->getLabel() == label )
+        {
+          index = (int)k + 1;
+          return index;
+        }
+    }
+  }
+  return index;
+}
 
 abstractElement* dataManager::getElementPointerFromNumero(int k)
@@ -67 +71 @@
 }
 
-sectionToExecute*  dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
-{
+sectionToExecute* dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
+{
+  #if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " dataManager::addSectionToExecute " << endl << endl;
+#endif
+
   abstractSoftware* prog;
   string inputFileName;
@@ -82 +91 @@
   } else if (logiciel  == nomDeLogiciel::test) {
     prog = new softwareTest(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::madx) {
+    inputFileName = "madx.input";
+    prog = new softwareMadx(inputFileName,&sectorParam_,this);  
   } else {
-    prog = NULL;
-  }
-
-  //  abstractSoftware* prog = createSoftwareConnexion(logiciel);
-  jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
-  //  return prog;
+    prog = new softwareUnknown(); // xx
+  }
+
+  jobList_.push_back(new sectionToExecute(debut,debutIndex,fin,finIndex,prog));
   return jobList_.back();
 }
@@ -94 +104 @@
 void dataManager::clearSectionToExecute()
 {
-    unsigned k;
-    for(k = 0; k < jobList_.size(); k++)
+  unsigned k;
+  for(k = 0; k < jobList_.size(); k++)
     {
-        if ( jobList_[k] != NULL ) clearSectionToExecute(k);
-    }
-    jobList_.clear();
-}
-
-
-void dataManager::clearSectionToExecute(int a) {
-  cout << " dataManager::clearSectionToExecute efaacement section d'index : " << a << endl;
+      if ( jobList_[k] != NULL ) clearSectionToExecute(k);
+    }
+  jobList_.clear();
+}
+
+void dataManager::clearSectionToExecute(int a)
+{
+  cout << " dataManager::clearSectionToExecute : effacement de la section d'index = " << a << endl;
   if (a < 0) return;
   if (a >= (int)jobList_.size()) return;
-
+  
   // lors de la creation de la section on a fait un 'new' d'un 
   // softwareXXXX : on fait ici le 'delete'
-
+  
   const abstractSoftware* soft = jobList_.at(a)->getSoftware();
   if ( soft != NULL ) delete soft;
   jobList_.erase (jobList_.begin()+a);
 }
-
 
 void dataManager::initializeExecution()
@@ -141 +150 @@
 void dataManager::removeFile(string nameOfFile)
 {
-    ifstream fileExists;
-    fileExists.open(nameOfFile.c_str(), ios::in);
-    if (fileExists) {
-        fileExists.close();
-        remove(nameOfFile.c_str());
-    }
+  ifstream fileExists;
+  fileExists.open(nameOfFile.c_str(), ios::in);
+  if (fileExists) {
+    fileExists.close();
+    remove(nameOfFile.c_str());
+  }
 }
 
 bool dataManager::executeAll()
 {
+  cout << "***********************************" << endl;
+  cout << " dataManager::executeAll() " << endl << endl;
+
   bool success = true;
   abstractSoftware* softw = NULL;
   string workingDir = pspa_->getWorkingDir();
- 
+  
   // on verifie la consecution des sections
   int lastel = 0;
@@ -165 +177 @@
     }
   }
-
+  
   unsigned debut;
   unsigned fin;
   for(unsigned k = 0; k < jobList_.size(); k++) {
+  
     cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
-      
+    
     debut = jobList_[k]->getElementNumberInSection();
     fin = jobList_[k]->getLastElementNumberInSection();
     softw = jobList_[k]->getSoftware();
     
+    //cout << "k= " << k << ", de " << jobList_[k]->getFirstElement()->getLabel() << " Ã  " << jobList_[k]->getLastElement()->getLabel() << " avec " << softw->getName() << endl;
+
     if (softw == NULL) {
-        success = false;
-        consoleMessage("dataManager::executeAll : unknown software");
-        break;
+      success = false;
+      consoleMessage("dataManager::executeAll : unknown software");
+      break;
+    }
+    
+    success = softw->createInputFile(currentBeam_,debut,fin,workingDir);
+    if ( success ) {
+      success = softw->execute(workingDir);
+      if ( success ) {
+        success = softw->buildBeamAfterElements(workingDir);
       }
-      
-      success = softw->createInputFile(currentBeam_,debut,fin,workingDir);
-      if ( success ) {
-        success = softw->execute(workingDir);
-        if ( success ) {
-          success = softw->buildBeamAfterElements(workingDir);
-        }
-      }
-      
-      if ( success ) {
-        currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
-        cout << " execute termine avec succes " << endl;
-      } else {
-        currentBeam_ = NULL;
-        cout << " execute termine en ECHEC " << endl;
-      }
-      if ( !success ) break;
-      
-      if ( debut < firstComputedElemNumero_ ) firstComputedElemNumero_ = debut;
-      if ( fin > lastComputedElemNumero_ ) lastComputedElemNumero_ = fin;
-      
-      //debug
-      cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
-      cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
-      for (unsigned j = debut; j <= fin; j++) {
-        abstractElement* elPtr= getElementPointerFromNumero(j);
-        cout << "[" << j << "] " << elPtr->getNomdElement().getExpandedName() << endl;
-      }
+    }
+    
+    if ( success ) {
+      currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
+      cout << " execute termine avec succes " << endl;
+    } else {
+      currentBeam_ = NULL;
+      cout << " execute termine en ECHEC " << endl;
+    }
+    if ( !success ) break;
+    
+    if ( debut < firstComputedElemNumero_ ) firstComputedElemNumero_ = debut;
+    if ( fin > lastComputedElemNumero_ ) lastComputedElemNumero_ = fin;
+    
+    //debug
+    cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
+    cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
+    for (unsigned j = debut; j <= fin; j++) {
+      abstractElement* elPtr= getElementPointerFromNumero(j);
+      cout << "[" << j << "] " << elPtr->getNomdElement().getExpandedName() << endl;
+    }
   } //k
   
@@ -216 +231 @@
 void dataManager::saveConfiguration(string folder, string nameOfFile)
 {
-    ofstream outfile;
-    //    string name = pspa_->getWorkingDir()+ folder + "/" + nameOfFile + ".save";
-    cout << " dataManager::saveConfiguration : suppression du folder dans le nom de " << endl;
-    cout << " sauvegarde, en attendant que ce soit autre chose que le sessionId" << endl;
-    cout << " et qu'on puisse restaurer normalement" << endl;
-    string name = pspa_->getWorkingDir() + "/" + nameOfFile + ".save";
-    
-    // make dir if not exist
-    boost::filesystem::create_directories(pspa_->getWorkingDir() + folder + "/");
-    
-    outfile.open(name.c_str(), ios::out);
-    if (!outfile) {
-        cerr << " error opening output file for persistency " << name << endl;
-    }
-    
-    outfile << globParam_.FileOutputFlow();
-    abstractElement* elPtr;
-    for(int k = 0; k < getBeamLineSize() ; k++)
+  ofstream outfile;
+  //    string name = pspa_->getWorkingDir()+ folder + "/" + nameOfFile + ".save";
+  cout << " dataManager::saveConfiguration : suppression du folder dans le nom de " << endl;
+  cout << " sauvegarde, en attendant que ce soit autre chose que le sessionId" << endl;
+  cout << " et qu'on puisse restaurer normalement" << endl;
+
+  string name = pspa_->getWorkingDir() + "/" + nameOfFile + ".save";  
+  // make dir if not exist
+  boost::filesystem::create_directories(pspa_->getWorkingDir() + folder + "/");
+  
+  outfile.open(name.c_str(), ios::out);
+  if (!outfile) {
+    cerr<<" ERROR opening output file for persistency "<<name<<endl;
+  }
+  
+  outfile << globParam_.FileOutputFlow();
+  outfile << sectorParam_.FileOutputFlow();
+  abstractElement* elPtr;
+  for(int k = 0; k < getBeamLineSize() ; k++)
     {
       elPtr = pspa_->getBeamLine()->getAbstractElement(k);
       outfile << elPtr->FileOutputFlow();
     }
-    outfile.close();
+  outfile.close();
 }
 
@@ -247 +263 @@
   uap_root = new UAPNode("UAP_root");
   UAPNode* rep = uap_root->addChild("AML_representation");
-
+  
   // root node in the hierarchy
   UAPNode* lab = rep->addChild("laboratory");
   lab->addAttribute("name","PSPA lab");
-
+  
   // general global parameters
   globParam_.InputRep(lab);
-
+  
   // accelerator or section of accelerator
   //UAPNode* acc = lab->addChild("machine");
   //acc->addAttribute("name",fileName);
+
+  sectorParam_.InputRep(lab);
 
   // sequence of elements
@@ -275 +293 @@
 }
 
-bool dataManager::restoreElements( string inputFileName)
-{
-    cout << "dataManager::restoreElements() fichier " << inputFileName << 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;
-    
-    string globalTitle;
-    if ( infile >> globalTitle ) {
-        if ( globalTitle == string("globals") ) {
-            globParam_.raz();
-            globParam_.FileInput(infile);
-        } else {
-            cerr << " dataManager::restoreElements ERROR : global parameters seems to be missing" << endl;
-            return false;
-        }
+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;
+  
+  string globalTitle;
+  if ( infile >> globalTitle ) {
+    if ( globalTitle == string("globals") ) {
+      globParam_.raz();
+      globParam_.FileInput(infile);
     } else {
-        cerr << " dataManager::restoreElements ERROR : reading data save file" << endl;
-        return false;
-    }
-    
-    pspa_->getBeamLine()->clear();
-    
-    nomdElements::typedElement elementType;
-    string elementLabel;
-    while (infile >> elementLabel) {
-        elementType = nomdElements::getTypeFromLabel(elementLabel);
-        
-        GWt_abstractElement* nouveau = pspa_->getBeamLine()->addElement(elementType);
-        
-        if ( nouveau == NULL ) {
-            cerr << " dataManager::restoreElements ERROR : restoring element " << elementLabel << " failed " << endl;
-            return false;
-        }
-        nouveau->FileInput(infile);
-    }
-    infile.close();
-    
-    // debug
-    // unsigned k;
-    // for(k = 0; k < getBeamLineSize(); k++) {
-    //     abstractElement* ptr = pspa_->getBeamLine()->getAbstractElement(k);
-    //     cout << "reupere " << ptr->getLabel() << endl;
-    // }
-    return true;
+      //cout << " INFO::dataManager::restoreElements : global parameters seems to be missing" << endl;
+      //return false;
+    }
+  } else {
+    cerr << " ERROR::dataManager::restoreElements : reading globalParameters in save file" << endl;
+    return false;
+  }
+
+  //NOTE:: je ne sais pas si les parametres "secteur" seront conservés, aussi pour ne pas trop changer les fichiers je lis les données aprÚs "globals" dans la boucle 
+  
+  pspa_->getBeamLine()->clear();
+  nomdElements::typedElement elementType;
+  string elementLabel;
+  while (infile >> elementLabel) {
+
+    if (elementLabel == string("lattice") ) {
+      sectorParam_.raz();
+      sectorParam_.FileInput(infile);
+    } else {
+      elementType = nomdElements::getTypeFromLabel(elementLabel);
+      GWt_abstractElement* nouveau = pspa_->getBeamLine()->addElement(elementType);
+      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()->getAbstractElement(k);
+    cout << "recupere " << ptr->getLabel() << endl;
+  }
+#endif
+
+  infile.close();
+  return true;
 }
 
@@ -386 +414 @@
 abstractSoftware* dataManager::createSoftwareConnexion(nomDeLogiciel logi)
 {
-    string inputFileName;
-    if(logi == nomDeLogiciel::parmela) {
-      cout << " dataManager::createSoftwareConnexion : logiciel identifie : parmela " << endl;
-        inputFileName = "parmin";
-        return new softwareParmela(inputFileName, &globParam_, this);
-    } else if (logi == nomDeLogiciel::transport) {
-      cout << " dataManager::createSoftwareConnexion : logiciel identifie : transport " << endl;
-        inputFileName = "transport.input";
-        return new softwareTransport(inputFileName, &globParam_, this);
-    } else if (logi == nomDeLogiciel::generator) {
-      cout << " dataManager::createSoftwareConnexion : logiciel identifie : generator " << endl;
-        inputFileName = "generator.in";
-        return new softwareGenerator(inputFileName, &globParam_, this);
-    } else if (logi == nomDeLogiciel::test) {
-      cout << " dataManager::createSoftwareConnexion : logiciel identifie : test " << endl;
+  string inputFileName;
+  if(logi == nomDeLogiciel::parmela) {
+    cout << " dataManager::createSoftwareConnexion : logiciel identifie : parmela " << endl;
+    inputFileName = "parmin";
+    return new softwareParmela(inputFileName, &globParam_, this);
+  } else if (logi == nomDeLogiciel::transport) {
+    cout << " dataManager::createSoftwareConnexion : logiciel identifie : transport " << endl;
+    inputFileName = "transport.input";
+    return new softwareTransport(inputFileName, &globParam_, this);
+  } else if (logi == nomDeLogiciel::generator) {
+    cout << " dataManager::createSoftwareConnexion : logiciel identifie : generator " << endl;
+    inputFileName = "generator.in";
+    return new softwareGenerator(inputFileName, &globParam_, this);
+  } else if (logi == nomDeLogiciel::test) {
+    cout << " dataManager::createSoftwareConnexion : logiciel identifie : test " << endl;
         return new softwareTest(inputFileName, &globParam_, this);
-    } else {
-      cout << " dataManager::createSoftwareConnexion : logiciel identifie : null " << endl;
-        return NULL;
-    }
-}
+  } else {
+    cout << " dataManager::createSoftwareConnexion : logiciel identifie : null " << endl;
+    return NULL;
+  }
+}

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

@@ -29 +29 @@
 {
   int compteur = -1;
-  parametersString_[++compteur] = mixedTools::intToString(nbParam_);
-  parametersString_[++compteur] = specificName_;
-  parametersString_[++compteur] = mixedTools::doubleToString(lenghtElem_);
-  parametersString_[++compteur] = mixedTools::doubleToString(aperture_);
+  parametersString_[++compteur]= mixedTools::intToString(nbParam_);
+  parametersString_[++compteur]= specificName_;
+  parametersString_[++compteur]= mixedTools::doubleToString(lenghtElem_);
+  parametersString_[++compteur]= mixedTools::doubleToString(aperture_);
   if ( compteur != nbParam_ ) {
     cerr << " elementDrift::getParametersString() : ERROR nr pf parameters dosnt match " << endl;

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

@@ -1 +1 @@
 #include "nomDeLogiciel.h"
-
 
 nomDeLogiciel::Logiciel nomDeLogiciel::fromString( std::string s)
@@ -9 +8 @@
     else if ( s == "useraction" ) return useraction;
     else if ( s == "test" ) return test;
+    else if ( s == "madx" ) return madx;
     return unknownSoftware;
   }
 
- std::string nomDeLogiciel::toString( nomDeLogiciel::Logiciel lg)
-  {
-    switch (lg)
-      {
-      case parmela : { return "parmela"; }
-      case transport : { return "transport"; }
-      case generator : { return "generator"; }
-      case useraction : { return "useraction"; }
-      case test : { return "test"; }
-      case unknownSoftware : { return "unknownSoftware"; }
-      }
-    return "unknownSoftware";
-  }
+std::string nomDeLogiciel::toString(nomDeLogiciel::Logiciel lg)
+{
+  switch (lg) 
+    {
+    case parmela : { return "parmela"; }
+    case transport : { return "transport"; }
+    case generator : { return "generator"; }
+    case useraction : { return "useraction"; }
+    case test : { return "test"; }
+    case madx : { return "madx"; }
+    case unknownSoftware : { return "unknownSoftware"; }
+    }
+  return "unknownSoftware";
+}
 
-    /** Color of the background of the sofware
-     Should be a valid Css name as FFEEDD
-     */
- std::string nomDeLogiciel::getWtColor( nomDeLogiciel::Logiciel lg) const
-  {
-    switch (lg)
-      {
-      case parmela : { return "#e09bdf"; }
-      case transport : { return "#c0ea8e"; }
-      case generator : { return "#a3c0ed"; }
-      case useraction : { return "#FFFFFF"; }
-      case test : { return "#ecc38e"; }
-      case unknownSoftware : { return "#FFFFFF"; }
-      }
-    return "#FFFFFF";
-  }
-
+/** Color of the background of the sofware
+    Should be a valid Css name as FFEEDD
+*/
+std::string nomDeLogiciel::getWtColor( nomDeLogiciel::Logiciel lg) const
+{
+  switch (lg)
+    {
+    case parmela : { return "#e09bdf"; }
+    case transport : { return "#c0ea8e"; }
+    case generator : { return "#a3c0ed"; }
+    case useraction : { return "#FFFFFF"; }
+    case test : { return "#ecc38e"; }
+    case madx : { return "#ecc38e"; } //{ return "#FFFF00"; }
+    case unknownSoftware : { return "#FFFFFF"; }
+    }
+  return "#FFFFFF";
+}
 
  nomDeLogiciel::nomDeLogiciel()  
-  {
-    program_ = unknownSoftware;
-    progString_ = toString(program_);
-    //    value_ = toValue(program_);
-  }
+ {
+   program_ = unknownSoftware;
+   progString_ = toString(program_);
+ }
 
-  nomDeLogiciel::nomDeLogiciel(const string& s)
-    {
-      program_ = fromString(s);
-      progString_ = toString(program_);
-      //      value_ = toValue(program_);
-    }
+nomDeLogiciel::nomDeLogiciel(const string& s)
+{
+  program_ = fromString(s);
+  progString_ = toString(program_);
+}
 
-  nomDeLogiciel::nomDeLogiciel(int val)
-    {  
-      program_ = (Logiciel)val;
-      progString_ = toString(program_);
-      //      program_ = fromValue(val);
-      //      value_ = toValue(program_);
-    }
-
-
+nomDeLogiciel::nomDeLogiciel(int val)
+{  
+  program_ = (Logiciel)val;
+  progString_ = toString(program_);
+}
 
 int nomDeLogiciel::getNumberOfSoftwares() 
 { 
-  //  return toValue(unknownSoftware);
   return unknownSoftware;
 }
 
-  // operators
-  
-  nomDeLogiciel& nomDeLogiciel::operator= (const nomDeLogiciel& nl)
-    {
-      program_ = nl.program_;
-      progString_ = nl.progString_;
-      //      value_ = nl.value_;
-      return *this;
-    }
+// operators
+nomDeLogiciel& nomDeLogiciel::operator= (const nomDeLogiciel& nl)
+{
+  program_ = nl.program_;
+  progString_ = nl.progString_;
+  return *this;
+}
 
-  bool nomDeLogiciel::operator== (const nomDeLogiciel& nl)
-  {
-    return ( program_ == nl.program_);
-  }
+bool nomDeLogiciel::operator== (const nomDeLogiciel& nl)
+{
+  return ( program_ == nl.program_);
+}
 
-  bool nomDeLogiciel::operator!= (const nomDeLogiciel& nl)
-  {
-    return ( program_ != nl.program_);
-  }
+bool nomDeLogiciel::operator!= (const nomDeLogiciel& nl)
+{
+  return ( program_ != nl.program_);
+}

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

@@ -14 +14 @@
   else if( strstr(s.c_str(),"fit") ) return fit;
   else if( strstr(s.c_str(),"snapshot") ) return snapshot;
+  else if( strstr(s.c_str(),"mpole") ) return mpole;
   return inconnu;
 }
@@ -27 +28 @@
   else if( s == "fit" ) return fit;
   else if( s == "snapshot" ) return snapshot;
+  else if( s == "mpole" ) return mpole;
   return inconnu;
 }
@@ -41 +43 @@
   case fit : return "FIT"; break;
   case snapshot : return "SNAPSHOT"; break;
+  case mpole : return "MPOLE"; break;
   default : return "UNKNOWN";
   }
@@ -56 +59 @@
   case fit :   return "fit";
   case snapshot : return "snapshot";
+  case mpole :   return "mpole";
   default : return string("");
   }
@@ -71 +75 @@
   case fit :   return 4;
   case snapshot : return 2;
+  case mpole :   return 3;
   default : return 0;
   }

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

@@ -3 +3 @@
 
 #include "GWt_draggableImage.h"
+#include "GWt_console.h"
+
 #include "abstractElement.h"
-#include "GWt_console.h"
 #include "elementDrift.h"
 #include "elementRfgun.h"
@@ -13 +14 @@
 #include "elementFit.h"
 #include "elementSnapshot.h"
+#include "elementMultipole.h"
 
 #include <Wt/WDialog>
@@ -33 +35 @@
 class GWt_abstractElement : public WContainerWidget
 {
-    protected :
+ protected :
     
-    abstractElement* abstractElement_;
+  abstractElement* abstractElement_;
     
-    WDialog* dialog_;
-    GWt_draggableImage* dropped_;
-    WContainerWidget* wc_;
-    WText* wc_item_;
-    WLineEdit* labelEdit_;
+  WDialog* dialog_;
+  GWt_draggableImage* dropped_;
+  WContainerWidget* wc_;
+  WText* wc_item_;
+  WLineEdit* labelEdit_;
     
-    GWt_abstractElement() {;}
-    string* beginDialog();
-    
-    public :
-    
-    GWt_abstractElement(abstractElement*);
-    
-    void initialize();
-    void showParameters();
-    void deleteElement();
+  GWt_abstractElement() {;}
+  string* beginDialog();
+  
+ public :
+  
+  GWt_abstractElement(abstractElement*);
+  
+  void initialize();
+  void showParameters();
+  void deleteElement();
+  
+  void updateLabelAndToolTipWidget();
+  void FileInput(ifstream& ifs);
+  
+  WContainerWidget* getWidget();
+  abstractElement* getAbstractElement();
 
-    void updateLabelAndToolTipWidget();
-    void FileInput(ifstream& ifs);
-    
-    //  GWt_draggableImage* getImage();
-    WContainerWidget* getWidget();
-    abstractElement* getAbstractElement();
-    
-    virtual void dialogDone(WDialog::DialogCode code) = 0;
-    
-    inline WString print() {
-        return abstractElement_->print();
-    }
-    
-    virtual string getMimeType() = 0;
-    virtual string getSmallImageURL() = 0;
-    virtual string getBigImageURL() = 0;
-    virtual string getName() = 0;
-    virtual void initilializeDialog() = 0;
-    
-    void createDragImage(WContainerWidget*);
-    WImage* getImage();
-    
-protected:
-    
+  inline WString print() {
+    return abstractElement_->print();
+  }
+
+  virtual void dialogDone(WDialog::DialogCode code) = 0; 
+  virtual string getMimeType() = 0;
+  virtual string getSmallImageURL() = 0;
+  virtual string getBigImageURL() = 0;
+  virtual string getName() = 0;
+  virtual void initilializeDialog() = 0;
+  
+  void createDragImage(WContainerWidget*);
+  WImage* getImage();
+  
+ protected:
+  
     WImage* image_;
     GWt_elementLigneFaisceau* elementLigneFaiseauContainer_;
@@ -86 +86 @@
     
     inline void registerParam(string name, variant<int, string, bool, float, NullType> value, string desc) {
-        parameterMapValue[name] = value;
-        parameterMapDescription[name] = desc;
+      parameterMapValue[name] = value;
+      parameterMapDescription[name] = desc;
     }
     
-    variant<int, string, bool, float, NullType> getParamValue(string elem);
-    string getParamDescription(string elem);
+    variant<int, string, bool, float, NullType> getParamValue(string);
+    string getParamDescription(string);
 };
 #endif

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

@@ -18 +18 @@
 #include "GWt_fit.h"
 #include "GWt_snapshot.h"
+#include "GWt_mpole.h"
 
 using namespace Wt;
@@ -62 +63 @@
   inline void setSnapshotEnable(bool a) { isSnapshotElementEnable = a;};
   
+  /* Enable the mpole element creation
+   */
+  inline void setMPoleEnable(bool a) { isMPoleElementEnable = a;};
+  
   GWt_drift* createDriftElement();
   GWt_rfgun* createRFGunElement();
@@ -70 +75 @@
   GWt_fit* createFitElement();
   GWt_snapshot* createSnapshotElement();
+  GWt_mpole* createMPoleElement();
   vector <GWt_abstractElement*> getAllElements();
   
@@ -82 +88 @@
   bool isFitElementEnable;
   bool isSnapshotElementEnable;
+  bool isMPoleElementEnable;
 };
 #endif

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

@@ -39 +39 @@
   void updateGlobals();
   void renew();
-  void setText(WContainerWidget*);
+  void setText(WText*);
 };
 #endif

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

@@ -3 +3 @@
 
 #include <cstdlib>
-#include <list>
+#include <string.h>
+#include <vector>
 
 #include <Wt/WApplication>
@@ -9 +10 @@
 #include <Wt/WContainerWidget>
 #include <Wt/WText>
+#include <Wt/WLineEdit>
 #include <Wt/WPanel>
 #include <Wt/WComboBox>
@@ -24 +26 @@
 #include "GWt_ligneFaisceau.h"
 #include "GWt_globalParameters.h"
+#include "GWt_sectorParameters.h"
 
 #include "dataManager.h"
@@ -43 +46 @@
   GWt_LigneFaisceau* beamLine_;
     
-  // WWidget* globalParam_;
-  GWt_globalParameters* globalParam_; // xx
+  GWt_globalParameters* globalParam_;
+  GWt_sectorParameters* sectorParam_;
   
   GWt_dialog* graphicsDialog_;
@@ -73 +76 @@
   WContainerWidget* createDrawingWidget();
 
-  //WWidget* createGlobalParamWidget();
-  WWidget* createDashBoard(); // xx
-  void messageBox1(); // xx
-  void messageBox2(); // xx
+  WWidget* createDashBoard();
+  void messageBox1();
+  void messageBox2();
   
   // extensions (.001, .002,...) pour les fichiers "snapshot" 
@@ -119 +121 @@
   }
 
-
-  /* inline WWidget* getGlobalParam() { */
-  /*   return globalParam_; */
-  /* } */
-
   inline GWt_softwarePanel* getExecuteWidget() {
     return executeWidget_;

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

@@ -23 +23 @@
 class GWt_softwarePanel  : public WContainerWidget
 {
-    public :
-    GWt_softwarePanel(dataManager*, PspaApplication*);
-    virtual ~GWt_softwarePanel();
+ public :
+  
+  GWt_softwarePanel(dataManager*, PspaApplication*);
+  virtual ~GWt_softwarePanel();
 
-    void addSectionToExecuteW();
-    void updateSections();
+  void addSectionToExecuteW();
+  void updateSections();
     
-    private :
-    //    void disableSectionExecute();
-    //    void checkSectionSelection();
-    bool updateSectionSelection();
-    void deleteSectionToExecuteW(int section);
-    string getSelection();
-    void executer();
-    bool areDataCoherent();
-    void fillComboWithElements(Wt::WComboBox* cBox);
-    void fillComboWithSoftwares(Wt::WComboBox* cBox);
-    Wt::WContainerWidget* createAddDeletePushButtons(int sectionIndex);
+ private :
+ 
+  bool updateSectionSelection();
+  void deleteSectionToExecuteW(int section);
+  string getSelection();
+  void executer();
+  bool areDataCoherent();
+  void fillComboWithElements(Wt::WComboBox* cBox);
+  void fillComboWithSoftwares(Wt::WComboBox* cBox);
+  Wt::WContainerWidget* createAddDeletePushButtons(int sectionIndex);
 
-    dataManager* dtmanage_;
-    WPushButton *exec_go_;
-    WContainerWidget* contenuSections_;
-    PspaApplication* pspa_;
+  dataManager* dtmanage_;
+  WPushButton *exec_go_;
+  WContainerWidget* contenuSections_;
+  PspaApplication* pspa_;
 
-    std::vector <GWt_sectionToExecute*> sections_;
+  std::vector <GWt_sectionToExecute*> sections_;
 };
-
 #endif /* defined(__PSPA__GWt_softwarePanel__) */

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

@@ -14 +14 @@
 #include "GWt_beam.h"
 #include "GWt_fit.h"
-#include "GWt_snapshot.h"
+//#include "GWt_snapshot.h"
+
 #include "GWt_draggableImage.h"
 #include "GWt_ligneFaisceau.h"
@@ -29 +30 @@
 
 GWt_abstractElement::GWt_abstractElement(abstractElement* elem)
-: WContainerWidget()
+  : WContainerWidget()
 {
-    abstractElement_ = elem;
+  abstractElement_ = elem;
 }
-
 
 void GWt_abstractElement::initialize()
 {
-    // make image
-    image_ = new WImage(getBigImageURL(),this);
-    
-    addWidget(image_);
-    updateLabelAndToolTipWidget();
+  image_ = new WImage(getBigImageURL(),this); // make image  
+  addWidget(image_);
+  updateLabelAndToolTipWidget();
 }
-
 
 string* GWt_abstractElement::beginDialog()
 {
-  string* param = abstractElement_-> getParametersString();
-    
-  if ( param == NULL )
-    {
-      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-        console->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + abstractElement_->getNomdElement().getExpandedName());
-        }
+  string* param = abstractElement_->getParametersString();
+  
+  if ( param == NULL ) {
+    if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+      GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+      console->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + abstractElement_->getNomdElement().getExpandedName());
     }
-  //   int compteur = -1;
+  }
+
+  int nbparam = atoi(param->c_str());
+  if ( nbparam != abstractElement_->getNbParams()) {
+    if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+      GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+      console->addConsoleMessage(" element seems not to be a " + abstractElement_->getNomdElement().getExpandedName());
+    }
+  }
   
-  //  int nbparam = atoi(param[++compteur].c_str());
-  int nbparam = atoi(param->c_str());
-  if ( nbparam != abstractElement_->getNbParams())
-    {
-        if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
-          GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-          console->addConsoleMessage(" element seems not to be a " + abstractElement_->getNomdElement().getExpandedName());
-        }
-    }
-  
-  dialog_ = new WDialog("element " + abstractElement_->getNomdElement().getExpandedName());
-    new WText(" label of the element : ",dialog_->contents());
-    //  labelEdit_ = new WLineEdit(param[++compteur].c_str(), dialog_->contents());
-    
-    labelEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents());
-    new WBreak(dialog_->contents());
-    return ++param;
+  dialog_ = new WDialog("element "+abstractElement_->getNomdElement().getExpandedName());
+  new WText(" label of the element : ",dialog_->contents());
+  labelEdit_ = new WLineEdit( (++param)->c_str(),dialog_->contents());
+  new WBreak(dialog_->contents());
+  return ++param;
 }
 
 void GWt_abstractElement::updateLabelAndToolTipWidget()
 {
-    if (abstractElement_ != NULL) {
+  if (abstractElement_ != NULL) {
     elementLigneFaiseauContainer_->setElementLabel(abstractElement_->getLabel());
     setToolTip(print());
-    }
+  }
 }
 
@@ -91 +82 @@
 }
 
-
 void GWt_abstractElement::deleteElement()
 {
-    StandardButton result = WMessageBox::show("PSPA : Delete element", WString("Delete '")+WString(getAbstractElement()->getLabel())+"' ?", Ok | Cancel);
+  StandardButton result = WMessageBox::show("PSPA : Delete element", WString("Delete '")+WString(getAbstractElement()->getLabel())+"' ?", Ok | Cancel);
+  
+  if (result == Cancel) {
+    return;
+  }
+  // get LigneFaiseau widget and add new elementLigneFaiseau
+  GWt_LigneFaisceau* ligneFaisceau = NULL;
+  if ( static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"))) {
+    ligneFaisceau = static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"));
+  } else {
+    return;
+  }
+  
+  ligneFaisceau->removeElement(this);
+}
 
-    if (result == Cancel ) {
-        return;
-    }
-    // get LigneFaiseau widget and add new elementLigneFaiseau
-    GWt_LigneFaisceau* ligneFaisceau = NULL;
-    if ( static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"))) {
-        ligneFaisceau = static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"));
-    } else {
-        return;
-    }
-    
-    ligneFaisceau->removeElement(this);
+void GWt_abstractElement::createDragImage(WContainerWidget* w)
+{
+  GWt_draggableImage *result= new GWt_draggableImage(getBigImageURL(),w);
+  
+  /*
+   * Set the image to be draggable, showing the other image (dragImage)
+   * to be used as the widget that is visually dragged.
+   */
+  result->setDraggable(getMimeType(),new WImage(getSmallImageURL(),w),true);
+  result->setToolTip(getName());
+}
+
+void GWt_abstractElement::FileInput(ifstream& ifs)
+{
+  getAbstractElement()->FileInput(ifs);
+  initilializeDialog();
+  updateLabelAndToolTipWidget();
+  
+  // update parameters
+  GWt_LigneFaisceau* ligneFaisceau = NULL;
+  if ( static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"))) {
+    ligneFaisceau = static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"));
+    ligneFaisceau->update();
+  }
+}
+
+abstractElement* GWt_abstractElement::getAbstractElement() {
+  return abstractElement_;
 }
 
 WContainerWidget* GWt_abstractElement::getWidget() {
-    return wc_;
-}
-
-abstractElement* GWt_abstractElement::getAbstractElement() {
-    return abstractElement_;
-}
-
-
-void GWt_abstractElement::createDragImage(WContainerWidget* w){
-
-    GWt_draggableImage *result = new GWt_draggableImage(getBigImageURL(),w);
-
-    /*
-     * Set the image to be draggable, showing the other image (dragImage)
-     * to be used as the widget that is visually dragged.
-     */
-    result->setDraggable(getMimeType(),new WImage(getSmallImageURL(),w),true);
-    result->setToolTip(getName());
-
+  return wc_;
 }
 
 WImage* GWt_abstractElement::getImage() {
-    return image_;
+  return image_;
 }
 
-
-void GWt_abstractElement::FileInput(ifstream& ifs){
-    getAbstractElement()->FileInput(ifs);
-    initilializeDialog();
-    updateLabelAndToolTipWidget();
-
-// update parameters
-    GWt_LigneFaisceau* ligneFaisceau = NULL;
-    if ( static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"))) {
-        ligneFaisceau = static_cast<GWt_LigneFaisceau*> (wApp->findWidget ("ligneFaisceau"));
-        ligneFaisceau->update();
+variant<int, string, bool, float, NullType> GWt_abstractElement::getParamValue(string elem) 
+{
+  if(parameterMapValue.find(elem) == parameterMapValue.end()) {
+    return new NullType();
+  }
+  
+  std::map<std::string, variant<int, string, bool, float, NullType> >::iterator it;
+  it = parameterMapValue.find(elem);
+  variant <int, string, bool, float, NullType> value = it->second;
+  
+  try {
+    int pi = boost::get<int>(value);
+    printf("%s Type is int\n",elem.c_str());
+    return pi;
+  }
+  catch (boost::bad_get v) {
+    try {
+      string si = boost::get<string>(value);
+      printf("%s Type is string\n",elem.c_str());
+      return si;
     }
+    catch (boost::bad_get v) {
+      try {
+        bool bi = boost::get<bool>(value);
+        printf("%s Type is bool\n",elem.c_str());
+        return bi;
+      }
+      catch (boost::bad_get v) {
+        printf("%s Type is NULL\n",elem.c_str());
+        return new NullType();
+      }
+    }
+  }
+  printf("%s Type is NULL NULL\n",elem.c_str());
+  return new NullType();
 }
 
-
-
-variant<int, string, bool, float, NullType> GWt_abstractElement::getParamValue(string elem) {
-
-    if (parameterMapValue.find(elem) == parameterMapValue.end() )
-    {
-        return new NullType();
-    }
-
-    std::map<std::string, variant<int, string, bool, float, NullType> >::iterator it;
-    it = parameterMapValue.find(elem);
-    
-    variant <int, string, bool, float, NullType> value = it->second;
-    
-    try {
-        int pi = boost::get<int>(value);
-        printf("%s Type is int\n",elem.c_str());
-        return pi;
-    }
-    catch (boost::bad_get v) {
-        try {
-            string si = boost::get<string>(value);
-            printf("%s Type is string\n",elem.c_str());
-            return si;
-        }
-        catch (boost::bad_get v) {
-            try {
-                bool bi = boost::get<bool>(value);
-                printf("%s Type is bool\n",elem.c_str());
-                return bi;
-            }
-            catch (boost::bad_get v) {
-                printf("%s Type is NULL\n",elem.c_str());
-                return new NullType();
-            }
-        }
-    }
-    printf("%s Type is NULL NULL\n",elem.c_str());
-    return new NullType();
+string GWt_abstractElement::getParamDescription(string elem)
+{    
+  if(parameterMapDescription.find(elem) == parameterMapDescription.end() ) {
+    printf("%s Descr is NULL NULL\n",elem.c_str());
+    return "";
+  } else {
+    printf("%s Descr is %s\n",elem.c_str(),parameterMapDescription.find(elem)->second.c_str());
+    return parameterMapDescription.find(elem)->second;
+  }
 }
-
-
-string GWt_abstractElement::getParamDescription(string elem) {
-    
-    if (parameterMapDescription.find(elem) == parameterMapDescription.end() )
-    {
-        printf("%s Descr is NULL NULL\n",elem.c_str());
-        return "";
-    } else {
-        printf("%s Descr is %s\n",elem.c_str(),parameterMapDescription.find(elem)->second.c_str());
-        return parameterMapDescription.find(elem)->second;
-    }
-}
-
-

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

@@ -17 +17 @@
   isBeamElementEnable(false),
   isFitElementEnable(false),
-  isSnapshotElementEnable(false)
+  isSnapshotElementEnable(false),
+  isMPoleElementEnable(false)
 {}
 
@@ -30 +31 @@
   isFitElementEnable = false;
   isSnapshotElementEnable = false;
+  isMPoleElementEnable = false;
 }
 
@@ -96 +98 @@
 }
 
+GWt_mpole* GWt_abstractElementFactory::createMPoleElement() 
+{
+  if (isMPoleElementEnable) {
+    return new GWt_mpole();
+  }
+  return NULL;
+}
+
 vector <GWt_abstractElement*> GWt_abstractElementFactory::getAllElements()
 {
@@ -123 +133 @@
     elems.push_back(new GWt_snapshot());
   }
+  if (isMPoleElementEnable) {
+    elems.push_back(new GWt_mpole());
+  }
 
   return elems;

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

@@ -13 +13 @@
 #include "GWt_fit.h"
 #include "GWt_snapshot.h"
+#include "GWt_mpole.h"
 
 
@@ -55 +56 @@
 void GWt_elementLigneFaisceau::initialize_ligneFaisceau(nomdElements::typedElement eType)
 {   
-  cout<<"new GWt_elementLigneFaisceau : "<< this << endl;
+  cout << " new GWt_elementLigneFaisceau : "<< nomdElements::getLabelFromType(eType) << endl;
     
   // set layout
@@ -113 +114 @@
   case nomdElements::fit  :
     GWt_abstractElement_ = new GWt_fit(this);
+    break;
+  case nomdElements::mpole  :
+    GWt_abstractElement_ = new GWt_mpole(this);
     break;
   case nomdElements::snapshot :

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

@@ -15 +15 @@
 }
 
-void GWt_globalParameters::setText(WContainerWidget* wt)
+void GWt_globalParameters::setText(WText *st)
 {
-  status_ = new WText("Go ahead...",wt);
+  status_ = st;
 }
 
@@ -105 +105 @@
 void GWt_globalParameters::setStatus()
 {
-  WString out= WString("<p>frequency="+envoi_[1]+"</p>"
-                       "<p>step in phase="+envoi_[2]+"</p>"
-                       "<p>max step number="+envoi_[3]+"</p>"
-                       "<p>periodicity of s.c. computation="+envoi_[4]+"</p>");
+  WString out= WString("<p>frequency = "+envoi_[1]+"</p>"
+                       "<p>step in phase = "+envoi_[2]+"</p>"
+                       "<p>max step number = "+envoi_[3]+"</p>"
+                       "<p>periodicity of s.c. computation = "+envoi_[4]+"</p>");
   status_->setText(out);
 }

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

@@ -59 +59 @@
 
   GWt_abstractElement* GWtAbstractElem = NULL;  
-  cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl;
+  cout << " addElement::element : " << nomdElements::getLabelFromType(eType) << endl;
     
   // 3 cases :
@@ -288 +288 @@
 
 
-void GWt_LigneFaisceau::initializeSoftwares(){
-    
+void GWt_LigneFaisceau::initializeSoftwares()
+{    
   vector <abstractElement*> elems = getAllAbstractElements();
-    for (int a=0; a< elems.size(); a++) {
-      //     elems[a]->setSoftware(nomDeLogiciel::unknownSoftware);
-      elems[a]->setSoftware( NULL );
-    }
-}
-
-
+  cout << "GWt_LigneFaisceau::initializeSoftwares() " << elems.size() << endl;
+
+  for (int a = 0; a < elems.size(); a++) {
+    elems[a]->setSoftware( NULL );
+  }
+}
+
+

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

@@ -1 +1 @@
 #include <stdio.h>
-#include <string.h>
-#include <vector>
 #include <ctime>
 
 #include "GWt_pspaApplication.h"
-#include "GWt_ligneFaisceau.h"
-#include "GWt_softwarePanel.h"
-#include "GWt_globalParameters.h"
 #include "GWt_draggableImage.h"
+#include "GWt_serverFileSelector.h"
 #include "particleBeam.h"
 #include "bareParticle.h"
@@ -15 +11 @@
 #include "nomdElements.h"
 #include "environmentVariables.h"
-#include "GWt_console.h"
-#include "GWt_serverFileSelector.h"
 #include "trivaluedBool.h"
 
@@ -26 +20 @@
 #include <Wt/WStackedWidget>
 #include <Wt/WBreak>
-#include <Wt/WDialog>
 #include <Wt/WStandardItemModel>
 #include <Wt/WFileUpload>
 #include <Wt/WPainter>
-#include <Wt/WPdfImage>
 #include <Wt/WScrollArea>
-#include <Wt/WLineEdit>
 #include <Wt/WRadioButton>
-
-#include <Wt/WPanel>
 #include <Wt/WMessageBox>
 
@@ -73 +62 @@
   abstractElementFactory_->setFitEnable(true);
   abstractElementFactory_->setSnapshotEnable(true);
-  
-  // include the styleSheet
+  abstractElementFactory_->setMPoleEnable(true);
+  
+  // include the styleSheetcd 
   WContainerWidget *widroot = root();
   useStyleSheet("htdocs/pspa.css");
@@ -144 +134 @@
 
   globalParam_ = new GWt_globalParameters(dtmanage_);
+  sectorParam_ = new GWt_sectorParameters(dtmanage_);
   WWidget* dboard = createDashBoard();
   dboard->setMinimumSize(300,100);
@@ -171 +162 @@
 }
 
-// WWidget* PspaApplication::createGlobalParamWidget()
-// {
-//   WContainerWidget* globalParam = new GWt_globalParameters(this);
-//   globalParam->setMinimumSize(300,100);
-//   return globalParam;
-// }
-
 WWidget* PspaApplication::createDashBoard()
 {
-  WContainerWidget *result = new WContainerWidget();
-  
-  WPanel *panel = new WPanel(result);
-  panel->setTitle("dashboard");
-  
-  WContainerWidget *textdiv;
-  textdiv = new WContainerWidget();
-  textdiv->setStyleClass("text");
-  globalParam_->setText(textdiv);
-
-  WContainerWidget *cnt = new WContainerWidget();
+  WContainerWidget *wt= new WContainerWidget();
+  wt->setStyleClass("text");
+  WText *st= new WText("Go ahead...",wt);  
+
   WContainerWidget *buttons = new WContainerWidget();
   buttons->setStyleClass("buttons");
-
   WPushButton *button;
-  button = new WPushButton("globalParameters", buttons);
+  button = new WPushButton("globalParameters",buttons);
   button->clicked().connect(this, &PspaApplication::messageBox1);
-  
-  button = new WPushButton("fodoCells", buttons);
+  button = new WPushButton("sectorParameters", buttons);
   button->clicked().connect(this, &PspaApplication::messageBox2);
  
@@ -205 +180 @@
   styleSheet().addRule("body", "margin: 0px;");
 
+  WContainerWidget *cnt = new WContainerWidget();
   cnt->addWidget(buttons);
-  cnt->addWidget(textdiv);
+  cnt->addWidget(wt);
+
+  WContainerWidget *result = new WContainerWidget();
+  WPanel *panel = new WPanel(result);
+  panel->setTitle("dashboard");
   panel->setCentralWidget(cnt);
+
+  globalParam_->setText(st);
+  sectorParam_->setText(st);
   return result;
 }
@@ -219 +202 @@
 void PspaApplication::messageBox2()
 {
+  sectorParam_->execDialog();
   return;
 }
@@ -382 +366 @@
 void PspaApplication::sauver()
 {
-  cout << " on sauve " << endl;
-  console_->addConsoleMessage("sauvegarde");
-  
+  cout << "***********************************" << endl;
+  cout << " on sauve " << endl<<endl;
+  
+  console_->addConsoleMessage("sauvegarde \n");  
   dialogSave_ = new WDialog("save");
   new WText("name of case : ",dialogSave_->contents());
@@ -405 +390 @@
   dialogSave_ = NULL;
 
-  globalParam_->updateGlobals();
+  //globalParam_->updateGlobals();
 
   //  dtmanage_->saveConfiguration(nameOfCase_);
@@ -416 +401 @@
 void PspaApplication::restaurer()
 {
+  cout << "***********************************" << endl;
+  cout << " on restaure " << endl<<endl;
+
   GWt_serverFileSelector * fs = new GWt_serverFileSelector("Select a configuration file",workingDir_);
   string fileName = fs->exec();
@@ -423 +411 @@
   }
     
-  removePathFromConfigName(nameOfCase_ );
+  removePathFromConfigName(nameOfCase_);
   cout << " nom sans path " << nameOfCase_ << endl;
   removeExtensionFromConfigName(nameOfCase_);
   cout << " nom sans extension " << nameOfCase_ << endl;
-  if (nameOfCase_ == "")
-    return;
-  cout << " PspaApplication:: restaure le fichier " << fileName << endl;
+  if (nameOfCase_ == "") return;
+  cout << " PspaApplication::restaure le fichier   : " << fileName << endl;
   dialogSave_ = NULL;
   
@@ -442 +429 @@
   }
   
-  globalParam_->renew();  
+  globalParam_->renew(); 
+  sectorParam_->renew();
   console_->addConsoleMessage(string("restauration terminee \n"));
 }
@@ -448 +436 @@
 void PspaApplication::openFileSelector()
 {
-    
   WContainerWidget *result = new WContainerWidget();
-  WVBoxLayout* myLayout = new WVBoxLayout();
-    
+  WVBoxLayout* myLayout = new WVBoxLayout();  
   uploadFileSelectorWidget_ = new WFileUpload();
-    
   uploadFileSelectorWidget_->setFileTextSize(40);
-    
   myLayout->addWidget(new WText("Select the configuration file for pspa : "));
   myLayout->addWidget(uploadFileSelectorWidget_);
-    
   result->setLayout (myLayout);
     
@@ -470 +453 @@
   uploadFileSelectorWidget_->fileTooLarge().connect(this, &PspaApplication::fileTooLarge);
   
-  
   GWt_dialog* fileSelectorDialog = new GWt_dialog("Load a file",result,false);
-  
   fileSelectorDialog->exec();
 }
@@ -485 +466 @@
   cout << " fichier client sans extension : " << nomDuFichier << endl;
   
-  if ( test )
-    {
-      nameOfCase_ = nomDuFichier;
-      console_->addConsoleMessage(string("restauration..."));
+  if ( test ) {
+    nameOfCase_ = nomDuFichier;
+    console_->addConsoleMessage(string("restauration..."));
       
-      if ( !dtmanage_->restoreElements(uploadFileSelectorWidget_->spoolFileName()) ) {
-        GWt_dialog restoreWarning(" element restoring", "failure in restoring elements !", GWt_dialog::Error, false,true);
-        restoreWarning.exec();
-      }
+    if ( !dtmanage_->restoreElements(uploadFileSelectorWidget_->spoolFileName()) ) {
+      GWt_dialog restoreWarning(" element restoring", "failure in restoring elements !", GWt_dialog::Error, false,true);
+      restoreWarning.exec();
+    }
       
-      GWt_globalParameters* bibi = static_cast<GWt_globalParameters*>(globalParam_);
-      bibi->renew();
-      
-      console_->addConsoleMessage(string("rechargement de config termine"));
-      message->show();
-    }
+    globalParam_->renew(); 
+    sectorParam_->renew();
+    console_->addConsoleMessage(string("rechargement de la config termine"));
+    message->show();
+  }
 }
 
@@ -513 +492 @@
   message += " bytes\n";
     
-  GWt_dialog*  messageBox= new GWt_dialog("Error during upload file" ,message ,GWt_dialog::Error,false,true);
-  
+  GWt_dialog*  messageBox= new GWt_dialog("Error during upload file" ,message ,GWt_dialog::Error,false,true); 
   messageBox->show();
 }

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

@@ -16 +16 @@
 softwarePanel(sPanel)
 {
-    Wt::WGridLayout* mainContainerLayout = new Wt::WGridLayout();
-    mainContainerLayout->setContentsMargins(0,0,0,0);
+  Wt::WGridLayout* mainContainerLayout = new Wt::WGridLayout();
+  mainContainerLayout->setContentsMargins(0,0,0,0);
 
-    Wt::WContainerWidget* labelAndComboContainer = new Wt::WContainerWidget();
-    Wt::WVBoxLayout* labelAndComboContainerLayout = new Wt::WVBoxLayout();
-    labelAndComboContainerLayout->setContentsMargins(0,0,0,0);
+  Wt::WContainerWidget* labelAndComboContainer = new Wt::WContainerWidget();
+  Wt::WVBoxLayout* labelAndComboContainerLayout = new Wt::WVBoxLayout();
+  labelAndComboContainerLayout->setContentsMargins(0,0,0,0);
 
-    Wt::WContainerWidget* labelAndComboInsideContainer = new Wt::WContainerWidget();
-    Wt::WHBoxLayout* labelAndComboInsideContainerLayout = new Wt::WHBoxLayout();
-    labelAndComboInsideContainerLayout->setContentsMargins(0,0,0,0);
-    
-    labelAndComboInsideContainerLayout->addWidget(new Wt::WText("from : "));
-    labelAndComboInsideContainerLayout->addWidget(first);
-    labelAndComboInsideContainerLayout->addWidget(new Wt::WText("to : "));
-    labelAndComboInsideContainerLayout->addWidget(last);
-    labelAndComboInsideContainerLayout->addWidget(soft);
+  Wt::WContainerWidget* labelAndComboInsideContainer = new Wt::WContainerWidget();
+  Wt::WHBoxLayout* labelAndComboInsideContainerLayout = new Wt::WHBoxLayout();
+  labelAndComboInsideContainerLayout->setContentsMargins(0,0,0,0);
+  
+  labelAndComboInsideContainerLayout->addWidget(new Wt::WText("from : "));
+  labelAndComboInsideContainerLayout->addWidget(first);
+  labelAndComboInsideContainerLayout->addWidget(new Wt::WText("to : "));
+  labelAndComboInsideContainerLayout->addWidget(last);
+  labelAndComboInsideContainerLayout->addWidget(soft);
+  
+    // add buttons
+  labelAndComboInsideContainerLayout->addWidget(buttonPanel);
+  labelAndComboInsideContainer->setLayout(labelAndComboInsideContainerLayout);
+  labelAndComboContainerLayout->addWidget(labelAndComboInsideContainer);
+  labelAndComboContainerLayout->addStretch (10);
+  labelAndComboContainer->setLayout(labelAndComboContainerLayout);
+  
+  // add errors and warning layout
+  warningsContainer_ = new Wt::WContainerWidget();
+  errorsContainer_ = new Wt::WContainerWidget();
+  
+  Wt::WContainerWidget* warningsAndErrorsContainer = new Wt::WContainerWidget();
+  Wt::WVBoxLayout* vWarningsAndErrorsLayoutContainer = new Wt::WVBoxLayout();
+  
+  Wt::WHBoxLayout* hLayoutContainerWarnings = new Wt::WHBoxLayout();
+  Wt::WHBoxLayout* hLayoutContainerErrors = new Wt::WHBoxLayout();
+  
+  
+  warningsLabel_ = new Wt::WText("",XHTMLText);
+  errorsLabel_ = new Wt::WText("",XHTMLText);
+  hLayoutContainerWarnings->addWidget(warningsLabel_);
+  hLayoutContainerErrors->addWidget(errorsLabel_);
 
-    // add buttons
-    labelAndComboInsideContainerLayout->addWidget(buttonPanel);
-
-    labelAndComboInsideContainer->setLayout(labelAndComboInsideContainerLayout);
-
-    labelAndComboContainerLayout->addWidget(labelAndComboInsideContainer);
-    labelAndComboContainerLayout->addStretch (10);
-    
-    labelAndComboContainer->setLayout(labelAndComboContainerLayout);
-    
-            
-    // add errors and warning layout
-    warningsContainer_ = new Wt::WContainerWidget();
-    errorsContainer_ = new Wt::WContainerWidget();
-
-    Wt::WContainerWidget* warningsAndErrorsContainer = new Wt::WContainerWidget();
-    Wt::WVBoxLayout* vWarningsAndErrorsLayoutContainer = new Wt::WVBoxLayout();
-    
-    Wt::WHBoxLayout* hLayoutContainerWarnings = new Wt::WHBoxLayout();
-    Wt::WHBoxLayout* hLayoutContainerErrors = new Wt::WHBoxLayout();
-
-    
-    warningsLabel_ = new Wt::WText("",XHTMLText);
-    errorsLabel_ = new Wt::WText("",XHTMLText);
-    hLayoutContainerWarnings->addWidget(warningsLabel_);
-    hLayoutContainerErrors->addWidget(errorsLabel_);
-
-    warningsAndErrorsContainer->addWidget(warningsLabel_);
-    warningsAndErrorsContainer->addWidget(errorsLabel_);
-    
-    
-    // set Layouts
-    warningsContainer_->setLayout(hLayoutContainerWarnings);
-    errorsContainer_->setLayout(hLayoutContainerErrors);
-    
-    vWarningsAndErrorsLayoutContainer->addWidget(errorsContainer_);
-    vWarningsAndErrorsLayoutContainer->addWidget(warningsContainer_);
-    vWarningsAndErrorsLayoutContainer->addStretch (100);
-
-    warningsAndErrorsContainer->setLayout(vWarningsAndErrorsLayoutContainer);
-
-    // add label and Combo containers
-    mainContainerLayout->addWidget(labelAndComboContainer,0,0);
-    // add warnings and errors containers
-    mainContainerLayout->addWidget(warningsAndErrorsContainer,1,0);
-
-    // manage margins
-    vWarningsAndErrorsLayoutContainer->setContentsMargins(20,0,0,0);
-    hLayoutContainerWarnings->setContentsMargins(0,0,0,0);
-    hLayoutContainerErrors->setContentsMargins(0,0,0,0);
-
-    setLayout(mainContainerLayout);
-    warningsContainer_->setStyleClass("warningsContainer");
-    errorsContainer_->setStyleClass("errorsContainer");
-
-    // resize combo
-    firstElement->setMinimumSize(80,12);
-    lastElement->setMinimumSize(80,12);
-    software->setMinimumSize(80,12);
-        
-    firstElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
-    lastElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
-    software->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
-
-    manageWarningsAndErrors();
+  warningsAndErrorsContainer->addWidget(warningsLabel_);
+  warningsAndErrorsContainer->addWidget(errorsLabel_);
+  
+  
+  // set Layouts
+  warningsContainer_->setLayout(hLayoutContainerWarnings);
+  errorsContainer_->setLayout(hLayoutContainerErrors);
+  
+  vWarningsAndErrorsLayoutContainer->addWidget(errorsContainer_);
+  vWarningsAndErrorsLayoutContainer->addWidget(warningsContainer_);
+  vWarningsAndErrorsLayoutContainer->addStretch (100);
+  
+  warningsAndErrorsContainer->setLayout(vWarningsAndErrorsLayoutContainer);
+  
+  // add label and Combo containers
+  mainContainerLayout->addWidget(labelAndComboContainer,0,0);
+  // add warnings and errors containers
+  mainContainerLayout->addWidget(warningsAndErrorsContainer,1,0);
+  
+  // manage margins
+  vWarningsAndErrorsLayoutContainer->setContentsMargins(20,0,0,0);
+  hLayoutContainerWarnings->setContentsMargins(0,0,0,0);
+  hLayoutContainerErrors->setContentsMargins(0,0,0,0);
+  
+  setLayout(mainContainerLayout);
+  warningsContainer_->setStyleClass("warningsContainer");
+  errorsContainer_->setStyleClass("errorsContainer");
+  
+  // resize combo
+  firstElement->setMinimumSize(80,12);
+  lastElement->setMinimumSize(80,12);
+  software->setMinimumSize(80,12);
+  
+  firstElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
+  lastElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
+  software->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);
+  
+  manageWarningsAndErrors();
 }
 

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

@@ -21 +21 @@
 #include "GWt_pspaApplication.h"
 
+#define BAVARD 0
+
 GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,PspaApplication* pspa)
   : WContainerWidget() 
@@ -49 +51 @@
 void GWt_softwarePanel::addSectionToExecuteW()
 {      
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_softwarePanel::addSectionToExecuteW() " << endl<<endl;
+#endif
+
   abstractElement* premierElement;
   abstractElement* dernierElement;
@@ -55 +62 @@
   int dernierIndex = 0;
   
+  cout << "sections_.size() = " << sections_.size() << endl;
+
   // if there is no section
   if(sections_.size() == 0) {
@@ -76 +85 @@
   dernierElement = pspa_->getBeamLine()->getAbstractElement(pspa_->getBeamLine()->getBeamLineSize()-1);
   dernierIndex = pspa_->getBeamLine()->getBeamLineSize()-1;
-  //  cout << "PspaApplication::addSectionToExecute() : " << premierText << " à  " << dernierText << endl;
-  
-  //  abstractSoftware* soft = NULL;
-  //  dtmanage_->addSectionToExecute(premierElement,premierIndex, dernierElement, dernierIndex, soft);
-  dtmanage_->addSectionToExecute(premierElement,premierIndex, dernierElement, dernierIndex, nomDeLogiciel());
+  
+  dtmanage_->addSectionToExecute(premierElement,premierIndex,dernierElement,dernierIndex,nomDeLogiciel());
 
   std::string premierElementLabel = "";
@@ -87 +93 @@
     premierElementLabel = premierElement->getLabel();
   }
-
   if (dernierElement) {
     dernierElementLabel = dernierElement->getLabel();
@@ -104 +109 @@
   fillComboWithSoftwares(softCombo);
 
-  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo,createAddDeletePushButtons(sections_.size()),this);
+  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(sections_.size()),this);
 
   stringstream st;
@@ -118 +123 @@
 }
 
+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 < sections_.size(); a++) {
+    fillComboWithElements(sections_[a]->getFirstElement());
+    fillComboWithElements(sections_[a]->getLastElement());
+    sections_[a]->getFirstElement()->setEnabled (true);
+    sections_[a]->getLastElement()->setEnabled (true);
+  }
+  
+  if (sections_.size() == 0) {
+    return;
+  }
+  
+  // the first element will always be the first element of the beamLine
+  sections_[0]->getFirstElement()->setCurrentIndex(0);
+  sections_[0]->getFirstElement()->setEnabled (false);
+
+  // the last element will always be the last element of the beamLine
+  sections_[sections_.size()-1]->getLastElement()->setCurrentIndex(sections_[sections_.size()-1]->getLastElement()->count());
+  sections_[sections_.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;
   
@@ -134 +175 @@
   // 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 (sections_.size() > 0) {
-      sections_[0]->setLastElementCurrentSelection(currentString);
-//...
+    {
+      current = dtmanage_->getBeamLineSize();
+      currentString =  dtmanage_->getLabelFromElementNumero(current);
+      if (sections_.size() > 0) {
+        sections_[0]->setLastElementCurrentSelection(currentString);
+        //...
+      }
     }
-  }
   current++;
   currentString = dtmanage_->getLabelFromElementNumero(current);
@@ -184 +225 @@
 
   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();
   }
@@ -192 +239 @@
 }
 
-
 bool GWt_softwarePanel::areDataCoherent()
 {
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_softwarePanel::areDataCoherent() " << endl<<endl;
+#endif
+
   bool caMarche = true;
 
@@ -204 +255 @@
     pspa_->getBeamLine()->initializeSoftwares();
   }
-  
+        
   string diagnosticErrors;
   string diagnosticWarnings;
-  
-  for (int a = 0; a< sections_.size(); a++)
+  for (int a = 0; a < sections_.size(); a++) 
     {
-      string debString = sections_[a]->getFirstElementCurrentText().toUTF8();
-      string finString = sections_[a]->getLastElementCurrentText().toUTF8();
-    
-      // int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
-      // int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
-
+      string debString= sections_[a]->getFirstElementCurrentText().toUTF8();
+      string finString= sections_[a]->getLastElementCurrentText().toUTF8();
       int debut = pspa_->getBeamLine()->getAbstractElementNumeroFromLabel(debString);
       int fin = pspa_->getBeamLine()->getAbstractElementNumeroFromLabel(finString);
-    
-      nomDeLogiciel prog = nomDeLogiciel ( sections_[a]->getSoftwareCurrentText().toUTF8());
-      //      abstractSoftware* softToExec = dtmanage_->createSoftwareConnexion(prog);
-      sectionToExecute* sectToExec = dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
-                                     debut,
-                                     pspa_->getBeamLine()->getAbstractElement(fin),
-                                     fin,
-                                     prog);
+
+      string currentSoft= sections_[a]->getSoftwareCurrentText().toUTF8();
+      nomDeLogiciel prog = nomDeLogiciel(currentSoft);
+      sectionToExecute* sectToExec = dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),debut,pspa_->getBeamLine()->getAbstractElement(fin),fin,prog);
 
       abstractSoftware* softToExec = sectToExec->getSoftware(); 
       diagnosticErrors = "";
       diagnosticWarnings = "";
-
-      // check sections
-      for (int i=debut-1; i<fin; i++) {
-        if (pspa_->getBeamLine()) {
-          if (pspa_->getBeamLine()->getAbstractElement(i)) {
-            //         trivaluedBool tb = pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString());
-
-
-            trivaluedBool tb = softToExec->doAcceptElement(pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementType() );
-
-            if (tb  == TBoolOk ) {
-              pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(softToExec);
+      for(int i = debut-1; i < fin; i++) // check sections
+        {
+          if (!pspa_->getBeamLine()) continue;
+          abstractElement* elPtr= pspa_->getBeamLine()->getAbstractElement(i);    
+          if (!elPtr) continue; 
+
+          trivaluedBool tb = softToExec->doAcceptElement(elPtr->getNomdElement().getElementType());
+          if (tb  == TBoolOk ) {
+            elPtr->setSoftware(softToExec);
+          } else {
+            elPtr->setSoftware(NULL);
+            if (tb == TBoolIgnore) {
+              if(prog.getString() != "unknownSoftware") diagnosticWarnings += elPtr->getLabel() + " will be ignored by  "+ prog.getString() + "<br /> ";           
             } else {
-              pspa_->getBeamLine()->getAbstractElement(i)->setSoftware( NULL );
-
-              if ( tb == TBoolIgnore ) {
-                diagnosticWarnings += pspa_->getBeamLine()->getAbstractElement(i)->getLabel() + " will be ignored by  "+ prog.getString()+"<br /> ";           
-              } else {
-                // j'insiste pour remettre le nom generique de l'element refuse (glm / 30/03/2013)
-                diagnosticErrors += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getExpandedName() + " is not allowed with "+ prog.getString()+"<br /> ";
-                caMarche = false;
-              }
+              // j'insiste pour remettre le nom generique de l'element refuse (glm / 30/03/2013)
+              diagnosticErrors += elPtr->getNomdElement().getExpandedName() + " is not allowed with " + prog.getString() + "<br /> ";
+              caMarche = false;
             }
-            pspa_->getBeamLine()->update(i);
           }
-        }
-      }
+          pspa_->getBeamLine()->update(i);
+        } //i
+      
       // set errors and warnings
       sections_[a]->setErrors(diagnosticErrors);
       sections_[a]->setWarnings(diagnosticWarnings);
-    }
+    }//a
     
   return caMarche;
@@ -286 +323 @@
 }
 
-
-void GWt_softwarePanel::updateSections()
-{
-  // update all sections in order to manage new/deleted items
-  for (int a = 0; a< sections_.size(); a++) {
-    fillComboWithElements(sections_[a]->getFirstElement());
-    fillComboWithElements(sections_[a]->getLastElement());
-
-    sections_[a]->getFirstElement()->setEnabled (true);
-    sections_[a]->getLastElement()->setEnabled (true);
-  }
-  if (sections_.size() == 0) {
-    return;
-  }
-  // the first element will always be the first element of the beamLine
-  sections_[0]->getFirstElement()->setCurrentIndex(0);
-  sections_[0]->getFirstElement()->setEnabled (false);
-
-  // the last element will always be the last element of the beamLine
-  sections_[sections_.size()-1]->getLastElement()->setCurrentIndex(sections_[sections_.size()-1]->getLastElement()->count());
-  sections_[sections_.size()-1]->getLastElement()->setEnabled (false);
-
-  // set default values
-
-  // update
-  updateSectionSelection();
-}
-
 void GWt_softwarePanel::executer()
 {
-  
+  cout << "***********************************" << endl;
+  cout << " GWt_softwarePanel::executer() " << endl<<endl;
+
   if (!areDataCoherent()) {
     return;
   }  
   
-  static_cast<GWt_globalParameters*>(pspa_->getGlobalParam())->updateGlobals();
+  //static_cast<GWt_globalParameters*>(pspa_->getGlobalParam())->updateGlobals();
   
   GWt_dialog calculDialog("Calcul en cours", "Veuillez patienter...", GWt_dialog::Wait, true,false);
@@ -329 +340 @@
   
   if (!dtmanage_->executeAll()) {
-    GWt_dialog warningDialog("PSPA : Echec", " echec lors de l'exÈcution !", GWt_dialog::Error, true,true);
+    GWt_dialog warningDialog("PSPA : Echec", " echec lors de l'exécution !", GWt_dialog::Error, true,true);
     warningDialog.exec();
   }
@@ -338 +349 @@
 }
 
-
-void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) {
+void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) 
+{
   if (cBox == NULL) return;
 
   // get the last item selected
-  WString selectedString = cBox->currentText ();
+  WString selectedString = cBox->currentText();
   cBox->clear();
 
-  for (int a=0; a< pspa_->getBeamLine()->getBeamLineSize(); a++) {
+  for(int a = 0; a < pspa_->getBeamLine()->getBeamLineSize(); a++) {
     abstractElement* abs = pspa_->getBeamLine()->getAbstractElement(a);
-    if (abs != NULL){
+    if (abs != NULL) {
       cBox->addItem(abs->getLabel());
     }
   }
   
-  for (int a=0; a<cBox->count(); a++) {
+  for(int a = 0; a < cBox->count(); a++) {
     if (cBox->itemText (a) == selectedString) {
       cBox->setCurrentIndex(a);
@@ -361 +372 @@
 }
 
-
-void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox) {
+void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox) 
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_softwarePanel::fillComboWithSoftwares " << endl<<endl;
+#endif
+
   if (cBox == NULL) return;
   cBox->clear();
@@ -368 +384 @@
   unsigned nb = nomDeLogiciel::getNumberOfSoftwares();
   unsigned k;
-  for(k = 0; k < nb; k++) {
+  for(k = 0; k <= nb; k++) { //xx
     cBox->addItem(nomDeLogiciel(k).getString());
   }
+  cBox->setCurrentIndex(nb); // xx
   cBox->refresh();
 }
 
-
-Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons(int sectionNumber) {
-
+Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons(int sectionNumber) 
+{
   WContainerWidget* buttonContainer= new WContainerWidget();
   
@@ -399 +415 @@
   buttonContainerLayout->addWidget(exec_add);
   buttonContainerLayout->addWidget(exec_delete);
-
   buttonContainer->setLayout(buttonContainerLayout);