Changeset 479 in PSPA

Timestamp:

Jan 7, 2014, 1:51:17 PM (10 years ago)

Author:

garnier

Message:

Modification en vue du passage de Parmela. Restauration du fichier Phyl ok

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• sources/controler/include/abstractSoftware.h (modified) (1 diff)
• sources/controler/include/softwareParmela.h (modified) (2 diffs)
• sources/controler/src/abstractSoftware.cc (modified) (1 diff)
• sources/controler/src/dataManager.cc (modified) (3 diffs)
• sources/controler/src/softwareParmela.cc (modified) (6 diffs)
• sources/userInterface/include/GWt_pspaApplication.h (modified) (1 diff)
• sources/userInterface/src/GWt_console.cc (modified) (1 diff)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/History

@@ -5 +5 @@
      PSPA - Plateforme de simulation en physique des accélérateurs
      =========================================================
+
+07 Janvier 2014 : Laurent Garnier
+- abstractSoftware : Suppression des numeroDeb_deprecated_
+- softwareParmela : Passage en deprecated de 
+  o relativeParmelaElementIndices
+  o setRelativeParmelaElementIndices()
+- dataManager : Correction d'un bug qui rangait les éléments lus dans un fichier dans le sens
+  du dernier vers le premier et non l'inverse
+- softwareParmela::buildBeamAfterElements() : Correction de cette méthode afin de prendre un vecteur d'élément et non des numeroDeb/Fin
+- GWt_console::addConsoleMessage() : Correction dans l'affichage de la console
+- GWt_pspaApplication : ajout d'une méthode createAccelerator() afin de corriger le pb de la console(pointeur nul car celle était détruite à chaque "restaurer")
 
 06 Janvier 2014 : Laurent Garnier

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

@@ -22 +22 @@
  protected :
   
-  unsigned numeroDeb_deprecated_, numeroFin_deprecated_;
   dataManager* dataManager_;
   string inputFileName_;

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

@@ -15 +15 @@
   //  unsigned offsetNumElem_;
 
-    vector<int> relativeParmelaElementIndices_;
+    vector<int> relativeParmelaElementIndices__deprecated;
 
 
@@ -21 +21 @@
 
   bool beamToParmela(string workingDir, particleBeam* partic );
-  void setRelativeParmelaElementIndices();
+  void setRelativeParmelaElementIndices_deprecated();
 
 

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

@@ -14 +14 @@
   inputFileName_ = inputFileName;
   sectionToExecute_ = sect;
-  numeroDeb_deprecated_ = 0;
-  numeroFin_deprecated_ = 0;
   dataManager_ = data;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");

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

@@ -126 +126 @@
       break;
     }
-    
-    success = softw->createInputFile(sector->getParticleBeam(),workingDir);
+      // END OF FIXME
+      success = softw->createInputFile(sector->getParticleBeam(),workingDir);
     if ( success ) {
       success = softw->execute(workingDir);
@@ -269 +269 @@
   nomdElements::typedElement elementType;
   string elementLabel;
+  abstractElement* nouveau = NULL;
   while (infile >> elementLabel) {
     if (elementLabel == string("globals") ) {
@@ -280 +281 @@
     } else {
       elementType = nomdElements::getTypeFromLabel(elementLabel);
-      abstractElement* nouveau = mySect->addElementAfter(elementType,NULL);
+      nouveau = mySect->addElementAfter(elementType,nouveau);
       if ( nouveau == NULL ) {
         cerr << " dataManager::restoreElements() : restore element " << elementLabel << " failed " << endl;

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

@@ -24 +24 @@
 }
 
-void softwareParmela::setRelativeParmelaElementIndices() {
-  relativeParmelaElementIndices_.clear();
-  relativeParmelaElementIndices_.resize(numeroFin_deprecated_ - numeroDeb_deprecated_ + 1, -1);
-  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
+void softwareParmela::setRelativeParmelaElementIndices_deprecated() {
+  return;
+  //  relativeParmelaElementIndices_.clear();
+//  relativeParmelaElementIndices_.resize(numeroFin_deprecated_ - numeroDeb_deprecated_ + 1, -1);
+//  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
   abstractElement* elPtr = getSectionToExecute()->getElements().front();
 
@@ -34 +35 @@
   // les elements de parmela sont indexes de 1 Ã  max, s'il n'y a pas de rfgun
   if ( !there_is_rfgun ) {
-    offsetNumElem = numeroDeb_deprecated_ -1;
+//    offsetNumElem = numeroDeb_deprecated_ -1;
     // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
   } else {
-    offsetNumElem = numeroDeb_deprecated_;
+//    offsetNumElem = numeroDeb_deprecated_;
   }
 
   // index du premier element de parmela
-  int id= numeroDeb_deprecated_ - offsetNumElem;
+//  int id= numeroDeb_deprecated_ - offsetNumElem;
   unsigned k;
   unsigned curseur = 0;
   for ( k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
     abstractElement* elem = getSectionToExecute()->getElements()[k];
-    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
+//    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
     // if ( elem->is_accepted_by_software(nameOfSoftware_) == TBoolOk ) {
     if ( doAcceptElement(elem->getNomdElement().getElementType() )  == TBoolOk ) {
-      relativeParmelaElementIndices_.at(curseur) = id;
-      cout << " mis a " << id << endl;
-      id++;
+//      relativeParmelaElementIndices_.at(curseur) = id;
+//      cout << " mis a " << id << endl;
+//      id++;
     }
     curseur++;
@@ -62 +63 @@
   unsigned int k;
 
-  setRelativeParmelaElementIndices();
+//  setRelativeParmelaElementIndices();
   string name = workingDir + inputFileName_;
   ofstream outfile;
@@ -100 +101 @@
   
  // retrouver le sector !!
-  for ( k =1; k <= getSectionToExecute()->getElements().size(); k++)
+  for ( k =1; k < getSectionToExecute()->getElements().size(); k++)
     {
       outfile << elementsData(getSectionToExecute()->getElements()[k]->parametersToSoftware());
@@ -160 +161 @@
       }
 
-      curseur = k - numeroDeb_deprecated_;
-
-      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
+    curseur = k;// - numeroDeb_deprecated_;
+
+    if (!(doAcceptElement(getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
+//      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
 
         // si l'element doit etre ignore de parmela, on renvoie sur le diag precedent
@@ -186 +188 @@
           double freq= dataManager_->getGlobalParameters()->getFrequency();
           unsigned numeroParmel;
-          numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+//        numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+    numeroParmel = curseur;
           cout << " lecture PARMELA el no absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
         // lecture sortie parmela

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

@@ -78 +78 @@
   bool removePathFromConfigName(string& config);
   bool removeExtensionFromConfigName(string& config);
-    
+  void createAccelerator();
+  
  public :
   

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

@@ -129 +129 @@
   
   // apply filter, will modify outputCurrent
-// FIXME !!!
-  return;
   searchFilter();
   /*

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

@@ -129 +129 @@
 
   
+  // FIXME : Have to be move in GWt_accelerator
+  createAccelerator();
+
+  // set auto scrollbar if needed
+  mainContainerWidget->setOverflow(WContainerWidget::OverflowAuto);
+}
+
+
+void PspaApplication::createAccelerator() {
   new GWt_accelerator(acceleratorContainerWidget_,dtmanage_);
   new WBreak(acceleratorContainerWidget_);
@@ -166 +175 @@
 
   
-  // set auto scrollbar if needed
-  mainContainerWidget->setOverflow(WContainerWidget::OverflowAuto);
 }
 
@@ -321 +328 @@
   // In the futur, we should be able to have lot of accelerator at the same time and each with ONE datamanager
   acceleratorContainerWidget_->clear();
-  new GWt_accelerator(acceleratorContainerWidget_,dtmanage_);
+  createAccelerator();
 
   globalParam_->renew();
   //sectorParam_->renew();
-  console_->addConsoleMessage(string("restauration terminee \n"));
+  console_->addConsoleMessage(WString("restauration terminee \n"));
 }