Changeset 105 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

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

Author:

lemeur

Message:

alerte en cas d'erreur d'execution

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_pspaApplication.h (modified) (1 diff)
• abstractElement.h (modified) (1 diff)
• dataManager.h (modified) (3 diffs)
• environmentVariables.h (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -69 +69 @@
   void checkSectionSelection();
 
+  bool areDataCoherent();
+
   void disableSectionExecute();
 
   void faireDessin();
-
+  void faireDessinParmela();
   void faireDessinTransport();
 

Interface_Web/trunk/pspaWT/include/abstractElement.h

@@ -105 +105 @@
   }
 
+  // provisoire, pour suppleer une future classe nomdElement 
+  // analogue a nomDeLogiciel
+  string getNameString() const 
+  {
+    switch ( elementName_ )
+      {
+      case initialBeam : 
+        {
+          return string("INITIALBEAM");
+        }
+      case drift : 
+        {
+          return string("DRIFT");
+        }
+      case cell : 
+        {
+          return string("CELL");
+        }
+      case soleno : 
+        {
+          return string("SOLENO");
+        }
+      case bend : 
+        {
+          return string("BEND");
+        }
+      default : 
+        {
+          return string("UNKNOWN");
+        }
+      }
+  }
 
- double getLenghtOfElement() const { return lenghtElem_;}
+  double getLenghtOfElement() const { return lenghtElem_;}
 
  int getNbParams() const {return nbParam_;};

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();

Interface_Web/trunk/pspaWT/include/environmentVariables.h

@@ -3 +3 @@
 
 static string WHERE_WE_ARE = string(getenv("PWD"));
-static string WORKINGAREA =  WHERE_WE_ARE.append("/workingArea");
+static string WORKINGAREA =  WHERE_WE_ARE.append("/workingArea/");
 
 #endif