From 2b564dde84f24462579c9406581f0c9fd9788aae Mon Sep 17 00:00:00 2001 From: Jacques Grelet <jacques.grelet@ird.fr> Date: Fri, 5 Dec 2014 12:55:02 +0000 Subject: [PATCH] change v1.41 to 1.42 add date_version in tsg struct and global DATE_VERSION the date_version is displayed inside info screen and console --- tsg_util/aboutDialog.m | 6 +++--- tsg_util/tsg_preferences.m | 3 ++- tsgqc.m | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tsg_util/aboutDialog.m b/tsg_util/aboutDialog.m index d0a2e5c..6e5c2d7 100644 --- a/tsg_util/aboutDialog.m +++ b/tsg_util/aboutDialog.m @@ -65,13 +65,13 @@ hRightPanel = uipanel( ... 'ButtonDownFcn', @quitAboutCallback); % display info in botom panel -msg = sprintf( 'TSGQC Version : %s - GOSUD format: %s', ... - tsg.preference.char_version, tsg.FORMAT_VERSION) +msg = sprintf( 'TSGQC v %s - %s - GOSUD v %s', ... + tsg.preference.char_version, tsg.preference.date_version, tsg.FORMAT_VERSION) uicontrol('Parent', hBottomPanel, ... 'Style','text',... 'FontSize', 14, ... 'Units','normalized',... - 'Position',[.1 .1 .9 .5],... + 'Position',[.1 .1 .75 .5],... 'FontWeight','bold',... 'String', msg,... 'HorizontalAlignment','center'); diff --git a/tsg_util/tsg_preferences.m b/tsg_util/tsg_preferences.m index a7d77cd..84c7b9f 100644 --- a/tsg_util/tsg_preferences.m +++ b/tsg_util/tsg_preferences.m @@ -17,7 +17,7 @@ function tsg_preferences(hTsgGUI, app_name, DEFAULT_PATH_FILE) % global variable VERSION, update revision number when tsg structure change % ------------------------------------------------------------------------- -global VERSION CHAR_VERSION +global VERSION CHAR_VERSION DATE_VERSION % Initialize loading preference file waitbar % ------------------------------------------ @@ -130,6 +130,7 @@ set(hTsgGUI,'Pointer','arrow'); % ------------------------------------- preference.version = VERSION; preference.char_version = CHAR_VERSION; + preference.date_version = DATE_VERSION; preference.autoload = 'off'; % Climatology preference.levitus_version = {'WOA01','WOA05'}; diff --git a/tsgqc.m b/tsgqc.m index 3d16ac0..ae70e6b 100644 --- a/tsgqc.m +++ b/tsgqc.m @@ -32,13 +32,15 @@ function tsgqc( varargin ) % --------------------------------------- global VERSION global CHAR_VERSION +global DATE_VERSION global GOSUD_FORMAT_VERSION % version number, may be used to initialize some files when it change % 0.90x -> 1.0RCx % ------------------------------------------------------------------- -VERSION = 1.410; % -> 1.41 -CHAR_VERSION = '1.41'; +VERSION = 1.420; % -> 1.41 +CHAR_VERSION = '1.42'; +DATE_VERSION = '05 dec 2014'; % netcdf file version, see DATA FORMAT TSG document: % CORTSG_format_gosud.doc -- GitLab