From a2090e2f224821a79ff2ccd3a6144fe5a04bbe26 Mon Sep 17 00:00:00 2001
From: Jacques Grelet <jacques.grelet@ird.fr>
Date: Fri, 4 Sep 2009 14:16:22 +0000
Subject: [PATCH] =?UTF-8?q?correction=20d'un=20bug=20a=20la=20lecture=20qu?=
=?UTF-8?q?i=20dupliquait=20le=20tableau=20de=20char=20des=20variables=20?=
=?UTF-8?q?=5FCALCOEFF=5FCONV=20lorsque=20la=20variables=20des=20coefficie?=
=?UTF-8?q?nts=20associ=C3=A9es=20=C3=A9tait=20nulle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tsg_util/updateTsgStructWithCalCoeff.m | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/tsg_util/updateTsgStructWithCalCoeff.m b/tsg_util/updateTsgStructWithCalCoeff.m
index 09fdeca..537cb18 100644
--- a/tsg_util/updateTsgStructWithCalCoeff.m
+++ b/tsg_util/updateTsgStructWithCalCoeff.m
@@ -18,12 +18,17 @@ tsg = getappdata( hMainFig, 'tsg_data');
% -----------------------------
var = {'SSJT_CALCOEF', 'CNDC_CALCOEF', 'SSTP_CALCOEF'};
-% define coefficients names
-% -------------------------
-coeff_type = {{'DATE','A','B','C','D','F0',''},{'DATE','A','B','C','D','M','CPCOR'},...
- {'DATE','A','B','C','D','F0',''}; ...
- {'DATE','G','H','I','J','F0',''},{'DATE','G','H','I','J','CTCOR','CPCOR'},...
- {'DATE','G','H','I','J','F0',''}};
+% define coefficients names, celle array with first element with size
+% COEF_CONV_SIZE
+% -------------------------------------------------------------------
+coeff_type = ...
+ {{padding('DATE',tsg.dim.COEF_CONV_SIZE);'A';'B';'C';'D';'F0';''},...
+ {padding('DATE',tsg.dim.COEF_CONV_SIZE);'A';'B';'C';'D';'M';'CPCOR'},...
+ {padding('DATE',tsg.dim.COEF_CONV_SIZE);'A';'B';'C';'D';'F0';''}; ...
+ {padding('DATE',tsg.dim.COEF_CONV_SIZE);'G';'H';'I';'J';'F0';''},...
+ {padding('DATE',tsg.dim.COEF_CONV_SIZE);'G';'H';'I';'J';'CTCOR';'CPCOR'},...
+ {padding('DATE',tsg.dim.COEF_CONV_SIZE);'G';'H';'I';'J';'F0';''}
+ };
% get preference choice for cabrations type popup
% -----------------------------------------------
@@ -36,17 +41,16 @@ for i = 1:numel(var)
tsg.([var{i} '_CONV']) = [];
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
elseif isnan(tsg.(var{i}))
tsg.([var{i} '_CONV']) = [];
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
+ % convert cell array of string to char array
+ % ------------------------------------------
+ tsg.([var{i} '_CONV']) = char(coeff_type{pref,i});
end
% Save tsg structure
--
GitLab