Changeset 474 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/sector.cc

Timestamp:

Jan 2, 2014, 10:15:24 PM (10 years ago)

Author:

garnier

Message:

prise en charge de la restauration dun fichier de sauvegarde

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/sector.cc (modified) (3 diffs)

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

@@ -11 +11 @@
 #include "sectionToExecute.h"
 #include "dataManager.h"
+#include "elementDrift.h"
+#include "elementRfgun.h"
+#include "elementCell.h"
+#include "elementSoleno.h"
+#include "elementBend.h"
+#include "elementBeam.h"
+#include "elementFit.h"
+#include "elementSnapshot.h"
+#include "elementMultipole.h"
 
 sector::sector(dataManager* data, std::string name):
@@ -27 +36 @@
 }
 
+abstractElement* sector::addElementAfter(nomdElements::typedElement eType ,abstractElement* previousElement){
+
+  // create a new abstractElement
+  // FIXME : To be move in an abstractFactory in the controler !!
+  abstractElement* currentElement = NULL;
+  switch (  eType ) {
+    case nomdElements::RFgun :
+      currentElement = new elementRfgun();
+      break;
+    case nomdElements::drift :
+      currentElement = new elementDrift();
+      break;
+    case nomdElements::cell  :
+      currentElement = new elementCell();
+      break;
+    case nomdElements::bend  :
+      currentElement = new elementBend();
+      break;
+    case nomdElements::soleno  :
+      currentElement = new elementSoleno();
+      break;
+    case nomdElements::beam  :
+      currentElement = new elementBeam();
+      break;
+    case nomdElements::fit  :
+      currentElement = new elementFit();
+      break;
+    case nomdElements::mpole  :
+      currentElement = new elementMultipole();
+      break;
+    case nomdElements::snapshot :
+    {
+      // FIXME : Snapshot a gérér
+      /*        int incr = dataManager_->getPspaApplication()->getExtensionFile();
+       incr++;
+       dataManager_->getPspaApplication()->setExtensionFile(incr);
+       */
+      currentElement = new elementSnapshot();
+      break;
+    }
+  }
+  if (!currentElement) {
+    return NULL;
+  }
+  addElementAfter(currentElement,previousElement);
+  return currentElement;
+  
+}
+
+
 void sector::addElementAfter(abstractElement* currentElement ,abstractElement* previousElement){
 // if the previous element is NULL, it will try to add at the beginning of the first section
@@ -32 +91 @@
   if (previousElement == NULL) {
     if (sectionToExecute_.size() == 0) {
-      sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_));
+      sectionToExecute_.push_back(new sectionToExecute(currentElement,NULL,dataManager_,this));
     } else {
         sectionToExecute* section = sectionToExecute_.front();