diff --git a/VERSION b/VERSION index 95c8a676e9d535b85485c6a8d1ee1991c9391ad0..c9c41087e2102d5af5f3ea8aa420e47ad3085707 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -113 \ No newline at end of file +114 \ No newline at end of file diff --git a/lib/+artoa/+controller/+edit/+offsets/buttonCalculateOffsets.m b/lib/+artoa/+controller/+edit/+offsets/buttonCalculateOffsets.m index 1d4102e88370acdc9a4aee1f8d15769b210de4f3..0cee812fc3b78fce1c3f564736869229098dd5cb 100644 --- a/lib/+artoa/+controller/+edit/+offsets/buttonCalculateOffsets.m +++ b/lib/+artoa/+controller/+edit/+offsets/buttonCalculateOffsets.m @@ -32,16 +32,16 @@ satData = artoaWorkspace.satData; soundsourceNames = fieldnames(artoa.controller.getSoundsourcesWithAppliedToa()); for o = 1:length(soundsourceNames) - if ~any(contains(artoaWorkspace.editOffsets.soundsourceOffsets.Properties.RowNames, soundsourceNames{o})) + if ~any(contains(artoaWorkspace.editOffsets.offsets.Properties.RowNames, soundsourceNames{o})) continue; end - artoaWorkspace.editOffsets.soundsourceOffsets{soundsourceNames{o}, 'OptimumTotalOffset'} = offsets(o + 1); - artoaWorkspace.editOffsets.soundsourceOffsets{soundsourceNames{o}, 'OptimumTotalDrift'} = drifts(o + 1); + artoaWorkspace.editOffsets.offsets{soundsourceNames{o}, 'OptimumTotalOffset'} = offsets(o + 1); + artoaWorkspace.editOffsets.offsets{soundsourceNames{o}, 'OptimumTotalDrift'} = drifts(o + 1); end % store float in table -artoaWorkspace.editOffsets.soundsourceOffsets{'Float', 'OptimumTotalOffset'} = offsets(1); -artoaWorkspace.editOffsets.soundsourceOffsets{'Float', 'OptimumTotalDrift'} = drifts(1); +artoaWorkspace.editOffsets.offsets{'Float', 'OptimumTotalOffset'} = offsets(1); +artoaWorkspace.editOffsets.offsets{'Float', 'OptimumTotalDrift'} = drifts(1); %% Recalculate artoa.controller.edit.recalculateToaGpsAndPlot(); diff --git a/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m b/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m index 00cc304281ee02301035006817933cfea26fa4e1..dfb994aff75761105e6dedd20c498df1c595b999 100644 --- a/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m +++ b/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m @@ -20,12 +20,12 @@ if 1 <= selectedColumn & selectedColumn <= 7 return; end -if ~artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'soundsourceOffsets'}) +if ~artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'offsets'}) return; end %% Save to workspace -artoaWorkspace.editOffsets.soundsourceOffsets(:, :) = artoaGui.editOffsets.tableSoundsourceOffsets.Data; +artoaWorkspace.editOffsets.offsets(:, :) = artoaGui.editOffsets.tableSoundsourceOffsets.Data; %% Update workspace (required because this function is call by time of arrival window) artoa.controller.edit.offsets.updateWorkspaceOffsetsTable(); diff --git a/lib/+artoa/+controller/+edit/+offsets/updateGui.m b/lib/+artoa/+controller/+edit/+offsets/updateGui.m index a20d116d0482471a82128b2a1ff9a0dac1757594..10fbba0df2814c0f162ff4e760aba7f4abdc444f 100644 --- a/lib/+artoa/+controller/+edit/+offsets/updateGui.m +++ b/lib/+artoa/+controller/+edit/+offsets/updateGui.m @@ -18,7 +18,7 @@ for i = 1:length(fieldNames) switch fieldNames{i} case 'useOffsets' artoaGui.editOffsets.checkboxUseOffsets.Value = currentValue; - case 'soundsourceOffsets' + case 'offsets' artoaGui.editOffsets.tableSoundsourceOffsets.Data = table2cell( ... currentValue ... ); diff --git a/lib/+artoa/+controller/+edit/+offsets/updateWorkspaceOffsetsTable.m b/lib/+artoa/+controller/+edit/+offsets/updateWorkspaceOffsetsTable.m index ee3539939f183e5cd498a9651383e107fd0f0eb8..bc32a655326c0f52b2e7a675ea057ce20ab58735 100644 --- a/lib/+artoa/+controller/+edit/+offsets/updateWorkspaceOffsetsTable.m +++ b/lib/+artoa/+controller/+edit/+offsets/updateWorkspaceOffsetsTable.m @@ -13,13 +13,13 @@ end soundsources = artoa.controller.getSoundsourcesWithAppliedToa(); %% Initialize if not available -if ~artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'soundsourceOffsets'}) +if ~artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'offsets'}) % initialize sound source offsets - artoaWorkspace.editOffsets.soundsourceOffsets = ... + artoaWorkspace.editOffsets.offsets = ... artoa.offsets.generateOffsetTable(artoaWorkspace.float, soundsources); end -workspaceOffsets = artoaWorkspace.editOffsets.soundsourceOffsets; +workspaceOffsets = artoaWorkspace.editOffsets.offsets; %% Add every soundsource fnames = fieldnames(soundsources); @@ -54,4 +54,4 @@ for i = 1:length(rowNames) ); end -artoaWorkspace.editOffsets.soundsourceOffsets = workspaceOffsets; \ No newline at end of file +artoaWorkspace.editOffsets.offsets = workspaceOffsets; \ No newline at end of file diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/calculateGpsToas.m b/lib/+artoa/+controller/+edit/+timeOfArrival/calculateGpsToas.m index eb49b7cd9b7b56d183d911f8e6e1a164216e2612..28d73f0997d0386a4c9dc14531e33db5d3676446 100644 --- a/lib/+artoa/+controller/+edit/+timeOfArrival/calculateGpsToas.m +++ b/lib/+artoa/+controller/+edit/+timeOfArrival/calculateGpsToas.m @@ -34,11 +34,11 @@ for o = 1:length(fnames) ); % add soundsource drift - if artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'soundsourceOffsets'}) ... - && any(contains(artoaWorkspace.editOffsets.soundsourceOffsets.Properties.RowNames, fnames{o})) ... + if artoa.data.hasMember(artoaWorkspace, {'editOffsets', 'offsets'}) ... + && any(contains(artoaWorkspace.editOffsets.offsets.Properties.RowNames, fnames{o})) ... && artoaWorkspace.editOffsets.useOffsets - offset = artoaWorkspace.editOffsets.soundsourceOffsets{fnames{o}, 'EmpiricalOffset'}; - drift = artoaWorkspace.editOffsets.soundsourceOffsets{fnames{o}, 'EmpiricalDrift'}; + offset = artoaWorkspace.editOffsets.offsets{fnames{o}, 'EmpiricalOffset'}; + drift = artoaWorkspace.editOffsets.offsets{fnames{o}, 'EmpiricalDrift'}; % no sorting required, because fourth parameter contains timesteps predictedToas = artoa.toa.addDrift( ... predictedToas, ... diff --git a/lib/+artoa/+controller/+edit/recalculateToaGpsAndPlot.m b/lib/+artoa/+controller/+edit/recalculateToaGpsAndPlot.m index 9dacd578e97be3ddabd470b733fef04a2bab20ca..6ac8db204d0608814607f8febec501d85bf0cbea 100644 --- a/lib/+artoa/+controller/+edit/recalculateToaGpsAndPlot.m +++ b/lib/+artoa/+controller/+edit/recalculateToaGpsAndPlot.m @@ -14,7 +14,7 @@ if artoaWorkspace.editOffsets.useOffsets artoaWorkspace.toaData = artoa.toa.recalculate( ... artoaWorkspace.float, ... toaData, ... - artoaWorkspace.editOffsets.soundsourceOffsets ... + artoaWorkspace.editOffsets.offsets ... ); else artoaWorkspace.toaData = toaData; diff --git a/lib/+artoa/+controller/+track/+trajectoryOutput/tableGeneratedTracksSelect.m b/lib/+artoa/+controller/+track/+trajectoryOutput/tableGeneratedTracksSelect.m index f3dfaa2c278b36158b6f95a32c8c2f02d75a2e50..6083bfe127c392249efce6314383fb3979431d40 100644 --- a/lib/+artoa/+controller/+track/+trajectoryOutput/tableGeneratedTracksSelect.m +++ b/lib/+artoa/+controller/+track/+trajectoryOutput/tableGeneratedTracksSelect.m @@ -98,7 +98,7 @@ if artoaWorkspace.trajectoryOutput.updateTrackParameterWindow artoaWorkspace.trackParameter = ... artoaWorkspace.trajectoryOutput.trajectories{selectedRow(1)}.trackParameter; artoa.controller.track.parameter.updateGui(); - artoaWorkspace.editOffsets.soundsourceOffsets = ... + artoaWorkspace.editOffsets.offsets = ... artoaWorkspace.trajectoryOutput.trajectories{selectedRow(1)}.offsets; artoa.controller.edit.offsets.updateGui(); end diff --git a/lib/+artoa/+controller/+track/run.m b/lib/+artoa/+controller/+track/run.m index d72f4741a45783535efade5f5f4bcdf4d00d04fd..ebdacbee752f5b649a0e70156b768bfc6334d53b 100644 --- a/lib/+artoa/+controller/+track/run.m +++ b/lib/+artoa/+controller/+track/run.m @@ -100,7 +100,7 @@ end %% Setup trajectory object trajectoryObject = struct(); trajectoryObject.trackParameter = artoaWorkspace.trackParameter; -trajectoryObject.offsets = artoaWorkspace.editOffsets.soundsourceOffsets; +trajectoryObject.offsets = artoaWorkspace.editOffsets.offsets; % trajectory contains [lat lon] trajectoryObject.latitude = trajectory(:, 1); trajectoryObject.longitude = trajectory(:, 2); diff --git a/lib/+artoa/+trajectory/calculate.m b/lib/+artoa/+trajectory/calculate.m index 809287d0cf0dc49068416601ef793f76f976b7bd..ed5199ce77ad48398aff2c6340bcf347e55873a0 100644 --- a/lib/+artoa/+trajectory/calculate.m +++ b/lib/+artoa/+trajectory/calculate.m @@ -54,7 +54,7 @@ if pOffsetsParameter.useOffsets pToaData = artoa.toa.recalculate( ... pFloatDetails, ... pToaData, ... - pOffsetsParameter.soundsourceOffsets, ... + pOffsetsParameter.offsets, ... soundsourceStruct ... ); end