Changeset 13349

Timestamp:

09/12/12 22:12:28 (13 years ago)

Author:

Eric.Larour

Message:

CHG: new GenericParamEnum enum.

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/GenericParamEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -264 +264 @@
         /*}}}*/
         /*Objects {{{1*/
+        GenericParamEnum,
         AdolcParamEnum,
         BoolInputEnum,

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -261 +261 @@
                 case VerticesEnum : return "Vertices";
                 case ResultsEnum : return "Results";
+                case GenericParamEnum : return "GenericParam";
                 case AdolcParamEnum : return "AdolcParam";
                 case BoolInputEnum : return "BoolInput";

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -268 +268 @@
               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
               else if (strcmp(name,"Results")==0) return ResultsEnum;
+              else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
               else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
               else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
@@ -383 +384 @@
               else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
               else if (strcmp(name,"Vz")==0) return VzEnum;
-              else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
+              if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
+              else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
               else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
               else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -2449 +2449 @@
         return StringToEnum('Results')[0]
 
+def GenericParamEnum():
+        """
+        GENERICPARAMENUM - Enum of GenericParam
+
+           Usage:
+              macro=GenericParamEnum()
+        """
+
+        return StringToEnum('GenericParam')[0]
+
 def AdolcParamEnum():
         """
@@ -4747 +4757 @@
         """
 
-        return 473
-
+        return 474
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=473;
+macro=474;