diff --git a/@netcdf_native/tsgqc_netcdf.csv b/@netcdf_native/tsgqc_netcdf.csv index 4db662839fa939c6952eeb9e49e0d214ea60453e..1d6d044a2d2961e2e552f0837978a23098cc3d6b 100644 --- a/@netcdf_native/tsgqc_netcdf.csv +++ b/@netcdf_native/tsgqc_netcdf.csv @@ -96,10 +96,10 @@ $ATTRIBUTES$ #;PROJECT_NAME;PROJECT NAME:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSRAL|TSG_Recherche;1;0.1;0.02;;right;Name of project which operates the TSG line, ex: ORE-SSS;# #;SHIP_CALL_SIGN;SHIP CALL SIGN:;;edit;;;;;;right;Ship call sign;# #;SHIP_MMSI;SHIP MMSI:;;edit;;;;;;right;Ship MMSI (ASN) number;# -#;DATE_TSG;TSG INSTALL DATE;;edit;;;;;;right;TSG installation date, format: yyyymmdd;# +#;DATE_TSG;TSG INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;TSG installation date, format: yyyymmddHHMMSS;# #;TYPE_TSG;TYPE TSG:;;popupmenu;SBE21|SBE45|UNKNO;1;0.1;0.02;;right;Thermosalinograph model number;# #;NUMBER_TSG;NUMBER TSG:;;edit;;;;;;right;TSG serial number;# -#;DATE_TINT;TINT INSTALL DATE;;edit;;;;;;right;TINT installation date, format: yyyymmdd;# +#;DATE_TINT;TINT INSTALL DATE;yyyymmddHHMMSS;edit;;;;;;right;TINT installation date, format: yyyymmddHHMMSS;# #;TYPE_TINT;TYPE TINT:;;popupmenu;SBE38|SBE3S|UNKNO|NA;1;0.1;0.02;;right;External sea surface temperature sensor;# #;NUMBER_TINT;NUMBER TINT:;;edit;;;;;;right;External temperature sensor serial number;# #;DATA_TYPE;DATA TYPE:;;popupmenu;TRAJECTORY|PROFIL|TIME_SERIE;1;;;;right;Describe data type contained in file, eg: TRAJECTORY, PROFIL or TIME_SERIE;# @@ -118,7 +118,7 @@ $ATTRIBUTES$ #;DATA_RESTRICTIONS;DATA RESTRICTIONS:;;edit;NONE;;;;;right;Restriction on use for these data;# #;CITATION;CITATION:;;edit;;;;;;left;This citation should be used for publications;# #;COMMENT;COMMENT:;;edit;;;;;;right;;# -#;PI_NAME;PI NAME:;;popupmenu;Denis Diverres|David Varillon|Thierry Delcroix|Yves Gouriou|Bernard Bourles|Gilles Reverdin|Rosemary Morrow|Emilie Brion|Magali Krieger;1;0.1;0.02;;right;Name of principal investigator in charge of the TSG, ex: Delcroix;# +#;PI_NAME;PI NAME:;;popupmenu;Denis Diverres|David Varillon|Thierry Delcroix|Yves Gouriou|Bernard Bourles|Gilles Reverdin|Rosemary Morrow|Emilie Brion|Magali Krieger|Julien Perrier;1;0.1;0.02;;right;Name of principal investigator in charge of the TSG, ex: Delcroix;# #;DATA_CENTRE;DATA CENTRE:;;edit;;;;;;right;Code for data center (2 char);# #;DATA_ACQUISITION;DATA ACQUISITION:;;popupmenu;IRD|GENAVIR|SHOM|CNRS|IPEV|IFREMER;1;0.1;0.02;;right;Acquisition data centre, ex: SHOM,IRD,GENAVIR,CNRS,...;# #;PROCESSING_CENTRE;PROCESSING CENTRE:;;popupmenu;ORE-SSS|CORIOLIS|IRD|SISMER|SURVOSTRAL|SO_TSG_RECHERCHE;1;0.1;0.02;;right;Processing data centre, ex: ORE-SSS,CORIOLIS,SISMER,...;# diff --git a/@netcdf_native/tsgqc_netcdf.xls b/@netcdf_native/tsgqc_netcdf.xls index f1985238454f3b396d4d1ee95da4cfd8dd8621b1..afb308c1f93c2ab93a04da04b65e2c81d68303f6 100644 Binary files a/@netcdf_native/tsgqc_netcdf.xls and b/@netcdf_native/tsgqc_netcdf.xls differ diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls index 9dffed059bebb007841c3c627dd92ead1061875f..6244b0a227519e0d817008741c564cf3ff96e671 100644 Binary files a/TSGQC_amelioration.xls and b/TSGQC_amelioration.xls differ diff --git a/tsgqc.m b/tsgqc.m index 7f463105c102757d4ca9c753aed39df2f1208b54..b94ba7397120c88b9ea3923179489fc4d198b1ab 100644 --- a/tsgqc.m +++ b/tsgqc.m @@ -1,5 +1,5 @@ %% -function tsgqc +function tsgqc( varargin ) % TSGQC: Thermosalinograph (TSG) Quality Control software % % $Id$ @@ -37,11 +37,11 @@ global NETCDF_FORMAT_VERSION % version number, may be used to initialize some files when it change % 0.90x -> 1.0RCx % ------------------------------------------------------------------- -VERSION = 1.23; % -> 1.3 -CHAR_VERSION = '1.23'; +VERSION = 1.24; % -> 1.3 +CHAR_VERSION = '1.24'; % netcdf file version, see DATA FORMAT TSG document: -% CORTSG_format_gosud_1.5.doc +% CORTSG_format_gosud.doc % -------------------------------------------------- NETCDF_FORMAT_VERSION = '2.0'; @@ -104,6 +104,38 @@ guiLimits(2) = guiLimits(2) + 0.05; guiLimits(3) = guiLimits(3) - 0.02; guiLimits(4) = guiLimits(4) - 0.15; +%% Optional arguments +% -------------------- +inputFile = ''; +outputFile = ''; +display = 'off'; + +% parse and set optional arguments with couple 'property', 'value' +% ----------------------------------------------------------------- +property_argin = varargin(1:end); +while length(property_argin) >= 2, + property = property_argin{1}; + value = property_argin{2}; + property_argin = property_argin(3:end); + switch lower(property) + case {'inputfile', 'input'} + inputFile = value; + case {'outputfile', 'output'} + outputFile = value; + case 'display' + display = value; + otherwise + error('Unknow property: "%s"', property); + end +end + +% if property display is set to display, display them and quit +% ----------------------------------------------------------- +if strcmp(display, 'on') + fprintf('inputFile: %s\noutpuFile: %s\n', inputFile, outputFile); + return; +end + %% Main TSGQC GUI % ---------------