diff --git a/@tsg_nc/tsg_ncattr.csv b/@tsg_nc/tsg_ncattr.csv
index d1eac504ef87a1fc8a20bfc69dfd31916ae8b6d0..71fed78aac36aa7d9fd5b82ea477c8308b619772 100644
--- a/@tsg_nc/tsg_ncattr.csv
+++ b/@tsg_nc/tsg_ncattr.csv
@@ -1,34 +1,34 @@
-% tsg_ncattr.csv: definition (10 separators ; actually)%
+% tsg_ncattr.csv: definition (11 separators ; actually)%
% $Id$
%
-id;code;name;uicontrolType;string;value;length;height;horizontalAlignment;comment;
-integer;char;char;char;char;integer;integer;integer;char;char;
-1;PLATFORM_NAME;PLATFORM NAME:;edit;;;;;right;Ship name;
-2;SHIP_CALL_SIGN;SHIP CALL SIGN:;edit;;;;;right;Ship call sign;
-3;SHIP_MMSI;SHIP MMSI:;edit;;;;;right;Ship MMSI (ASN) number;
-4;TSG_TYPE;TSG TYPE:;popupmenu;SBE21|SBE45|UNKNO;1;.1;.015;right;Thermosalinograph model number;
-5;TSG_NUMBER;TSG NUMBER:;edit;;;;;right;TSG serial number;
-6;TINT_TYPE;TINT TYPE:;popupmenu;SBE38|SBE3S|UNKNO;1;.1;.015;right;External sea surface temperature sensor;
-7;TINT_NUMBER;TINT NUMBER:;edit;;;;;right;External temperature sensor serial number;
-8;DATA_TYPE;DATA TYPE:;edit;;;;;right;Describe data type contained in file, eg: Thermosilinometer data;
-9;DATA_MODE;DATA MODE:;popupmenu;Delayed mode data|Real time data;1;;;right;Indicate if the file contains real time or delayed mode data;
-10;SAMPLING_PERIOD;SAMPLING PERIOD:;edit;300;;.05;;right;Sampling period in seconds: 6 to 3600;
-11;PROCESSING_STATUS;PROCESSING STATUS:;edit;;;;;right;State of processing;
-12;DATE_START;DATE_START:;edit;;;;;right;Date of first measurements;
-13;DATE_END;DATE END:;edit;;;;;right;Date of last measurements;
-14;SOUTH_LATX;SOUTH LATX:;edit;;;;;right;South limit of measurements;
-15;NORTH_LATX;NORTH LATX:;edit;;;;;right;North limit of measurements;
-16;WEST_LONX;WEST LONX:;edit;;;;;right;West limit of measurements;
-17;EAST_LONX;EAST LONX:;edit;;;;;right;East limit of measurements;
-18;FORMAT_VERSION;FORMAT VERSION:;edit;1.4;;;;right;File format version;
-19;DATE_CREATION;DATE CREATION:;edit;;;;;right;Date and time of file creation, format: YYYYMMDDHHMISS;
-20;DATE_UPDATE;DATE UPDATE:;edit;;;;;right;Date and time of file update, format: YYYYMMDDHHMISS;
-21;DATA_RESTRICTIONS;DATA RESTRICTIONS:;edit;NONE;;;;right;Restriction on use for these data;
-22;CITATION;CITATION:;edit;;;;;right;This citation should be used for publications;
-23;COMMENT;COMMENT:;edit;;;;;right;;
-24;PROJECT_NAME;PROJECT NAME:;edit;;;;;right;Name of project wich operates the TSG line, ex: ORE-SSS;
-25;PI_NAME;PI NAME:;edit;;;;;right;Name of principal investigator in charge of the TSG, ex: IRD or GENAVIR;
-26;DATA_CENTRE;DATA CENTRE:;edit;;;;;right;Code for data center (2 char);
-27;DATA_ACQUISITION;DATA ACQUISITION:;edit;;;;;right;Acquisition data centre, ex: SHOM,IRD,GENAVIR,CNRS,...;
-28;PROCESSING_CENTRE;PROCESSING CENTRE:;edit;;;;;right;Processing data centre, ex: ORE-SSS,CORIOLIS,SISMER,...;
-29;PROCESSING_STATES;PROCESSING STATES:;edit;;;;;right;Need to be defined, IRD action,...;
+id;code;name;conventions;uicontrolType;string;value;length;height;horizontalAlignment;comment;
+integer;char;char;char;char;char;integer;integer;integer;char;char;
+1;PLATFORM_NAME;PLATFORM NAME:;;edit;;;;;right;Ship name;
+2;SHIP_CALL_SIGN;SHIP CALL SIGN:;;edit;;;;;right;Ship call sign;
+3;SHIP_MMSI;SHIP MMSI:;;edit;;;;;right;Ship MMSI (ASN) number;
+4;TSG_TYPE;TSG TYPE:;;popupmenu;SBE21|SBE45|UNKNO;1;.1;.015;right;Thermosalinograph model number;
+5;TSG_NUMBER;TSG NUMBER:;;edit;;;;;right;TSG serial number;
+6;TINT_TYPE;TINT TYPE:;;popupmenu;SBE38|SBE3S|UNKNO;1;.1;.015;right;External sea surface temperature sensor;
+7;TINT_NUMBER;TINT NUMBER:;;edit;;;;;right;External temperature sensor serial number;
+8;DATA_TYPE;DATA TYPE:;;edit;;;;;right;Describe data type contained in file, eg: Thermosilinometer data;
+9;DATA_MODE;DATA MODE:;;popupmenu;Delayed mode data|Real time data;1;;;right;Indicate if the file contains real time or delayed mode data;
+10;SAMPLING_PERIOD;SAMPLING PERIOD:;;edit;300;;.05;;right;Sampling period in seconds: 6 to 3600;
+11;PROCESSING_STATUS;PROCESSING STATUS:;;edit;;;;;right;State of processing;
+12;DATE_START;DATE_START:;yyyymmddhhmnss;edit;;;;;right;Date of first measurements;
+13;DATE_END;DATE END:;yyyymmddhhmnss;edit;;;;;right;Date of last measurements;
+14;SOUTH_LATX;SOUTH LATX:;;edit;;;;;right;South limit of measurements;
+15;NORTH_LATX;NORTH LATX:;;edit;;;;;right;North limit of measurements;
+16;WEST_LONX;WEST LONX:;;edit;;;;;right;West limit of measurements;
+17;EAST_LONX;EAST LONX:;;edit;;;;;right;East limit of measurements;
+18;FORMAT_VERSION;FORMAT VERSION:;;edit;1.4;;;;right;File format version;
+19;DATE_CREATION;DATE CREATION:;yyyymmddhhmnss;edit;;;;;right;Date and time of file creation, format: YYYYMMDDHHMISS;
+20;DATE_UPDATE;DATE UPDATE:;yyyymmddhhmnss;edit;;;;;right;Date and time of file update, format: YYYYMMDDHHMISS;
+21;DATA_RESTRICTIONS;DATA RESTRICTIONS:;;edit;NONE;;;;right;Restriction on use for these data;
+22;CITATION;CITATION:;;edit;;;;;right;This citation should be used for publications;
+23;COMMENT;COMMENT:;;edit;;;;;right;;
+24;PROJECT_NAME;PROJECT NAME:;;edit;;;;;right;Name of project which operates the TSG line, ex: ORE-SSS;
+25;PI_NAME;PI NAME:;;popupmenu;IRD-BREST|IRD-NOUMEA|GENAVIR|SHOM|CNRS;1;.1;.014;right;Name of principal investigator in charge of the TSG, ex: IRD or GENAVIR;
+26;DATA_CENTRE;DATA CENTRE:;;edit;;;;;right;Code for data center (2 char);
+27;DATA_ACQUISITION;DATA ACQUISITION:;;popupmenu;IRD|GENAVIR|SHOM|CNRS;1;.1;.014;right;Acquisition data centre, ex: SHOM,IRD,GENAVIR,CNRS,...;
+28;PROCESSING_CENTRE;PROCESSING CENTRE:;;popupmenu;ORE-SSS|CORIOLIS/IRD|CORIOLIS/SISMER;1;.1;.014;right;Processing data centre, ex: ORE-SSS,CORIOLIS,SISMER,...;
+29;PROCESSING_STATES;PROCESSING STATES:;;edit;;;;;right;Need to be defined, IRD action,...;
diff --git a/tsg_util/headerForm.m b/tsg_util/headerForm.m
index 6c73e1e96b6724df198356657e4fc5889aa1d767..9ce1e8311ebc06de46446c7bfdc8246373ad70ec 100644
--- a/tsg_util/headerForm.m
+++ b/tsg_util/headerForm.m
@@ -72,8 +72,9 @@ for i=1:numel(nca_keys)
'Parent', hHeaderFig, ...
'Units', 'normalized', ...
'Style', 'Text', ...
+ 'Fontsize', 11, ...
'HorizontalAlignment', 'left', ...
- 'Position',[left, bottom, .8, .0135], ...
+ 'Position',[left, bottom, .12, .0135], ...
'TooltipString', char(s.comment), ...
'String', char(s.name) );
@@ -84,12 +85,24 @@ for i=1:numel(nca_keys)
'Units', 'normalized', ...
'BackgroundColor', 'w', ...
'Style', char(s.uicontrolType), ...
+ 'Fontsize', 11, ...
'HorizontalAlignment', char(s.horizontalAlignment), ...
- 'Position',[left+.09, bottom, s.length, s.height], ...
+ 'Position',[left+.11, bottom, s.length, s.height], ...
'String', char(s.string), ...
'Value', s.value, ...
'Tag', key);
+ % display conventions field if exist
+ % ----------------------------------
+ uicontrol(...
+ 'Parent', hHeaderFig, ...
+ 'Units', 'normalized', ...
+ 'Style', 'text', ...
+ 'Fontsize', 11, ...
+ 'HorizontalAlignment', 'left', ...
+ 'Position',[left+.22, bottom, .1, s.height], ...
+ 'String', char(s.conventions) );
+
% set dynamically uicontrol
% -------------------------
switch s.uicontrolType
diff --git a/tsgqc_GUI.m b/tsgqc_GUI.m
index 351dacf71f9b2b081287d4530ee2cff54b9502ef..4d2c6f5ffb8a92dac96cea2a610f46fb3b69b69a 100644
--- a/tsgqc_GUI.m
+++ b/tsgqc_GUI.m
@@ -1106,11 +1106,17 @@ tsg_initialisation(hMainFig, hQcCmenu)
% --------------------------------
if error == -1
warning(['NetCDF writing error:' [pathName fileName]]);
+ return;
end
% update the display
% ------------------
set( hInfoFileText, 'String', fileName);
+
+ % enable Quality Control mode
+ % ---------------------------
+ hdl_pushtool = findobj('Tag', 'QC');
+ set(hdl_pushtool, 'Enable', 'on');
end
end