Changeset 436 in PSPA

Timestamp:

Nov 26, 2013, 5:36:11 PM (10 years ago)

Author:

touze

Message:

ajout de secteurs

Location:

Interface_Web/trunk/pspaWT

Files:

• sources/controler/include/sectorParameters.h (modified) (2 diffs)
• sources/controler/src/dataManager.cc (modified) (12 diffs)
• sources/controler/src/globalParameters.cc (modified) (1 diff)
• sources/controler/src/sectorParameters.cc (modified) (3 diffs)
• sources/controler/src/softwareMadx.cc (modified) (3 diffs)
• sources/userInterface/include/GWt_sectorParameters.h (modified) (3 diffs)
• sources/userInterface/src/GWt_globalParameters.cc (modified) (1 diff)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (4 diffs)
• sources/userInterface/src/GWt_sectorParameters.cc (modified) (3 diffs)
• sources/userInterface/src/GWt_softwarePanel.cc (modified) (1 diff)
• workingArea/pspa.save (modified) (1 diff)

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

@@ -5 +5 @@
 #include <iostream>
 #include "UAP/UAPNode.hpp"
+
 using namespace std;
+
+typedef pair<string, vector<string> > statements;
 
 class sectorParameters  
 {
   string geometry_;
-  int nCells_;
-  double lCell_;
-  double pc_;
-
-  int nbParam_;
-  string* parametersString_;
+  vector<statements> sectors_;
 
  public :
   
   sectorParameters();
-  ~sectorParameters() {
-    if(parametersString_ != NULL) delete [] parametersString_;
-  }
+  ~sectorParameters() {;}
   
-  string* getParametersString() const;
-  void setParametersString(string*);
   void raz();
   string FileOutputFlow() const;
@@ -31 +25 @@
   void InputRep(UAPNode* root);
 
-  int getNumberOfCells() const;
-  double getCellLength() const;
-  double getParticleMomentum() const;
+  void setSectors(const vector<statements>&);
+  vector<statements> getSectors() const;
 };
 #endif

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

@@ -73 +73 @@
 sectionToExecute* dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
 {
-  #if BAVARD > 0
+#if BAVARD > 0
   cout << "***********************************" << endl;
   cout << " dataManager::addSectionToExecute " << endl << endl;
@@ -160 +160 @@
 bool dataManager::executeAll()
 {
+#if BAVARD > 0
   cout << "***********************************" << endl;
   cout << " dataManager::executeAll() " << endl << endl;
+#endif
 
   bool success = true;
@@ -181 +183 @@
   unsigned fin;
   for(unsigned k = 0; k < jobList_.size(); k++) {
-  
+
+#if BAVARD > 0  
     cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
+#endif
     
     debut = jobList_[k]->getElementNumberInSection();
@@ -215 +219 @@
     if ( debut < firstComputedElemNumero_ ) firstComputedElemNumero_ = debut;
     if ( fin > lastComputedElemNumero_ ) lastComputedElemNumero_ = fin;
-    
-    //debug
+
+#if BAVARD > 0    
     cout << "dataManager::executeAll #diagnosticBeam= " << diagnosticBeam_.size() << endl;
     cout << "dataManager::executeAll #getBeamLineSize()= " << getBeamLineSize() << endl;
@@ -223 +227 @@
       cout << "[" << j << "] " << elPtr->getNomdElement().getExpandedName() << endl;
     }
+#endif
+
   } //k
   
-  cout << " dataManager::executeAll premier element : " << firstComputedElemNumero_ << " dernier : " << lastComputedElemNumero_ << endl;
+  cout << " dataManager::executeAll() : premier element = " << firstComputedElemNumero_ << " dernier = " << lastComputedElemNumero_ << endl;
+
   return success;
 }
@@ -232 +239 @@
 {
   ofstream outfile;
-  //    string name = pspa_->getWorkingDir()+ folder + "/" + nameOfFile + ".save";
+  //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;
@@ -248 +255 @@
   outfile << globParam_.FileOutputFlow();
   outfile << sectorParam_.FileOutputFlow();
+
   abstractElement* elPtr;
   for(int k = 0; k < getBeamLineSize() ; k++)
@@ -268 +276 @@
   lab->addAttribute("name","PSPA lab");
   
-  // general global parameters
+  // general global parameters--docroot . --http-address 0.0.0.0 --http-port 8077
   globParam_.InputRep(lab);
   
@@ -275 +283 @@
   //acc->addAttribute("name",fileName);
 
-  sectorParam_.InputRep(lab);
+  //sectorParam_.InputRep(lab);
 
   // sequence of elements
@@ -307 +315 @@
   else cout << " successful opening input stream : " << name << endl;
   
-  string globalTitle;
-  if ( infile >> globalTitle ) {
-    if ( globalTitle == string("globals") ) {
-      globParam_.raz();
-      globParam_.FileInput(infile);
-    } else {
-      //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 
+  //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 
   
   pspa_->getBeamLine()->clear();
@@ -327 +321 @@
   string elementLabel;
   while (infile >> elementLabel) {
-
-    if (elementLabel == string("lattice") ) {
+    if (elementLabel == string("globals") ) {
+      globParam_.raz();
+      globParam_.FileInput(infile);
+    } else if (elementLabel == string("sectors") ) {
       sectorParam_.raz();
       sectorParam_.FileInput(infile);
@@ -343 +339 @@
   }// while
   
- #if BAVARD > 1
+#if BAVARD > 1
   unsigned k;
   for(k = 0; k < getBeamLineSize(); k++) {

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

@@ -45 +45 @@
 {
   ostringstream sortie;
-  sortie<<" globals "<<endl;
-  sortie<<frequency_<<" "<<integrationStep_<<" "<<nstepsMax_<<" "<<nsc_<<endl;
+  sortie << " globals " << endl;
+  sortie << frequency_ << " " << integrationStep_ << " " << nstepsMax_ << " " << nsc_ << endl; 
   return sortie.str();  
 }

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

@@ -1 @@
-
-//#include <cstdlib>
 
 #include "sectorParameters.h"
 #include "mixedTools.h"
 
-sectorParameters::sectorParameters() : parametersString_(NULL)
+#define BAVARD 1
+
+sectorParameters::sectorParameters()
 {
   geometry_= string("CIRCULAR");
-  nCells_ = 0;
-  lCell_ = 0.0;
-  pc_ = 0.0;
-  nbParam_ = 4;
-  parametersString_ = new string[nbParam_+1];
+  sectors_.push_back(statements("vide",vector<string>()));
+  sectors_.back().second.push_back("xxx");
+  sectors_.back().second.push_back("xxx");
+  sectors_.back().second.push_back("Unchecked");
+  sectors_.back().second.push_back("1");
 }
 
-string* sectorParameters::getParametersString() const 
-{
-  parametersString_[0] = mixedTools::intToString(nbParam_);
-  parametersString_[1] = geometry_;
-  parametersString_[2] = mixedTools::intToString(nCells_);
-  parametersString_[3] = mixedTools::doubleToString(lCell_);
-  parametersString_[4] = mixedTools::doubleToString(pc_);
-  return parametersString_;
-}
+// sectorParameters::sectorParameters() : parametersString_(NULL)
+// {
+//   geometry_= string("CIRCULAR");
+//   nCells_ = 0;
+//   lCell_ = 0.0;
+//   pc_ = 0.0;
+//   nbParam_ = 4;
+//   parametersString_ = new string[nbParam_+1];
+// }
 
-void sectorParameters::setParametersString(string* param)
-{
-  geometry_ = param[1].c_str();
-  nCells_ = atoi(param[2].c_str());
-  lCell_ = atof(param[3].c_str());
-  pc_ = atof(param[4].c_str());
-}
+// string* sectorParameters::getParametersString() const 
+// {
+//   parametersString_[0] = mixedTools::intToString(nbParam_);
+//   parametersString_[1] = geometry_;
+//   parametersString_[2] = mixedTools::intToString(nCells_);
+//   parametersString_[3] = mixedTools::doubleToString(lCell_);
+//   parametersString_[4] = mixedTools::doubleToString(pc_);
+//   return parametersString_;
+// }
+
+// void sectorParameters::setParametersString(string* param)
+// {
+//   geometry_ = param[1].c_str();
+//   nCells_ = atoi(param[2].c_str());
+//   lCell_ = atof(param[3].c_str());
+//   pc_ = atof(param[4].c_str());
+// }
 
 void sectorParameters::raz()
 {
-  geometry_= string("CIRCULAR");
-  nCells_ = 0;
-  lCell_ = 0.0;
-  pc_ = 0.0;
+  if(!sectors_.empty()) sectors_.clear();
 }
 
@@ -44 +51 @@
 {
   ostringstream sortie;
-  sortie<<" lattice "<<endl;
-  sortie<<geometry_<<" "<<nCells_<<" "<<lCell_<<" "<<pc_<<endl;
+  sortie << " sectors " << endl;
+  sortie << sectors_.size() << endl;
+  for(int i = 0; i < sectors_.size(); i++) {
+    sortie << sectors_.at(i).first << " " << sectors_.at(i).second.at(0) << " " << sectors_.at(i).second.at(1) << " " << sectors_.at(i).second.at(2) << " " << sectors_.at(i).second.at(3) << endl;
+  }
   return sortie.str();  
 }
@@ -51 +61 @@
 void sectorParameters::FileInput(ifstream& ifs)
 {
-  ifs >> geometry_ >> nCells_ >> lCell_ >> pc_;
+  int n;
+  ifs >> n;
+  string txt = "";
+  for(int i = 0; i < n; i++) {
+    ifs >> txt;
+    sectors_.push_back(statements(txt,vector<string>()));
+    for(int j = 0; j < 4; j++) {
+      ifs >> txt;
+      sectors_.back().second.push_back(txt);
+    }
+  } 
 }
 
 void sectorParameters::InputRep(UAPNode* root)
 {
-  UAPNode* node = root->addChild("lattice");
-  node->addAttribute("name","global_lattice");
-  node->addChild("geometry")->addAttribute("type",geometry_);
-  string txt = "";
-  txt = mixedTools::doubleToString(pc_);
-  node->addChild("pc")->addAttribute("design",txt);
+  // UAPNode* node = root->addChild("lattice");
+  // node->addAttribute("name","global_lattice");
+  // node->addChild("geometry")->addAttribute("type",geometry_);
+  // string txt = "";
+  // txt = mixedTools::doubleToString(pc_);
+  // node->addChild("pc")->addAttribute("design",txt);
 
-  node = root->addChild("sector");
-  node->addAttribute("name","sect");
-  txt = mixedTools::doubleToString(lCell_);
-  node->addAttribute("length",txt);
-  txt = mixedTools::intToString(nCells_);
-  node->addAttribute("repeat",txt);
+  // node = root->addChild("sector");
+  // node->addAttribute("name","sect");
+  // txt = mixedTools::doubleToString(lCell_);
+  // node->addAttribute("length",txt);
+  // txt = mixedTools::intToString(nCells_);
+  // node->addAttribute("repeat",txt);
 }
 
-int sectorParameters::getNumberOfCells() const {
-  return nCells_;
+// int sectorParameters::getNumberOfCells() const {
+//   return nCells_;
+// }
+
+// double sectorParameters::getCellLength() const {
+//   return lCell_;
+// }
+
+// double sectorParameters::getParticleMomentum() const {
+//   return pc_;
+// }
+
+vector<statements> sectorParameters::getSectors() const {
+  return sectors_;
 }
 
-double sectorParameters::getCellLength() const {
-  return lCell_;
+void sectorParameters::setSectors(const vector<statements>& v) 
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " sectorParameters::setSectors() " << endl << endl;
+#endif
+
+  if(!sectors_.empty()) sectors_.clear();
+
+  for(int i = 0; i < v.size(); i++) {
+    sectors_.push_back(statements(v.at(i).first,vector<string>()));
+    for(int j = 0; j < 4; j++) 
+      sectors_.back().second.push_back(v.at(i).second.at(j));
+  }
+
+#if BAVARD > 0
+  cout << "sectors_.size()= " << sectors_.size() << endl;
+  for(int i = 0; i < sectors_.size(); i++) {
+    cout << "name= " << sectors_.at(i).first << ", de " << sectors_.at(i).second.at(0) << ", Ã  " << sectors_.at(i).second.at(1) << ", reflection = " << sectors_.at(i).second.at(2) << ", repeat= " << sectors_.at(i).second.at(3) << endl << endl;
+  }
+#endif
 }
-
-double sectorParameters::getParticleMomentum() const {
-  return pc_;
-}
-
-

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

@@ -32 +32 @@
     return false;
   }
-  
-  outfile << endl; // saut de ligne
-  ostringstream os;
-  os << "L: " << "line=(";
+
+  cout << " softwareMadx::createInputFile(...) lecture des elts de " << numeroDeb_ << " Ã  " << numeroFin_ << endl;
+  
+  // element label //////////////////////////
+
+  outfile << endl; // saut de ligne
 
   abstractElement* elPtr;
@@ -41 +43 @@
     {
       elPtr = dataManager_->getElementPointerFromNumero(k);
-      cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
+      //cout << " debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       vector<statements> v= elPtr->parametersToSoftware();
-      string label= v.at(0).second.at(1);
-      outfile << inputFormat(v); //<< endl;
-      os << label <<",";
-    }//k;
-
-  os << ");" << endl;
-  int nCells= sectParamPtr_->getNumberOfCells();
-  os << "all: line=(" << nCells << "*L);" << endl;
-  outfile << endl; // saut de ligne
-  outfile << os.str() << endl; // beam line definition p34
+      outfile << inputFormat(v);
+    }
+
+  // sublines ///////////////////////////////
+
+  outfile << endl; // saut de ligne
+
+  vector<statements> u = sectParamPtr_->getSectors();
+  for(unsigned int i = 0; i < u.size(); i++) {
+    ostringstream os;
+    os << u.at(i).first << ": line=(";
+    unsigned ai = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(0));
+    unsigned bi = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(1));
+
+    for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
+      elPtr = dataManager_->getElementPointerFromNumero(k);
+      
+      if(k >= ai && k <= bi) { 
+        if(k == bi) 
+          os << elPtr->getLabel() <<");";
+        else
+          os << elPtr->getLabel() <<",";
+      }
+    }// k
+
+    outfile << os.str() << endl; 
+  }// i
+
+  // relection and repetition ///////////////
+
+  outfile << endl; // saut de ligne
+
+  string *str= NULL;
+  if(u.size() > 0) {
+    str = new string[u.size()];
+    for(unsigned int i = 0; i < u.size(); i++) str[i]= "false";
+  }
+
+  ostringstream os;
+  os << "all: " << "line=(";
+  for(unsigned k = numeroDeb_; k <= numeroFin_; k++) {
+    elPtr = dataManager_->getElementPointerFromNumero(k);
+    bool isMember = false;
+
+    for(unsigned int i = 0; i < u.size(); i++) {
+      unsigned ai = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(0));
+      unsigned bi = dataManager_->getNumeroFromElementLabel(u.at(i).second.at(1));
+      if(k >= ai && k <= bi) {
+        isMember = true;
+
+        if(str[i] == "false") {
+          //int reflection = atoi(u.at(i).second.at(2).c_str());
+          int reflection = ( (u.at(i).second.at(2) == "Unchecked") ? 0:1 );
+          int repeat = atoi(u.at(i).second.at(3).c_str());
+          if(reflection > 0)
+            os << "-" << repeat << "*" << u.at(i).first;
+          else
+            os << repeat << "*" << u.at(i).first;
+
+          if(i < u.size()-1) os << ", ";
+        }
+
+        str[i] = "true";
+        break;
+      }
+    }// i
+    
+    if(isMember && k == numeroFin_) os << ");";
+   
+    if(!isMember) {
+      if(k == numeroFin_) os << elPtr->getLabel() << ");";
+      else os << elPtr->getLabel() << ",";
+    }
+  }// k
+
+  outfile << os.str() << endl;
+  ///////////////////////////////////////////
+      
+  outfile << endl; // saut de ligne
 
   outfile << "beam;" << endl; // beam data p46
@@ -58 +129 @@
   
   outfile << "select,flag = twiss,column = name,s,betx,bety;" << endl; //p48
-  outfile << "twiss,save,centre,file = twiss.out;" << endl; //p51
+  outfile << "twiss,save,centre,file = "+workingDir+"twiss.out;" << endl; //p51
   outfile << "stop;" << endl;
 

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

@@ -7 +7 @@
 #include <Wt/WDialog>
 #include <Wt/WText>
+#include <Wt/WGroupBox>
+#include <Wt/WCheckBox>
 
 using namespace Wt;
@@ -13 +15 @@
 class dataManager;
 
+typedef pair<string, vector<string> > statements;
+
 class GWt_sectorParameters : public WContainerWidget
 {
-  WLineEdit* geometry_;
-  WLineEdit* nCells_;
-  WLineEdit* lCell_;
-  WLineEdit* pc_;
+  dataManager* dt_;
+  vector<statements> sectors_;
+  
+  vector <WWidget*> cnt_;
+  WLineEdit* sLabel_;
+  WLineEdit* firstElement_;
+  WLineEdit* lastElement_;
+  WLineEdit* repeat_;
+  WCheckBox* reflection_;
 
-  dataManager* dt_;
   WText *status_;
-  WDialog *dialog_;
-  string envoi_[5];
-
-  string* getSectorParameters();
-  void setStatus();
+  WDialog *dialog_; 
+  WGroupBox *gb_;
+  
+  void createSector();
+  WContainerWidget* buttons(int);
+  void dialogDone(WDialog::DialogCode code);
+  void add();
+  void cancel(int);
+  void setStatus(const WString&);
+  void setAttributes();
 
  public :
@@ -35 +48 @@
 
   void execDialog();
-  void dialogDone(WDialog::DialogCode code);
-  void update();
-  void renew();
   void setText(WText*);
 };

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

@@ -96 +96 @@
 {
   string* param = dialogBegin();
-  setStatus();
+  //setStatus();
   frequencyEdit_ = new WLineEdit(param[1].c_str());
   stepEdit_ = new WLineEdit(param[2].c_str());

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

@@ -27 +27 @@
 #include <Wt/WMessageBox>
 
-//#define HAS_IMAGEMAGIC 1
+#define HAS_IMAGEMAGIC 1
 
 using namespace Wt::Chart;
@@ -173 +173 @@
   button = new WPushButton("globalParameters",buttons);
   button->clicked().connect(this, &PspaApplication::messageBox1);
-  button = new WPushButton("sectorParameters", buttons);
+  button = new WPushButton("sectors", buttons);
   button->clicked().connect(this, &PspaApplication::messageBox2);
  
@@ -430 +430 @@
   
   globalParam_->renew(); 
-  sectorParam_->renew();
+  //sectorParam_->renew();
   console_->addConsoleMessage(string("restauration terminee \n"));
 }
@@ -476 +476 @@
       
     globalParam_->renew(); 
-    sectorParam_->renew();
+    //sectorParam_->renew();
     console_->addConsoleMessage(string("rechargement de la config termine"));
     message->show();

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

@@ -3 +3 @@
 #include <Wt/WPushButton>
 
+#include <Wt/WGridLayout>
+#include <Wt/WVBoxLayout>
+#include <Wt/WHBoxLayout>
+
+#include <Wt/WCssDecorationStyle>
+
 #include "GWt_sectorParameters.h"
 #include "dataManager.h"
+#include "mixedTools.h"
+
+#define BAVARD 0
 
 GWt_sectorParameters::GWt_sectorParameters(dataManager* dt)
@@ -16 +25 @@
 }
 
-string* GWt_sectorParameters::getSectorParameters()
-{
-  string* param = dt_->getSectorParameters()->getParametersString();
-  envoi_[0] = param[0].c_str();
-  envoi_[1] = param[1].c_str();
-  envoi_[2] = param[2].c_str();
-  envoi_[3] = param[3].c_str();
-  envoi_[4] = param[4].c_str();
-  return param;
-}
-
 void GWt_sectorParameters::execDialog()
 {
-  dialog_ = new WDialog("sector parameters");
-  string* param = getSectorParameters();
-
-  new WText("geometry : ",dialog_->contents());
-  geometry_ = new WLineEdit(param[1].c_str(),dialog_->contents());
-  geometry_->disable();
-  new WBreak(dialog_->contents());
-  new WText("Enter number of cells : ",dialog_->contents());
-  nCells_ = new WLineEdit(param[2].c_str(),dialog_->contents());
-  new WBreak(dialog_->contents());
-  new WText("Enter cell length (m): ",dialog_->contents());
-  lCell_ = new WLineEdit(param[3].c_str(),dialog_->contents());
-  new WBreak(dialog_->contents());
-  new WText("Enter particle momentum (GeV/c) : ",dialog_->contents());
-  pc_ = new WLineEdit(param[4].c_str(),dialog_->contents());
-  new WBreak(dialog_->contents());
-
-  WPushButton *ok =  new WPushButton("Ok", dialog_->contents());
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::execDialog() " << endl << endl;
+#endif
+
+  dialog_ = new WDialog("sectors into beam line");
+  dialog_->contents()->setMinimumSize(800,WLength::Auto);
+
+  dialog_->contents()->addWidget(new WText("geometry : "));
+  dialog_->contents()->addWidget(new WLineEdit("CIRCULAR"));
+  dialog_->contents()->addWidget(new WBreak());
+  dialog_->contents()->addWidget(new WBreak());
+
+  gb_ = new WGroupBox("sectors",dialog_->contents());
+  createSector();
+
+  dialog_->contents()->addWidget(new WBreak());
+
+  WContainerWidget *wb = new WContainerWidget();
+  wb->setStyleClass("buttons");
+  WPushButton *ok = new WPushButton("Ok",wb);
+  ok->decorationStyle().setBackgroundColor(WColor("#87CEFA"));
   ok->clicked().connect(dialog_, &WDialog::accept);
-  WPushButton *no = new WPushButton("Cancel", dialog_->contents());
+  WPushButton *no = new WPushButton("Cancel",wb);
   no->clicked().connect(dialog_, &WDialog::reject);
+  dialog_->contents()->addWidget(wb);
 
   dialog_->finished().connect(this,&GWt_sectorParameters::dialogDone);
@@ -55 +58 @@
 }
 
+void GWt_sectorParameters::createSector()
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::createSector() " << endl << endl;
+#endif
+
+  WHBoxLayout* hbox= new WHBoxLayout();
+  hbox->setContentsMargins(0,0,0,0);
+
+  vector<statements> v = dt_->getSectorParameters()->getSectors();
+
+  hbox->addWidget(new WText("name&nbsp;:&nbsp;"));
+  sLabel_= new WLineEdit(v.at(0).first);
+  hbox->addWidget(sLabel_);
+  hbox->addWidget(new WText("from&nbsp;:&nbsp;"));
+  firstElement_ = new WLineEdit(v.at(0).second.at(0));
+  hbox->addWidget(firstElement_);
+  hbox->addWidget(new WText("to&nbsp;:&nbsp;"));
+  lastElement_ = new WLineEdit(v.at(0).second.at(1));
+  hbox->addWidget(lastElement_);
+  hbox->addWidget(new WText("reflection&nbsp;:&nbsp;"));
+  reflection_ = new WCheckBox();
+  reflection_->setChecked(false); // default: Unchecked
+  if(v.at(0).second.at(2) == "Checked") reflection_->setChecked(true);
+  hbox->addWidget(reflection_);
+  hbox->addWidget(new WText("repeat&nbsp;:&nbsp;"));
+  repeat_ = new WLineEdit(v.at(0).second.at(3));
+  repeat_->setTextSize(2); 
+  hbox->addWidget(repeat_);
+
+  WContainerWidget* bs= buttons(cnt_.size());
+  hbox->addWidget(bs);
+
+  WContainerWidget *w1 = new WContainerWidget();
+  w1->setLayout(hbox);
+
+  WVBoxLayout* vbox= new WVBoxLayout();
+  vbox->setContentsMargins(0,0,0,0);
+  vbox->addWidget(w1);
+  vbox->addStretch(10);
+
+  WContainerWidget *w2 = new WContainerWidget();
+  w2->setLayout(vbox);
+
+  WGridLayout *grid = new WGridLayout();
+  grid->setContentsMargins(0,0,0,0);
+  grid->addWidget(w2,0,0);
+  grid->setColumnStretch(0,1);
+
+  WContainerWidget *w3 = new WContainerWidget();
+  std::stringstream st; 
+  st << cnt_.size();
+  w3->setObjectName(st.str());
+  cnt_.push_back(w3);
+ 
+  w3->setLayout(grid); 
+  gb_->addWidget(w3); 
+}
+
+WContainerWidget* GWt_sectorParameters::buttons(int num)
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::buttons()" << endl << endl;
+#endif
+
+  WHBoxLayout* hbox = new WHBoxLayout();
+  hbox->setContentsMargins(0,0,0,0);
+  
+  WPushButton* add = new WPushButton("+");
+  add->clicked().connect(this,&GWt_sectorParameters::add);
+  add->setStyleClass("roundButton");
+  add->setMaximumSize(20,20);
+  add->setToolTip("Add new section");
+  hbox->addWidget(add);
+
+  WPushButton* cancel = new WPushButton("-");
+  cancel->clicked().connect(boost::bind(&GWt_sectorParameters::cancel,this,num));
+  cancel->setStyleClass("roundButton");
+  cancel->setMaximumSize(20,20);
+  cancel->setToolTip("Remove this section");
+  hbox->addWidget(cancel);
+
+  WContainerWidget* wb= new WContainerWidget();
+  wb->setLayout(hbox);
+  return wb;
+}
+
 void GWt_sectorParameters::dialogDone(WDialog::DialogCode code)
 {
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::dialogDone() " << endl << endl;
+#endif
+
   if (code == WDialog::Accepted) {
-    update();
-    setStatus();
+    setStatus("OK...");
+    setAttributes();
+    dt_->getSectorParameters()->setSectors(sectors_);
+  } else {
+    setStatus("Cancelled!");
+    //cnt_.clear();
   }
-  return;
-}
-
-void GWt_sectorParameters::update()
-{
-  envoi_[0] = string("4");
-  envoi_[1] = geometry_->text().toUTF8();
-  envoi_[2] = nCells_->text().toUTF8();
-  envoi_[3] = lCell_->text().toUTF8();
-  envoi_[4] = pc_->text().toUTF8();
-  dt_->getSectorParameters()->setParametersString(envoi_);
-}
-
-void GWt_sectorParameters::renew()
-{
-  string* param = getSectorParameters();
-  setStatus();
-  geometry_ = new WLineEdit(param[1].c_str());
-  nCells_ = new WLineEdit(param[2].c_str());
-  lCell_ = new WLineEdit(param[3].c_str());
-  pc_ = new WLineEdit(param[4].c_str());
-}
-
-void GWt_sectorParameters::setStatus()
-{
-  WString out= WString("<p>geometry = "+envoi_[1]+"</p>"
-                       "<p>number of cells = "+envoi_[2]+"</p>"
-                       "<p>cell length = "+envoi_[3]+"</p>"
-                       "<p>particle momentum = "+envoi_[4]+"</p>");
-  status_->setText(out);
-}
+
+#if BAVARD > 0
+  cout << "dialogDone():: sectors_.size()= " << sectors_.size() << endl;
+  for(int i = 0; i < sectors_.size(); i++) {
+    cout << "name= " << sectors_.at(i).first << ", de " << sectors_.at(i).second.at(0) << ", Ã  " << sectors_.at(i).second.at(1) << ", reflection = " << sectors_.at(i).second.at(2) << ", repeat= " << sectors_.at(i).second.at(3) << endl << endl;
+  }
+#endif
+
+  cnt_.clear();
+}
+
+void GWt_sectorParameters::add()
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::add() " << endl << endl;
+#endif
+
+  setStatus("add sector");
+  setAttributes();
+  createSector();
+}
+
+void GWt_sectorParameters::cancel(int num)
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::cancel() " << endl << endl;
+#endif
+
+  setStatus("delete sector");
+  std::stringstream st;
+  st << num;
+  std::string ref = st.str();
+  
+  for(unsigned int k = 0; k < cnt_.size(); k++) {
+    cout << "sectors[" << k << "]= " << cnt_[k]->objectName();
+    if(cnt_[k]->objectName() == st.str()) {
+      cout << " : cancelled" << endl;
+      gb_->removeWidget(cnt_[k]);
+      delete cnt_[k];
+      cnt_.erase(cnt_.begin()+k); 
+    } else {
+      cout << " : kept" << endl;
+    }
+  }
+}
+
+void GWt_sectorParameters::setAttributes()
+{
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_sectorParameters::setAttributes() " << endl << endl;
+#endif
+
+  string txt = "";
+  txt = sLabel_->text().toUTF8();  
+  sectors_.push_back(statements(txt,vector<string>()));
+  txt = firstElement_->text().toUTF8();
+  sectors_.back().second.push_back(txt);
+  txt = lastElement_->text().toUTF8();
+  sectors_.back().second.push_back(txt);
+  // checkState() retourne : Unchecked = 0,
+  //                         PartiallyChecked = 1,
+  //                         Checked = 2
+  txt = "Unchecked";
+  if(reflection_->checkState() > 0) txt = "Checked";
+  sectors_.back().second.push_back(txt);
+  txt = repeat_->text().toUTF8();
+  sectors_.back().second.push_back(txt);
+}
+
+void GWt_sectorParameters::setStatus(const WString& str)
+{
+  status_->setText(str);
+}

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

@@ -304 +304 @@
 void GWt_softwarePanel::deleteSectionToExecuteW(int sectionLabel)
 {
+#if BAVARD > 0
+  cout << "***********************************" << endl;
+  cout << " GWt_softwarePanel::deleteSectionToExecuteW()" << endl<<endl;
+#endif
+
   stringstream st;
   st << sectionLabel;

Interface_Web/trunk/pspaWT/workingArea/pspa.save

@@ -1 +1 @@
  globals 
 2998.65 1 100000 10
- lattice 
-CIRCULAR 0 0 0
 rfgun
 rfgun01