Skip to content
Snippets Groups Projects
Verified Commit ce10262a authored by leprob001's avatar leprob001
Browse files

chore: Replaced "Plot residuals" checkbox with value of calculated/measured...

chore: Replaced "Plot residuals" checkbox with value of calculated/measured soundspeed in track parameter panel
parent 3194a2fb
No related branches found
No related tags found
No related merge requests found
349 350
\ No newline at end of file \ No newline at end of file
...@@ -10,14 +10,17 @@ else ...@@ -10,14 +10,17 @@ else
method = 'del grosso'; method = 'del grosso';
end end
artoaWorkspace.editOffsets.offsets{:, 'MeasuredSoundspeed'} = ... calculatedSoundspeed = artoa.data.calculateSoundVelocity( ...
artoa.data.calculateSoundVelocity( ... artoaWorkspace.temperature(artoaWorkspace.statusTemperature == 1), ...
artoaWorkspace.temperature(artoaWorkspace.statusTemperature == 1), ... artoaWorkspace.pressure(artoaWorkspace.statusPressure == 1), ...
artoaWorkspace.pressure(artoaWorkspace.statusPressure == 1), ... method ...
method ... );
);
artoaWorkspace.trackParameter.soundspeedMeasured = calculatedSoundspeed;
artoaWorkspace.editOffsets.offsets{:, 'MeasuredSoundspeed'} = calculatedSoundspeed;
artoa.controller.edit.offsets.updateGui(); artoa.controller.edit.offsets.updateGui();
artoa.controller.track.parameter.updateGui();
end end
...@@ -44,5 +44,9 @@ else ...@@ -44,5 +44,9 @@ else
artoa.controller.track.parameter.adjustTableColorsToTrajectory(); artoa.controller.track.parameter.adjustTableColorsToTrajectory();
end end
% Update calculated soundspeed value
calculatedSoundspeed = str2double(artoa.data.getMember(artoaWorkspace, {'trackParameter', 'soundspeedMeasured'}, ''));
artoaGui.trackParameter.textCalculatedSoundspeed.String = ['Soundspeed: ' num2str(calculatedSoundspeed, '%.1f') ' m/s'];
end end
...@@ -403,17 +403,27 @@ artoaGui.trackParameter.comboboxSoundspeedMethod = uicontrol( ... ...@@ -403,17 +403,27 @@ artoaGui.trackParameter.comboboxSoundspeedMethod = uicontrol( ...
'CallBack', pCallbacks.comboboxSoundspeedMethod ... 'CallBack', pCallbacks.comboboxSoundspeedMethod ...
); );
artoaGui.trackParameter.checkboxPlotResiduals = uicontrol( ... artoaGui.trackParameter.textCalculatedSoundspeed = uicontrol( ...
'Parent', artoaGui.trackParameter.frameSoundspeedMethod, ... 'Parent', artoaGui.trackParameter.frameSoundspeedMethod, ...
'String', 'Plot Residuals', ... 'String', '', ...
'Enable', 'off', ... 'Style', 'text', ...
'Style', 'checkbox', ...
'FontSize', 8, ... 'FontSize', 8, ...
'Units', 'normalized', ... 'Units', 'normalized', ...
'Position', [left .1 .9 .3], ... 'Position', [left .1 .9 .3], ...
'CallBack', pCallbacks.checkboxPlotResiduals ... 'CallBack', '' ...
); );
% artoaGui.trackParameter.checkboxPlotResiduals = uicontrol( ...
% 'Parent', artoaGui.trackParameter.frameSoundspeedMethod, ...
% 'String', 'Plot Residuals', ...
% 'Enable', 'off', ...
% 'Style', 'checkbox', ...
% 'FontSize', 8, ...
% 'Units', 'normalized', ...
% 'Position', [left .1 .9 .3], ...
% 'CallBack', pCallbacks.checkboxPlotResiduals ...
% );
% Output interpolation interval % Output interpolation interval
artoaGui.trackParameter.textOutputInterpolationInterval = uicontrol( ... artoaGui.trackParameter.textOutputInterpolationInterval = uicontrol( ...
......
%% Add soundspeedMeasured variable
if ~artoa.data.hasMember(artoaWorkspace, 'trackParameter', 'soundspeedMeasured')
artoaWorkspace.trackParameter.soundspeedMeasured = artoa.data.calculateSoundVelocity( ...
artoaWorkspace.temperature(artoaWorkspace.statusTemperature == 1), ...
artoaWorkspace.pressure(artoaWorkspace.statusPressure == 1), ...
artoaWorkspace.trackParameter.soundspeedMethodString ...
);
end
\ No newline at end of file
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