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

Timestamp:

Feb 5, 2014, 11:45:11 AM (10 years ago)

Author:

touze

Message:

ajout de quadrupole et sextupole

File:

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

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

@@ -20 +20 @@
 #include "elementSnapshot.h"
 #include "elementMultipole.h"
+#include "elementQuadrupole.h"
+#include "elementSextupole.h"
 
 sector::sector(dataManager* data, std::string name):
@@ -36 +38 @@
 }
 
-abstractElement* sector::addElementAfter(nomdElements::typedElement eType ,abstractElement* previousElement){
+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 ) {
+  switch (  eType ) 
+    {
     case nomdElements::RFgun :
       currentElement = new elementRfgun();
@@ -66 +70 @@
       currentElement = new elementMultipole();
       break;
+    case nomdElements::qpole  :
+      currentElement = new elementQuadrupole();
+      break;
+    case nomdElements::spole  :
+      currentElement = new elementSextupole();
+      break;
     case nomdElements::snapshot :
-    {
-      // FIXME : Snapshot a gérér
-      /*        int incr = dataManager_->getPspaApplication()->getExtensionFile();
-       incr++;
-       dataManager_->getPspaApplication()->setExtensionFile(incr);
-       */
-      currentElement = new elementSnapshot();
-      break;
+      {
+        // 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;
-  
+  return currentElement; 
 }