Changeset 469 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/sectionToExecute.cc

Timestamp:

Dec 19, 2013, 3:53:53 PM (11 years ago)

Author:

garnier

Message:

Désormais il est de nouveau possible d'ajouter des sections et dy affecter des softwares (ne marche pour le moment quavec la 1ere sectionToExecute. Autres améliorations et renommages

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/sectionToExecute.cc (modified) (2 diffs)

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

@@ -1 +1 @@
 #include "sectionToExecute.h"
-
-
-sectionToExecute::sectionToExecute(abstractElement* a) {
-  elements_.push_back(a);
-}
+#include "softwareUnknown.h"
+#include "softwareParmela.h"
+#include "softwareTransport.h"
+#include "softwareGenerator.h"
+#include "softwareGenerator.h"
+#include "softwareUsersprogram.h"
+#include "softwareTest.h"
+#include "softwareMadx.h" //xx
 
 
 sectionToExecute::sectionToExecute(abstractElement* f, abstractSoftware* s) {
   elements_.push_back(f);
+  if (s == NULL) {
+    software_ = new softwareUnknown();
+  } else {
     software_ = s;
+  }
 }
 
@@ -25 +32 @@
 }
 
-/*
-bool sectionToExecute::setSoftware(nomDeLogiciel logiciel) {
-  
-  if (sectionToExecuteNumber >= sectionToExecute_.size()) {
-    return false;
+
+void sectionToExecute::setSoftware(std::string logiciel) {
+ 
+  abstractSoftware* prog;
+  string inputFileName;
+  if(logiciel == "parmela") {
+    inputFileName = "parmin";
+    prog = new softwareParmela(inputFileName, this);
+  } else if (logiciel  == "transport") {
+    inputFileName = "transport.input";
+    prog =  new softwareTransport(inputFileName, this);
+  } else if (logiciel == "generator") {
+    inputFileName = "generator.in";
+    prog = new softwareGenerator(inputFileName, this);
+  } else if (logiciel  == "madx") {
+    inputFileName = "madx.input";
+    prog = new softwareMadx(inputFileName,this);
+  } else if (logiciel  == "usersprogram") {
+    inputFileName = "dummy";
+    prog = new softwareUsersprogram(inputFileName, this);
+  } else if (logiciel  == "test") {
+    prog = new softwareTest(inputFileName, this);
+  } else {
+    prog = new softwareUnknown();
   }
   
-  abstractSoftware* prog;
-  string inputFileName;
-  if(logiciel == nomDeLogiciel::parmela) {
-    inputFileName = "parmin";
-    prog = new softwareParmela(inputFileName, this);
-  } else if (logiciel  == nomDeLogiciel::transport) {
-    inputFileName = "transport.input";
-    prog =  new softwareTransport(inputFileName, this);
-  } else if (logiciel == nomDeLogiciel::generator) {
-    inputFileName = "generator.in";
-    prog = new softwareGenerator(inputFileName, this);
-  } else if (logiciel  == nomDeLogiciel::madx) {
-    inputFileName = "madx.input";
-    prog = new softwareMadx(inputFileName,this);
-  } else if (logiciel  == nomDeLogiciel::usersprogram) {
-    inputFileName = "dummy";
-    prog = new softwareUsersprogram(inputFileName, this);
-  } else if (logiciel  == nomDeLogiciel::test) {
-    prog = new softwareTest(inputFileName, this);
-  } else {
-    prog = new softwareUnknown(); // xx
-  }
-  
-  sectionToExecute_[sectionToExecuteNumber]->setSoftware(prog);
-  return true;
+  setSoftware(prog);
 }
-*/
+