Changeset 15049 for issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

Timestamp:

05/20/13 17:14:10 (12 years ago)

Author:

Eric.Larour

Message:

CHG: created new Contours class, and took out whatever functionality was not DataSet specific from the DataSet container. Moving towards transferring DataSet and Object to shared library to severe ties between classes and toolkits

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶

@@ -327 +327 @@
               else if (strcmp(name,"Materials")==0) return MaterialsEnum;
               else if (strcmp(name,"Nodes")==0) return NodesEnum;
+              else if (strcmp(name,"Contours")==0) return ContoursEnum;
               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
               else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum;
-              else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"StringParam")==0) return StringParamEnum;
+              if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum;
+              else if (strcmp(name,"StringParam")==0) return StringParamEnum;
               else if (strcmp(name,"Tria")==0) return TriaEnum;
               else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum;
@@ -505 +506 @@
               else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
               else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
-              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Step")==0) return StepEnum;
+              if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
+              else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;