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

Timestamp:

Dec 16, 2013, 5:16:54 PM (11 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/sectionToExecute.cc (modified) (1 diff)

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

@@ -2 +2 @@
 
 
-sectionToExecute::sectionToExecute(abstractElement* f, abstractElement* l , abstractSoftware* s) {
-    firstElement = f;
-    lastElement =l;
-    software = s;
+sectionToExecute::sectionToExecute(abstractElement* a) {
+  elements_.push_back(a);
 }
 
 
-sectionToExecute::sectionToExecute(abstractElement* f, int fI, abstractElement* l , int lI, abstractSoftware* s) {
-    firstElement = f;
-    lastElement =l;
-
-    firstElementNumberInBeamLine = fI;
-    lastElementNumberInBeamLine =lI;
-
-    software = s;
+sectionToExecute::sectionToExecute(abstractElement* f, abstractSoftware* s) {
+  elements_.push_back(f);
+    software_ = s;
 }
 
+
+bool sectionToExecute::insertAfter(abstractElement* previousElement,abstractElement* currentElement) {
+
+  std::vector<abstractElement*>::iterator it;
+  for (it = elements_.begin(); it < elements_.end(); it++) {
+    if (*it == previousElement ) {
+      elements_.insert (it+1,currentElement);
+      return true;
+    }
+  }
+  return false;
+}
+
+/*
+bool sectionToExecute::setSoftware(nomDeLogiciel logiciel) {
+  
+  if (sectionToExecuteNumber >= sectionToExecute_.size()) {
+    return false;
+  }
+  
+  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;
+}
+*/