Changeset 105 in PSPA for Interface_Web/trunk/pspaWT/include/dataManager.h

Timestamp:

Nov 23, 2012, 2:02:08 PM (12 years ago)

Author:

lemeur

Message:

alerte en cas d'erreur d'execution

File:

• Interface_Web/trunk/pspaWT/include/dataManager.h (modified) (3 diffs)

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -25 +25 @@
   particleBeam currentBeam_;
 
-  //    vector<sectionToExecute*> jobList_;
+  vector<sectionToExecute*> jobList_;
 
   void createInputFileParmela( unsigned int indexDeb, unsigned int indexFin);
   void createInputFileTransport( unsigned int indexDeb, unsigned int indexFin);
+  void removeFile(string nameOfFile); 
+     void clearSectionToExecute();
 
 
@@ -37 +39 @@
   ~dataManager() 
 {
-  /* unsigned k; */
-  /* for (k=0; k < jobList_.size();k++) */
-  /*   { */
-  /*     if ( jobList_[k] != NULL ) delete jobList_[k]; */
-  /*   } */
+  unsigned k;
+  for (k=0; k < jobList_.size();k++)
+    {
+      if ( jobList_[k] != NULL ) delete jobList_[k];
+    }
 }
 
@@ -49 +51 @@
   inline particleBeam& getCurrentBeam() {return currentBeam_;}
 
-  //    void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
-  //    void clearSectionToExecute();
+     void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
  
   abstractElement* addElement(nomdElement elemType);
-  /* abstractElement* addCell(); */
-  /* abstractElement* addDrift(); */
-  /* abstractElement* addInitialBeam(); */
-  /* abstractElement* addSoleno(); */
-  /* abstractElement* addBend(); */
   void initializeExecution();
-  string executeTransport( unsigned int indexDeb, unsigned int indexFin);
-  string executeParmela( unsigned int indexDeb, unsigned int indexFin);
-  //  string executeAll();
+  string checkExecute();
+  bool executeTransport( unsigned int indexDeb, unsigned int indexFin, string& resul);
+  bool executeParmela( unsigned int indexDeb, unsigned int indexFin, string& resul);
+  bool executeAll(string& resul);
   void saveAll();
   void restoreAll();