diff --git a/tsg_io/private/choixparametres.m b/tsg_io/private/choixparametres.m
index 374ef054bbd33371a4b679c56de90d9cf1ae31e8..3d6cce7b92a28ed9be1a4681e12132ca027f063f 100644
--- a/tsg_io/private/choixparametres.m
+++ b/tsg_io/private/choixparametres.m
@@ -22,12 +22,14 @@ function [choix, ColNo, paraName, nPara] = choixparametres( fid, DELIMITER )
% paraName ...... Intitule des parametres de la ligne d'entete
% nPara ......... Nombre de parametre total present dans le fichier
%
+% Fontion mere : readTsgDataLabview
+% Fonctions appelees : decodestr, lbvParameterChoice
% ------------------------------------------------------------------------
% Initialisation des indices de colonne que l'on conserve systematiquement
% -------------------------------------------------------------------------
-dateNo = 0; timeNo = 0; tempNo = 0; salNo = 0; condNo = 0; rawNo = 0;
-latNo = 0; lonNo = 0; sogNo = 0; cogNo = 0;
+dateNo = 0; timeNo = 0; tempNo = 0; salNo = 0; salStdNo = 0; condNo = 0;
+rawNo = 0; latNo = 0; lonNo = 0; sogNo = 0; cogNo = 0;
% Lecture de la 1ere ligne
%
@@ -63,7 +65,7 @@ if okCol == 1
% presents dans le fichier intial et qui seront utilises dans TSG-QC
% --------------------------------------------------------------
ColNo = struct( 'Date', 0, 'Time', 0, 'Lat', 0, 'Lon', 0, 'Temp', 0,...
- 'Sal', 0, 'Cond', 0, 'Raw', 0, 'Sog', 0, 'Cog', 0, 'AD1', 0);
+ 'Sal', 0, 'SalStd', 0, 'Cond', 0, 'Raw', 0, 'Sog', 0, 'Cog', 0, 'AD1', 0);
% Boucle sur les numeros de colonnes des parametres qui seront conserves
% ----------------------------------------------------------------------
@@ -88,6 +90,8 @@ if okCol == 1
ColNo.Temp = colParaNo(icol);
elseif strfind( header, 'sal') ~= 0
ColNo.Sal = colParaNo(icol);
+ elseif strfind( header, 'stddev') ~= 0
+ ColNo.SalStd = colParaNo(icol);
elseif strfind( header, 'cond') ~= 0
ColNo.Cond = colParaNo(icol);
elseif strfind( header, 'raw') ~= 0
diff --git a/tsg_io/private/decodeficlabview.m b/tsg_io/private/decodeficlabview.m
index 305246975f003826ade4a085e72edcc0486c4f27..37252ccd2e05b5bef012774fe81f823abb8e45cc 100644
--- a/tsg_io/private/decodeficlabview.m
+++ b/tsg_io/private/decodeficlabview.m
@@ -1,4 +1,4 @@
-function [date, time, lat, lon, sst, sss, cond, condRaw, sog, cog, flow] =...
+function [date, time, lat, lon, sst, sss, sssStd, cond, condRaw, sog, cog, flow] =...
decodeficlabview( fid, DELIMITER, ColNo, paraName, nPara )
%
% Fonction qui permet de lire les fichiers au format LabView
@@ -35,6 +35,8 @@ function [date, time, lat, lon, sst, sss, cond, condRaw, sog, cog, flow] =...
% Avant condRaw = NaN*ones(nblig, 1);
% Maintenant condRaw = char(blanks(1)*ones(nblig,1));
%
+% Fonction mere : readTsgDataLabview
+% Focntions appelees : GPStodegdec
% -------------------------------------------------------------------
% Le nombre d'elements de l'entete determine le nombre de chaine a lire.
@@ -80,6 +82,7 @@ function [date, time, lat, lon, sst, sss, cond, condRaw, sog, cog, flow] =...
lon = NaN*ones(nblig, 1);
sst = NaN*ones(nblig, 1);
sss = NaN*ones(nblig, 1);
+ sssStd = NaN*ones(nblig, 1);
cond = NaN*ones(nblig, 1);
condRaw = char(blanks(1)*ones(nblig,1));
sog = NaN*ones(nblig, 1);
@@ -130,6 +133,9 @@ function [date, time, lat, lon, sst, sss, cond, condRaw, sog, cog, flow] =...
if ColNo.Sal ~= 0
sss = str2num( char(data{ColNo.Sal}{ient}) );
end
+ if ColNo.SalStd ~= 0
+ sssStd = str2num( char(data{ColNo.SalStd}{ient}) );
+ end
if ColNo.Cond ~= 0
cond = str2num( char(data{ColNo.Cond}{ient}) );
end
diff --git a/tsg_io/readTsgDataLabview.m b/tsg_io/readTsgDataLabview.m
index e233026f900ba1338751dfe543053f673b8fb1ca..19d5a8021c040acfa45eedec2c637eca3113869a 100644
--- a/tsg_io/readTsgDataLabview.m
+++ b/tsg_io/readTsgDataLabview.m
@@ -31,6 +31,9 @@ function [error] = readTsgDataLabview( hMainFig, filename )
% Ground spd- N - Ground Spd - K - dd - tete - ttt
% SBE21_AD1,SBE21_AD2
%
+% Focntions appelees : choixparametres, decodeficlabview, readTsgIniLabview
+%
+
% $Id$
% Get the data from the application GUI
@@ -71,7 +74,7 @@ if fid ~= -1
% Lecture et decodage du fichier TSG LabView. En sortie
% ------------------------------------------
- [date, time, lat, lon, sst, sss, cond, TsgRaw, sog, cog, flow] =...
+ [date, time, lat, lon, sst, sss, sssStd, cond, TsgRaw, sog, cog, flow] =...
decodeficlabview( fid, DELIMITER, ColNo, paraName, nPara );
% Nombre de lignes du fichier
@@ -167,6 +170,7 @@ if fid ~= -1
tsg.LONX = lon(noNaN);
tsg.SSJT = sst(noNaN);
tsg.SSPS = sss(noNaN);
+ tsg.SSPS_STD = sssStd(noNaN);
if isempty( find(isnan(tsg.LATX) == 0) )
warndlg( '...No latitude ', 'LabView error dialog');
diff --git a/tsg_util/initParameterChoice.m b/tsg_util/initParameterChoice.m
index 7c5886a1e763d00aa25ca2ec88526638880e1e2a..b8aa0f1059310d5409fdf8a1931dda264e7c5c35 100644
--- a/tsg_util/initParameterChoice.m
+++ b/tsg_util/initParameterChoice.m
@@ -37,6 +37,9 @@ end
if isfield( tsg, 'CNDC' )
pop3 = [ pop3 {'CNDC'} ];
end
+if isfield( tsg, 'SSPS_STD' )
+ pop3 = [ pop3 {'SSPS_STD'} ];
+end
if isfield( tsg, 'FLOW' )
pop3 = [ pop3 {'FLOW' } ];
end
diff --git a/tsgqc.m b/tsgqc.m
index e9b49e4135421f0efd39118a3c843e15b207f24d..dc6c8308b8889029b4da73ae00b9526571ba37d2 100644
--- a/tsgqc.m
+++ b/tsgqc.m
@@ -828,6 +828,7 @@ for key = qc_list
end %end for loop
%% uibutton group panel - Choose the parameter (SSPS - SSTP - SSJT)
+% POP_UP filled in with the function "initParameterChoice"
% -----------------------------------------------------------------------
hbgParameter = uibuttongroup(...
'Parent', hMainFig, ...
@@ -2918,6 +2919,7 @@ hrbInterpCancel = uicontrol( ...
end
%% PopupMenu Select Parameter
+% POP_UP filled in with the function "initParameterChoice"
% ---------------------------
function SelectParameter(hObject, eventdata, nplot)
% Callback function run when the ....