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

Renamed soundsourceOffsets to offsets.

The save feature for offsets in trajectory does work now. It was
already implemented, but did not work because of the variable name.
parent 62c73595
No related branches found
No related tags found
No related merge requests found
113
\ No newline at end of file
114
\ No newline at end of file
......@@ -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();
......
......@@ -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();
......
......@@ -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 ...
);
......
......@@ -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
......@@ -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, ...
......
......@@ -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;
......
......@@ -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
......
......@@ -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);
......
......@@ -54,7 +54,7 @@ if pOffsetsParameter.useOffsets
pToaData = artoa.toa.recalculate( ...
pFloatDetails, ...
pToaData, ...
pOffsetsParameter.soundsourceOffsets, ...
pOffsetsParameter.offsets, ...
soundsourceStruct ...
);
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