Skip to content
Snippets Groups Projects
Commit 2c5cfc91 authored by leprob001's avatar leprob001
Browse files

Added checkbox for optional calculation of variations.

parent 48506b7f
No related branches found
No related tags found
No related merge requests found
271 272
\ No newline at end of file \ No newline at end of file
...@@ -38,6 +38,7 @@ callbacks.convertProfilesToRfb = @artoa.controller.file.profile2rfb.open; ...@@ -38,6 +38,7 @@ callbacks.convertProfilesToRfb = @artoa.controller.file.profile2rfb.open;
%% Prepare callbacks for track parameter %% Prepare callbacks for track parameter
callbacks.checkboxDopplerCorrection = @artoa.controller.track.parameter.checkboxDopplerCorrection; callbacks.checkboxDopplerCorrection = @artoa.controller.track.parameter.checkboxDopplerCorrection;
callbacks.checkboxCalculateVariations = @artoa.controller.track.parameter.checkboxCalculateVariations;
callbacks.comboboxInterpolationMethod = @artoa.controller.track.parameter.comboboxInterpolationMethod; callbacks.comboboxInterpolationMethod = @artoa.controller.track.parameter.comboboxInterpolationMethod;
callbacks.comboboxSoundspeedMethod = @artoa.controller.track.parameter.comboboxSoundspeedMethod; callbacks.comboboxSoundspeedMethod = @artoa.controller.track.parameter.comboboxSoundspeedMethod;
callbacks.checkboxPlotResiduals = @artoa.controller.track.parameter.checkboxPlotResiduals; callbacks.checkboxPlotResiduals = @artoa.controller.track.parameter.checkboxPlotResiduals;
......
function [] = checkboxCalculateVariations(~, event)
%CHECKBOXCALCULATEVARIATIONS Summary of this function goes here
% Detailed explanation goes here
global artoaWorkspace;
artoaWorkspace.trackParameter.calculateVariations = logical(event.Source.Value);
end
...@@ -16,6 +16,8 @@ for i = 1:length(fieldNames) ...@@ -16,6 +16,8 @@ for i = 1:length(fieldNames)
switch fieldNames{i} switch fieldNames{i}
case 'dopplerCorrection' case 'dopplerCorrection'
artoaGui.trackParameter.checkboxDopplerCorrection.Value = currentValue; artoaGui.trackParameter.checkboxDopplerCorrection.Value = currentValue;
case 'calculateVariations'
artoaGui.trackParameter.checkboxCalculateVariations.Value = currentValue;
case 'plotResiduals' case 'plotResiduals'
artoaGui.trackParameter.checkboxPlotResiduals.Value = currentValue; artoaGui.trackParameter.checkboxPlotResiduals.Value = currentValue;
case 'trackingMethodValue' case 'trackingMethodValue'
......
...@@ -29,6 +29,7 @@ availableCallbacks = { ... ...@@ -29,6 +29,7 @@ availableCallbacks = { ...
'openTrackTrajectoryOutput', ... 'openTrackTrajectoryOutput', ...
'switchHideDeletedDataPoints', ... 'switchHideDeletedDataPoints', ...
'checkboxDopplerCorrection', ... % FIRST ITEM TRACK PARAMETER CALLBACKS 'checkboxDopplerCorrection', ... % FIRST ITEM TRACK PARAMETER CALLBACKS
'checkboxCalculateVariations', ...
'comboboxInterpolationMethod', ... 'comboboxInterpolationMethod', ...
'comboboxSoundspeedMethod', ... 'comboboxSoundspeedMethod', ...
'checkboxPlotResiduals', ... 'checkboxPlotResiduals', ...
...@@ -463,7 +464,7 @@ artoaGui.trackParameter.frameTrackButtons = uipanel( ... ...@@ -463,7 +464,7 @@ artoaGui.trackParameter.frameTrackButtons = uipanel( ...
'Title', 'Tracking controls', ... 'Title', 'Tracking controls', ...
'Units', 'normalized', ... 'Units', 'normalized', ...
'BackgroundColor', 'white', ... 'BackgroundColor', 'white', ...
'Position', [(1-left-.8*width) .025 .75*width .1] ... 'Position', [(1-left-1.55*width) .025 1.5*width .1] ...
); );
artoaGui.trackParameter.buttonTrack = uicontrol( ... artoaGui.trackParameter.buttonTrack = uicontrol( ...
...@@ -472,10 +473,21 @@ artoaGui.trackParameter.buttonTrack = uicontrol( ... ...@@ -472,10 +473,21 @@ artoaGui.trackParameter.buttonTrack = uicontrol( ...
'Style', 'PushButton', ... 'Style', 'PushButton', ...
'FontSize', 8, ... 'FontSize', 8, ...
'Units', 'normalized', ... 'Units', 'normalized', ...
'Position', [left .25 (1-2*left) 2.5*buttonHeight], ... 'Position', [2*left+.45 .25 .45 2.5*buttonHeight], ...
'CallBack', pCallbacks.buttonTrack ... 'CallBack', pCallbacks.buttonTrack ...
); );
artoaGui.trackParameter.checkboxCalculateVariations = uicontrol( ...
'Parent', artoaGui.trackParameter.frameTrackButtons, ...
'String', 'Calculate variations', ...
'Style', 'checkbox', ...
'FontSize', 8, ...
'Units', 'normalized', ...
'Position', [left .25 .45 2.5*buttonHeight], ...
'Value', 0, ...
'CallBack', pCallbacks.checkboxCalculateVariations ...
);
% Combination buttons frame % Combination buttons frame
artoaGui.trackParameter.frameCombinationButtons = uipanel( ... artoaGui.trackParameter.frameCombinationButtons = uipanel( ...
......
...@@ -309,7 +309,8 @@ for oCombination = 1:size(soundsourceCombinations, 1) ...@@ -309,7 +309,8 @@ for oCombination = 1:size(soundsourceCombinations, 1)
% CALCULATE VARIATIONS % CALCULATE VARIATIONS
if length(strsplit(strtrim(currentCombination.soundsources{1}))) == 2 ... if length(strsplit(strtrim(currentCombination.soundsources{1}))) == 2 ...
&& ~artoa.trajectory.isInterpolationMethod(currentCombination.trackingMethod{1}) && ~artoa.trajectory.isInterpolationMethod(currentCombination.trackingMethod{1}) ...
&& pTrackingParameter.calculateVariations
[variationResults, ~, ~] = artoa.trajectory.calculateByOffsetVariations( ... [variationResults, ~, ~] = artoa.trajectory.calculateByOffsetVariations( ...
preparedData, ... preparedData, ...
currentCombination, ... currentCombination, ...
......
%% Add variable for calculating variations
if ~artoa.data.hasMember(artoaWorkspace, 'trackParameter', 'calculateVariations')
artoaWorkspace.trackParameter.calculateVariations = false;
end
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