Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/nomdElements.cc

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/src/nomdElements.cc (modified) (11 diffs)

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

@@ -4 +4 @@
 #include "nomdElements.h"
 
-typedElement nomdElements::fromString(std::string s)
+nomdElements::typedElement nomdElements::fromString(std::string s)
 {
   if( strstr(s.c_str(),"beam") ) return beam;
@@ -17 +17 @@
 }
 
-typedElement nomdElements::fromLabel(std::string s)
+nomdElements::typedElement nomdElements::fromGenericLabel(std::string s)
 {
   if( s == "beam" ) return beam;
@@ -30 +30 @@
 }
 
-std::string nomdElements::toName(typedElement eType)
+std::string nomdElements::toExpandedName(nomdElements::typedElement eType)
 {
   switch(eType) {
@@ -45 +45 @@
 }
 
-std::string nomdElements::toLabel(typedElement eType)
+std::string nomdElements::toGenericLabel(nomdElements::typedElement eType)
 {
   switch(eType) {
@@ -60 +60 @@
 }
 
-unsigned nomdElements::toNbParam(typedElement eType)
+unsigned nomdElements::toNbParam(nomdElements::typedElement eType)
 {
   switch(eType) {
@@ -79 +79 @@
 {
   e_= fromString("");
-  eName_ = toName(e_);
-  eLabel_ = toLabel(e_);
+  expandedName_ = toExpandedName(e_);
+  genericLabel_ = toGenericLabel(e_);
   nbParam_ = toNbParam(e_);
 }
@@ -87 +87 @@
 {
   e_= ne.e_;
-  eName_ = ne.eName_;
-  eLabel_ = ne.eLabel_;
+  expandedName_ = ne.expandedName_;
+  genericLabel_ = ne.genericLabel_;
   nbParam_ = ne.nbParam_;
 }
@@ -95 +95 @@
 {
   e_= ne.e_;
-  eName_ = ne.eName_;
-  eLabel_ = ne.eLabel_;
+  expandedName_ = ne.expandedName_;
+  genericLabel_ = ne.genericLabel_;
   nbParam_ = ne.nbParam_;
 }
@@ -104 +104 @@
 {
   e_= fromString(s);
-  eName_ = toName(e_);
-  eLabel_ = toLabel(e_);
+  expandedName_ = toExpandedName(e_);
+  genericLabel_ = toGenericLabel(e_);
   nbParam_ = toNbParam(e_);
 }
 
-nomdElements::nomdElements(typedElement& eType) 
+nomdElements::nomdElements(nomdElements::typedElement& eType) 
 {
   e_= eType;
-  eName_ = toName(e_);
-  eLabel_ = toLabel(e_);
+  expandedName_ = toExpandedName(e_);
+  genericLabel_ = toGenericLabel(e_);
   nbParam_ = toNbParam(e_);
 }
@@ -121 +121 @@
 }
 
-std::string nomdElements::getLabelFromType(typedElement tp)
+std::string nomdElements::getLabelFromType(nomdElements::typedElement tp)
 {
-  return toLabel(tp);
+  return toGenericLabel(tp);
 }
 
-typedElement nomdElements::getTypeFromLabel(std::string lb)
+nomdElements::typedElement nomdElements::getTypeFromLabel(std::string lb)
 {
-  return fromLabel(lb);
+  return fromGenericLabel(lb);
 }
 
 
-typedElement nomdElements::getElementType() const {
+nomdElements::typedElement nomdElements::getElementType() const {
   return e_;
 }
 
-std::string nomdElements::getElementName() const {
-  return eName_;
+std::string nomdElements::getExpandedName() const {
+  return expandedName_;
 }
 
-std::string nomdElements::getElementLabel() const {
-  return eLabel_;
+std::string nomdElements::getGenericLabel() const {
+  return genericLabel_;
 }
 
@@ -156 +156 @@
 {
   e_= ne.e_;
-  eName_ = ne.eName_;
-  eLabel_ = ne.eLabel_;
+  expandedName_ = ne.expandedName_;
+  genericLabel_ = ne.genericLabel_;
   nbParam_ = ne.nbParam_;
   return *this;