Changeset 16405
- Timestamp:
- 10/15/13 08:15:42 (11 years ago)
- Location:
- issm/trunk-jpl/src/m/classes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/outputdefinition.m
r16388 r16405 7 7 properties (SetAccess=public) 8 8 definitions = {}; 9 end10 properties (SetAccess=private)11 enums = {};12 9 end 13 10 methods … … 23 20 24 21 obj.definitions={}; 25 obj.enums=NaN;26 22 27 23 end % }}} … … 47 43 classdefinition=class(obj.definitions{i}); 48 44 classdefinition(1)=upper(classdefinition(1)); %so it matches our enums definitions. 49 obj.enums(i)=StringToEnum(classdefinition);45 enums(i)=StringToEnum(classdefinition); 50 46 end 51 obj.enums=unique(obj.enums);47 enums=unique(enums); 52 48 53 WriteData(fid,' object',obj,'fieldname','enums','format','DoubleMat','mattype',1);49 WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1); 54 50 end % }}} 55 51 end -
issm/trunk-jpl/src/m/classes/outputdefinition.py
r16388 r16405 16 16 def __init__(self): # {{{ 17 17 self.definitions = [] 18 self.enums = float('NaN')19 18 #}}} 20 19 def __repr__(self): # {{{ … … 37 36 def marshall(self,md,fid): # {{{ 38 37 39 self.enums=npy.zeros(len(self.definitions),)38 enums=npy.zeros(len(self.definitions),) 40 39 41 40 for i in range(len(self.definitions)): … … 43 42 classdefinition=self.definitions[i].__class__.__name__ 44 43 classdefinition=classdefinition[0].upper()+classdefinition[1:] 45 self.enums[i]=StringToEnum(classdefinition)[0]44 enums[i]=StringToEnum(classdefinition)[0] 46 45 47 self.enums=npy.unique(self.enums);46 enums=npy.unique(enums); 48 47 49 WriteData(fid,'object',self,'fieldname','enums','format','DoubleMat','mattype',1) 50 48 WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1); 51 49 # }}}
Note:
See TracChangeset
for help on using the changeset viewer.