diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m index 4b95a6e0e2c19bc7c3402c49404743f65fa02807..1e3bbf64e558d90bf1c6346ca9782cdef7f5251a 100644 --- a/tsg_io/readTsgDataLabview.m +++ b/tsg_io/readTsgDataLabview.m @@ -85,33 +85,15 @@ if fid ~= -1 tsg.LONX = lon; tsg.SSJT = sst; tsg.SSPS = sss; + tsg.SPDC = sog; % Remplacer la valeur par tsg.qc.code.NOCONTROL tsg.SSPS_QC = ones(nblig,1); - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %tsg.SSPS_ADJ = tsgData(:,12); - %tsg.SSPS_ERR = tsgData(:,13); - - tsg.SPDC = sog; - - % Compute ship velocity from positions if sog not available - % --------------------------------------------------------- - if isempty(tsg.SPDC) - range = m_lldist(tsg.LONX,tsg.LATX); - ind = size(tsg.DAYD); - tsg.SPDC = zeros(size(ind)); - for i=1:length(tsg.DAYD)-1 - tsg.SPDC(i) = range(i) / ((tsg.DAYD(i+1)-tsg.DAYD(i)) * 24 * 1.854); - end - tsg.SPDC = [tsg.SPDC';0]; - end % populate tsg.file structure % --------------------------- tsg.file.name = filename; - tsg.file.type = 'ASCII'; + tsg.file.type = 'LABVIEW'; % Save the data in the application GUI % ------------------------------------ diff --git a/tsg_io/readTsgDataTxt.m b/tsg_io/readTsgDataTxt.m index c90503a52599304f1c25b1d82b5f4ce4dc55aa11..096bab7c55115595fb5373f0a6dfa703c31bd4dc 100644 --- a/tsg_io/readTsgDataTxt.m +++ b/tsg_io/readTsgDataTxt.m @@ -60,23 +60,9 @@ tsg.LONX = tsgData(:,8); tsg.SSJT = tsgData(:,9); tsg.SSPS = tsgData(:,10); tsg.SSPS_QC = tsgData(:,11); -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% tsg.SSPS_ADJ = tsgData(:,12); tsg.SSPS_ERR = tsgData(:,13); -% Compute ship velocity from positions if sog not available -% --------------------------------------------------------- -if isempty(tsg.SPDC) - range = m_lldist(tsg.LONX,tsg.LATX); - ind = size(tsg.DAYD); - tsg.SPDC = zeros(size(ind)); - for i=1:length(tsg.DAYD)-1 - tsg.SPDC(i) = range(i) / ((tsg.DAYD(i+1)-tsg.DAYD(i)) * 24 * 1.854); - end - tsg.SPDC = [tsg.SPDC';0]; -end - % populate tsg.file structure % --------------------------- tsg.file.name = filename;