Changeset 401 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElementFactory.cc

Timestamp:

Mar 27, 2013, 5:47:22 PM (11 years ago)

Author:

garnier

Message:

merge avec la branche 12_03_12-managerComboBox

Location:

Interface_Web/trunk/pspaWT

Files:

• . (modified) (1 prop)
• sources/userInterface/src/GWt_abstractElementFactory.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElementFactory.cc

@@ -99 +99 @@
 {
   vector <GWt_abstractElement*> elems;
-  if (isDriftElementEnable) {
-    elems.push_back(new GWt_drift());
+  if (isRFGunElementEnable) {
+    elems.push_back(new GWt_rfgun());
   }
   if (isBeamElementEnable) {
     elems.push_back(new GWt_beam());
+  }
+  if (isDriftElementEnable) {
+    elems.push_back(new GWt_drift());
   }
   if (isBendElementEnable) {
@@ -111 +114 @@
     elems.push_back(new GWt_cell());
   }
+  if (isSolenoElementEnable) {
+    elems.push_back(new GWt_soleno());
+  }
   if (isFitElementEnable) {
     elems.push_back(new GWt_fit());
-  }
-  if (isRFGunElementEnable) {
-    elems.push_back(new GWt_rfgun());
-  }
-  if (isSolenoElementEnable) {
-    elems.push_back(new GWt_soleno());
   }
   if (isSnapshotElementEnable) {