From 49a49ccfa51fcd5feee975c220e9dfeb04117d4e Mon Sep 17 00:00:00 2001
From: Yves Gouriou <yves.gouriou@ird.fr>
Date: Fri, 22 Nov 2013 15:16:10 +0000
Subject: [PATCH] Dans UIGETFILE modifie l'ordre d'affichage d'ouverture des
fichiers *.lbv en premier
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Module de correction.
Les corrections sont appliquées au données "No Control".
Ce ne devrait pas être le cas : décocher cette option.
Les corrections ne sont pas appliquées aux données "Harbour" : le proposer par défaut
---
TSGQC_amelioration.xls | Bin 61440 -> 65024 bytes
tsg_io/read_data.m | 47 +++++++++++++++++++++--------------------
tsgqc.m | 12 +++++------
3 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls
index 82f11c7d27ac5f35deb028795ec5ddde835844da..f2005ec6f344c04d52743d053c97ef78bf0bf68f 100644
GIT binary patch
delta 4061
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
delta 2103
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
D5wGU#
diff --git a/tsg_io/read_data.m b/tsg_io/read_data.m
index fbcffcf..455374e 100644
--- a/tsg_io/read_data.m
+++ b/tsg_io/read_data.m
@@ -14,18 +14,18 @@ function [errTsg, errSpl] = read_data( hMainFig, filterIndex, fullFileName)
% errSpl Error code for discrete data file
%
% Filter index values
-% 1 - Argo file *.arg (G. Reverdin format)
-% 2 - TSG Astrolabe text file *.ast
-% 3 - WS ascii file *.btl (tsgqc ascci format)
-% 4 - TSG labview file *.lbv
-% 5 - TSG netcdf file *.nc
-% 6 - TSG Oracle text file *.ora
-% 7 - TSG SDF file *.sdf
-% 8 - SPL ascii file *.spl (tsgqc ascci format)
-% 9 - TSG Nuka transmit file *.transmit*
-% 10 - TSG text file *.tsgqc (tsgqc ascci format)
-% 11 - TSG XML file *.xml
-% 12 - Seasave file .cnv
+% *.arg - Argo file (G. Reverdin format)
+% *.ast - TSG Astrolabe text file
+% *.btl - WS ascii file (tsgqc ascci format)
+% *.lbv - TSG labview file
+% *.nc - TSG netcdf file
+% *.ora - TSG Oracle text file
+% *.sdf - TSG SDF file
+% *.spl - SPL ascii file (tsgqc ascci format)
+% *.transmit* - TSG Nuka transmit file
+% *.tsgqc - TSG text file (tsgqc ascci format)
+% *.xml - TSG XML file
+% *.cnv - Seasave file
%
% errTsg, errSpl
% 1 - File read OK
@@ -46,7 +46,7 @@ switch filterIndex
% Read discrete data (Water sample, Argo, etc.)
% ---------------------------------------------
- case {1, 3, 8}
+ case {'*.arg', '*.btl', '*.spl'}
% A TSG file must have been uploaded before reading Water sample file
% --------------------------------------------------------------------
@@ -67,7 +67,8 @@ switch filterIndex
% Read TSG data file
% ------------------
- case {2, 4, 5, 6, 7, 9, 10, 11, 12}
+% case {2, 4, 5, 6, 7, 9, 10, 11, 12}
+ case {'*.ast', '*.lbv', '*.nc', '*.ora', '*.sdf', '*.transmit', '*.tsgqc', '*.xml', '*.cnv'}
% Save the TSG structure - Temporary variable
% -------------------------------------------
@@ -80,23 +81,23 @@ switch filterIndex
% Read the file. TSG values are stored in a tsg variable
% -------------
switch filterIndex
- case 2 % read TSG Astrolabe text file *.ast
+ case '*.ast' % read TSG Astrolabe text file *.ast
errTsg = readTsgDataAstrolabe(hMainFig, fullFileName);
- case 4 % read TSG labview file *.lbv
+ case '*.lbv' % read TSG labview file *.lbv
errTsg = readTsgDataLabview(hMainFig, fullFileName );
- case 5 % read TSG netcdf file *.nc
+ case '*.nc' % read TSG netcdf file *.nc
errTsg = readTsgDataNetCDF(hMainFig, fullFileName );
- case 6 % read TSG Oracle text file *.ora
+ case '*.ora' % read TSG Oracle text file *.ora
errTsg = readTsgDataOracle(hMainFig, fullFileName);
- case 7 % read TSG SDF file *.sdf
+ case '*.sdf' % read TSG SDF file *.sdf
errTsg = readTsgDataSDF(hMainFig, fullFileName );
- case 9 % read TSG Nuka transmit file *.transmit*
+ case '*.transmit*' % read TSG Nuka transmit file *.transmit*
errTsg = readTsgDataNuka(hMainFig, fullFileName);
- case 10 % read TSG text file *.tsgqc
+ case '*.tsgqc' % read TSG text file *.tsgqc
errTsg = readAsciiTsg(hMainFig, fullFileName);
- case 11 % read TSG XML file *.xml
+ case '*.xml' % read TSG XML file *.xml
errTsg = readTsgDataXML(hMainFig, fullFileName );
- case 12 % read TSG XML file *.xml
+ case '*cnv' % read TSG XML file *.cnv
errTsg = readTsgSeasave(hMainFig, fullFileName );
end
diff --git a/tsgqc.m b/tsgqc.m
index 83ed87a..3d16ac0 100644
--- a/tsgqc.m
+++ b/tsgqc.m
@@ -861,7 +861,7 @@ for key = qc_list
state = tsg.qc.hash.(key).state;
value = 0;
- if strcmp(char(key), 'NO_CONTROL') || strcmp(char(key), 'GOOD') ||...
+ if strcmp(char(key), 'HARBOUR') || strcmp(char(key), 'GOOD') ||...
strcmp(char(key), 'PROBABLY_GOOD')
value = 1;
end
@@ -1232,9 +1232,9 @@ hrbInterpCancel = uicontrol( ...
% Open standard dialog box for retrieving files
% ---------------------------------------------
- [fileName, pathname, filterIndex] = uigetfile( ...
- {'*.arg';'*.ast';'*.btl';'*.lbv';'*.nc';'*.ora';'*.sdf';'*.spl';...
- '*.transmit*'; '*.tsgqc';'*.xml';'*.cnv'}, 'Pick a file');
+ fileExtension = ({'*.lbv';'*.nc';'*.arg';'*.ast';'*.btl';'*.ora';...
+ '*.sdf';'*.spl'; '*.transmit*'; '*.tsgqc';'*.xml';'*.cnv'});
+ [fileName, pathname, filterIndex] = uigetfile( fileExtension, 'Pick a file');
% flushes the event queue and updates the closed uigetfile window
% ---------------------------------------------------------------
@@ -1255,8 +1255,8 @@ hrbInterpCancel = uicontrol( ...
% Read the data
% -------------
- [errTsg, errSpl] = read_data( hMainFig, filterIndex, fullFileName);
-
+ [errTsg, errSpl] = read_data( hMainFig, char(fileExtension(filterIndex)), fullFileName);
+
% Get the tsg structure
% ---------------------
tsg = getappdata( hMainFig, 'tsg_data');
--
GitLab