Changeset 9683

Timestamp:

09/08/11 10:34:00 (14 years ago)

Author:

Mathieu Morlighem

Message:

added enum overloading

Location:

issm/trunk/src/m

Files:

• classes/model/modelfield.m (modified) (1 diff)
• model/marshall.m (modified) (1 diff)

issm/trunk/src/m/classes/model/modelfield.m

@@ -11 +11 @@
                 format='Int';
                 mattype=0;
+                parameters=false;
+                enum=NoneEnum;
         end
         methods

issm/trunk/src/m/model/marshall.m

@@ -63 +63 @@
 %first recover data, enum of the data and type of data
 data=fieldvalue;
-enum=BuildEnum(fieldname);
+if fieldprop.enum==NoneEnum,
+        enum=BuildEnum(fieldname);
+else
+        %Field enum overloaded
+        enum=fieldprop.enum;
+end
 data_type=fieldprop.format;