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

Timestamp:

Nov 20, 2012, 8:58:23 PM (12 years ago)

Author:

lemeur

Message:

suppression methodes redondantes (suite)

File:

• Interface_Web/trunk/pspaWT/include/elementsCollection.h (modified) (2 diffs)

Interface_Web/trunk/pspaWT/include/elementsCollection.h

@@ -11 +11 @@
 #include "elementSoleno.h"
 #include "elementBend.h"
+#include "nomdElements.h"
 
 
@@ -49 +50 @@
  inline int size() { return elements_.size(); }
 
-inline abstractElement* createNewDrift()
- {
-   elements_.push_back(new elementDrift());
-   return elements_.back();
- }
 
-inline abstractElement* createNewInitialBeam()
- {
-   elements_.push_back(new elementInitialBeam());
-   return elements_.back();
- }
-
-inline abstractElement* createNewCell()
- {
-   elements_.push_back(new elementCell());
-   return elements_.back();
- }
-
-
-inline abstractElement* createNewSoleno()
- {
-   elements_.push_back(new elementSoleno());
-   return elements_.back();
- }
-
-inline abstractElement* createNewBend()
- {
-   elements_.push_back(new elementBend());
-   return elements_.back();
- }
-
+abstractElement* addElement(nomdElement elemType)
+{
+  switch ( elemType ) 
+    {
+    case initialBeam : 
+      {
+        elements_.push_back(new elementInitialBeam());
+        break;
+      }
+    case drift : 
+      {
+        elements_.push_back(new elementDrift());
+        break;
+      }
+    case cell : 
+      {
+        elements_.push_back(new elementCell());
+        break;
+      }
+    case soleno : 
+      {
+        elements_.push_back(new elementSoleno());
+        break;
+      }
+    case bend : 
+      {
+        elements_.push_back(new elementBend());
+        break;
+      }
+    default : 
+      {
+        cerr << " elementsCollection::addElement : ERROR unknown type of element : " << elemType << endl;
+        return NULL;
+      }
+    }
+  return elements_.back();
+}