Changeset 14215

Timestamp:

01/08/13 07:06:19 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated the way waitonlock is marshalled to be more consistent

Location:

issm/trunk-jpl/src/m/classes

Files:

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

issm/trunk-jpl/src/m/classes/settings.m

@@ -65 +65 @@
                         WriteData(fid,'object',obj,'fieldname','results_as_patches','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean');
+                        if obj.waitonlock>0,
+                                WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',true,'format','Boolean');
+                        else
+                                WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',false,'format','Boolean');
+                        end
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/settings.py

@@ -77 +77 @@
                 WriteData(fid,'object',self,'fieldname','results_as_patches','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','output_frequency','format','Integer')
-                WriteData(fid,'object',self,'fieldname','waitonlock','format','Boolean')
+                if self.waitonlock>0:
+                        WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',True,'format','Boolean');
+                else:
+                        WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',False,'format','Boolean');
         # }}}