Skip to content
Snippets Groups Projects
Commit fc154567 authored by jacques.grelet_ird.fr's avatar jacques.grelet_ird.fr
Browse files

do i test in updateTsgStruct to prevent initializing of calcoeff after reading .ini file

change date format in headerForm (YYYYmmdd instead of dd/mm/YYYY)
parent 098c8d84
No related branches found
No related tags found
No related merge requests found
......@@ -258,7 +258,7 @@ uiwait(hHeaderFig);
% -----------------------------------------------------------------------
function editCallback(obj, event)
value = get(obj, 'string');
match = regexp( value, '(\d{2})/(\d{2})/(\d{4})', 'tokens');
match = regexp( value, '^(\d{4})(\d{2})(\d{2})$', 'match');
if isempty(match)
beep;
set(obj, 'string', '');
......@@ -366,7 +366,7 @@ uiwait(hHeaderFig);
tsg.(var)(ii) = NaN;
else
if strcmpi(key, 'DATE')
tsg.(var)(ii) = single(datenumToJulian(datenum(s, 'dd/mm/yyyy')));
tsg.(var)(ii) = single(datenumToJulian(datenum(s, 'yyyymmdd')));
else
tsg.(var)(ii) = single(str2double(s));
end
......@@ -617,7 +617,7 @@ uiwait(hHeaderFig);
if isnan(tsg.(var)(ii))
value = '';
elseif strcmpi(cle, padding('DATE', tsg.dim.COEF_CONV_SIZE))
value = datestr(julianToDatenum(tsg.(var)(ii)), 'dd/mm/YYYY');
value = datestr(julianToDatenum(tsg.(var)(ii)), 'YYYYmmdd');
else
value = num2str(tsg.(var)(ii));
end
......
......@@ -100,20 +100,24 @@ var = {'SSJT_CALCOEF', 'CNDC_CALCOEF', 'SSTP_CALCOEF'};
pref = tsg.preference.coeff_type_value;
for i = 1:numel(var)
for j = 1:tsg.dim.CALCOEF
tsg.(var{i})(j) = NaN;
tsg.([var{i} '_CONV']) = ...
[tsg.([var{i} '_CONV']); padding(coeff_type{pref,i}{j}, tsg.dim.COEF_CONV_SIZE)];
if isempty(tsg.(var{i}))
for j = 1:tsg.dim.CALCOEF
tsg.(var{i})(j) = NaN;
tsg.([var{i} '_CONV']) = ...
[tsg.([var{i} '_CONV']); padding(coeff_type{pref,i}{j}, tsg.dim.COEF_CONV_SIZE)];
end
end
end
var ={'SSJT_LINCOEF', 'CNDC_LINCOEF', 'SSTP_LINCOEF'};
for i = 1:numel(var)
for j = 1:tsg.dim.LINCOEF
tsg.(var{i})(j) = lin_val(j);
tsg.([var{i} '_CONV']) = ...
[tsg.([var{i} '_CONV']); padding(lin_type{j}, tsg.dim.COEF_CONV_SIZE)];
if isempty(tsg.(var{i}))
for j = 1:tsg.dim.LINCOEF
tsg.(var{i})(j) = lin_val(j);
tsg.([var{i} '_CONV']) = ...
[tsg.([var{i} '_CONV']); padding(lin_type{j}, tsg.dim.COEF_CONV_SIZE)];
end
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment