From bea575eb405855ee9dd4f6e05b289c43f0e690f8 Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Sat, 7 Dec 2019 15:41:23 +0100
Subject: [PATCH] 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.
---
VERSION | 2 +-
.../+edit/+offsets/buttonCalculateOffsets.m | 10 +++++-----
.../+edit/+offsets/tableSoundsourceOffsetsEdit.m | 4 ++--
lib/+artoa/+controller/+edit/+offsets/updateGui.m | 2 +-
.../+edit/+offsets/updateWorkspaceOffsetsTable.m | 8 ++++----
.../+edit/+timeOfArrival/calculateGpsToas.m | 8 ++++----
.../+controller/+edit/recalculateToaGpsAndPlot.m | 2 +-
.../+trajectoryOutput/tableGeneratedTracksSelect.m | 2 +-
lib/+artoa/+controller/+track/run.m | 2 +-
lib/+artoa/+trajectory/calculate.m | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/VERSION b/VERSION
index 95c8a67..c9c4108 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 1d4102e..0cee812 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 00cc304..dfb994a 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 a20d116..10fbba0 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 ee35399..bc32a65 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 eb49b7c..28d73f0 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 9dacd57..6ac8db2 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 f3dfaa2..6083bfe 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 d72f474..ebdacbe 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 809287d..ed5199c 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
--
GitLab