Skip to content
Snippets Groups Projects
Commit 5efd9a18 authored by jacques.grelet_ird.fr's avatar jacques.grelet_ird.fr
Browse files

correction d'un bug sur les 3 nouveaux popupmenu (PI_NAME, etc)

parent 56a8c5f6
No related branches found
No related tags found
No related merge requests found
...@@ -78,8 +78,8 @@ for i=1:numel(nca_keys) ...@@ -78,8 +78,8 @@ for i=1:numel(nca_keys)
'TooltipString', char(s.comment), ... 'TooltipString', char(s.comment), ...
'String', char(s.name) ); 'String', char(s.name) );
% display dynamic uicontrol % display dynamically uicontrol
% ------------------------- % -----------------------------
ui = uicontrol(... ui = uicontrol(...
'Parent', hHeaderFig, ... 'Parent', hHeaderFig, ...
'Units', 'normalized', ... 'Units', 'normalized', ...
...@@ -173,20 +173,19 @@ uiwait(hHeaderFig); ...@@ -173,20 +173,19 @@ uiwait(hHeaderFig);
%% Nested callback %% Nested callback
function continueCallback(obj, event) function continueCallback(obj, event)
% get uicontrol filelds and populate tsg structure % get uicontrol fields and populate tsg structure
% ------------------------------------------------ % ------------------------------------------------
% for text only
% -------------
tsg.PLATFORM_NAME = get(data.PLATFORM_NAME, 'string'); tsg.PLATFORM_NAME = get(data.PLATFORM_NAME, 'string');
tsg.SHIP_CALL_SIGN = get(data.SHIP_CALL_SIGN, 'string'); tsg.SHIP_CALL_SIGN = get(data.SHIP_CALL_SIGN, 'string');
tsg.SHIP_MMSI = get(data.SHIP_MMSI, 'string'); tsg.SHIP_MMSI = get(data.SHIP_MMSI, 'string');
tsg.TSG_TYPE = get(data.TSG_TYPE, 'string'); tsg.TSG_TYPE = get(data.TSG_TYPE, 'string');
tsg.TSG_TYPE = tsg.TSG_TYPE(get(data.TSG_TYPE, 'value'),:);
tsg.TSG_NUMBER = get(data.TSG_NUMBER, 'string'); tsg.TSG_NUMBER = get(data.TSG_NUMBER, 'string');
tsg.TINT_TYPE = get(data.TINT_TYPE, 'string'); tsg.TINT_TYPE = get(data.TINT_TYPE, 'string');
tsg.TINT_TYPE = tsg.TINT_TYPE(get(data.TINT_TYPE, 'value'),:);
tsg.TINT_NUMBER = get(data.TINT_NUMBER, 'string'); tsg.TINT_NUMBER = get(data.TINT_NUMBER, 'string');
tsg.DATA_TYPE = get(data.DATA_TYPE, 'string'); tsg.DATA_TYPE = get(data.DATA_TYPE, 'string');
tsg.DATA_MODE = get(data.DATA_MODE, 'string'); tsg.DATA_MODE = get(data.DATA_MODE, 'string');
tsg.DATA_MODE = tsg.DATA_MODE(get(data.DATA_MODE, 'value'),:);
tsg.SAMPLING_PERIOD = get(data.SAMPLING_PERIOD, 'string'); tsg.SAMPLING_PERIOD = get(data.SAMPLING_PERIOD, 'string');
tsg.PROCESSING_STATUS = get(data.PROCESSING_STATUS, 'string'); tsg.PROCESSING_STATUS = get(data.PROCESSING_STATUS, 'string');
tsg.DATE_START = get(data.DATE_START, 'string'); tsg.DATE_START = get(data.DATE_START, 'string');
...@@ -206,7 +205,16 @@ uiwait(hHeaderFig); ...@@ -206,7 +205,16 @@ uiwait(hHeaderFig);
tsg.DATA_ACQUISITION = get(data.DATA_ACQUISITION, 'string'); tsg.DATA_ACQUISITION = get(data.DATA_ACQUISITION, 'string');
tsg.PROCESSING_CENTRE = get(data.PROCESSING_CENTRE, 'string'); tsg.PROCESSING_CENTRE = get(data.PROCESSING_CENTRE, 'string');
tsg.PROCESSING_STATES = get(data.PROCESSING_STATES, 'string'); tsg.PROCESSING_STATES = get(data.PROCESSING_STATES, 'string');
% for popupmenu only
% ------------------
tsg.TSG_TYPE = tsg.TSG_TYPE(get(data.TSG_TYPE, 'value'),:);
tsg.TINT_TYPE = tsg.TINT_TYPE(get(data.TINT_TYPE, 'value'),:);
tsg.DATA_MODE = tsg.DATA_MODE(get(data.DATA_MODE, 'value'),:);
tsg.PI_NAME = tsg.PI_NAME(get(data.PI_NAME, 'value'),:);
tsg.DATA_ACQUISITION = tsg.DATA_ACQUISITION(get(data.DATA_ACQUISITION, 'value'),:);
tsg.PROCESSING_CENTRE = tsg.PROCESSING_CENTRE(get(data.PROCESSING_CENTRE, 'value'),:);
% Save tsg structure % Save tsg structure
% ------------------ % ------------------
setappdata( hTsgGUI, 'tsg_data', tsg); setappdata( hTsgGUI, 'tsg_data', tsg);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment