Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/nomdElements.h

Timestamp:

Jun 21, 2013, 10:16:56 AM (11 years ago)

Author:

lemeur

Message:

definition des compatibilites des elements dans les software

File:

• Interface_Web/trunk/pspaWT/sources/controler/include/nomdElements.h (modified) (3 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/nomdElements.h

@@ -4 +4 @@
 using namespace std;
 
-enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, snapshot, inconnu};
+// enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, snapshot, inconnu};
 
 
@@ -10 +10 @@
 class nomdElements
 {
+
+ public :
+
+enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, snapshot, inconnu};
+
+ private : 
+
   typedElement e_;  // type entier (enum)
-  std::string eName_;  // nom de l'element
-  std::string eLabel_; // label affiche sous l'icone
+  std::string expandedName_;  // nom generique de l'element
+  std::string genericLabel_; 
   unsigned nbParam_;   // nombre de parametres a saisir
 
   static   typedElement fromString(std::string s);
-  static   typedElement fromLabel(std::string s);
-  static   std::string toName(typedElement eType);
-  static   std::string toLabel(typedElement eType);
+  static   typedElement fromGenericLabel(std::string s);
+  static   std::string toExpandedName(typedElement eType);
+  static   std::string toGenericLabel(typedElement eType);
   static   unsigned toNbParam(typedElement eType);
 
@@ -35 +42 @@
 
   typedElement getElementType() const;
-  std::string getElementName() const;
-  std::string getElementLabel() const;
+  std::string getExpandedName() const;
+  std::string getGenericLabel() const;
   unsigned getElementNbParameters() const;