Changeset 17945

Timestamp:

05/06/14 08:29:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make sure writedata uses the Enum if provided

Location:

issm/trunk-jpl/src/m/solve

Files:

• WriteData.m (modified) (1 diff)
• WriteData.py (modified) (1 diff)

issm/trunk-jpl/src/m/solve/WriteData.m

@@ -14 +14 @@
         fieldname = getfieldvalue(options,'fieldname');
         classname = getfieldvalue(options,'class',class(obj));
-
-        enum      = BuildEnum([classname '_' fieldname]);
+        if exist(options,'enum'),
+                enum = getfieldvalue(options,'enum');
+        else
+                enum = BuildEnum([classname '_' fieldname]);
+        end
         data      = obj.(fieldname);
 else

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -24 +24 @@
                 fieldname = options.getfieldvalue('fieldname')
                 classname = options.getfieldvalue('class',str(type(obj)).rsplit('.')[-1].split("'")[0])
-
-                enum      = BuildEnum(classname+'_'+fieldname)
+                if options.exist('enum'):
+                        enum = options.getfieldvalue('enum')
+                else:
+                        enum = BuildEnum(classname+'_'+fieldname)
                 data      = getattr(obj,fieldname)
         else: