Changeset 179 in PSPA for Interface_Web/trunk/pspaWT/src/nomdElements.cc

Timestamp:

Dec 13, 2012, 7:25:01 PM (12 years ago)

Author:

lemeur

Message:

ajout d'un element 'beam' (transport)

File:

• Interface_Web/trunk/pspaWT/src/nomdElements.cc (modified) (11 diffs)

Interface_Web/trunk/pspaWT/src/nomdElements.cc

@@ -11 +11 @@
   else if( strstr(s.c_str(),"bend") ) return bend;
   else if( strstr(s.c_str(),"lens") ) return soleno;
+  else if( strstr(s.c_str(),"beam") ) return beam;
   return inconnu;
 }
@@ -22 +23 @@
   case bend : return "BENDING MAGNET"; break;
   case soleno : return "SOLENOID"; break;
+  case beam : return "BEAM"; break;
   default : return "UNKNOWN";
   }
@@ -34 +36 @@
   case bend : return string("icons/bend.jpg"); break;
   case soleno :  return string("icons/lens.jpg"); break;
+  case beam : return string("icons/beam.jpg"); break;
   default : return string("");
   }
@@ -46 +49 @@
   case bend :  return "bend";
   case soleno :   return "solnd";
+  case beam : return "beam";
   default : return string("");
+  }
+}
+
+unsigned nomdElements::toNbParam(typedElement eType)
+{
+  switch(eType) {
+  case RFgun : return 6;
+  case drift :  return 2;
+  case cell :  return 9;
+  case bend :  return 5;
+  case soleno :   return 3;
+  case beam : return 7;
+  default : return 0;
   }
 }
@@ -57 +74 @@
   eImg_ = toImage(e_);
   eLabel_ = toLabel(e_);
+  nbParam_ = toNbParam(e_);
 }
 
@@ -65 +83 @@
   eImg_ = ne.eImg_;
   eLabel_ = ne.eLabel_;
+  nbParam_ = ne.nbParam_;
 }
 
@@ -73 +92 @@
   eImg_ = ne.eImg_;
   eLabel_ = ne.eLabel_;
+  nbParam_ = ne.nbParam_;
 }
  
@@ -82 +102 @@
   eImg_ = toImage(e_);
   eLabel_ = toLabel(e_);
+  nbParam_ = toNbParam(e_);
 }
 
@@ -90 +111 @@
   eImg_ = toImage(e_);
   eLabel_ = toLabel(e_);
+  nbParam_ = toNbParam(e_);
 }
 
@@ -126 +148 @@
 }
 
+unsigned nomdElements::getElementNbParameters() const
+{
+  return nbParam_;
+}
 
 
@@ -137 +163 @@
   eImg_ = ne.eImg_;
   eLabel_ = ne.eLabel_;
+  nbParam_ = ne.nbParam_;
 }