Changed forceOptimumOffsets to useOffsets.

VERSION

-106
\ No newline at end of file
+107
\ No newline at end of file

lib/+artoa/+controller/+edit/+offsets/checkboxForceOptimumOffsets.m → lib/+artoa/+controller/+edit/+offsets/checkboxUseOffsets.m

-function [newValue] = checkboxForceOptimumOffsets(~, ~)
+function [newValue] = checkboxUseOffsets(~, ~)
 %CHECKBOXDOPPLERCORRECTION Summary of this function goes here
 %   Detailed explanation goes here
 
 global artoaGui artoaWorkspace artoaDataInput;
 
-newValue = logical(artoaGui.editOffsets.checkboxForceOptimumOffsets.Value);
+newValue = logical(artoaGui.editOffsets.checkboxUseOffsets.Value);
 
-artoaWorkspace.editOffsets.forceOptimumOffsets = newValue;
+artoaWorkspace.editOffsets.useOffsets = newValue;
 
 %% Update TOA
 
@@ -24,7 +24,6 @@ artoa.controller.edit.offsets.selectOffsetsAndDrift();
 artoaWorkspace.toaData = artoa.toa.recalculate( ...
     artoaWorkspace.float, ...
     toaData, ...
-    artoa.controller.getSoundsourcesWithAppliedToa(), ...
     artoaWorkspace.editOffsets.selectedOffsets ...
 );
 

lib/+artoa/+controller/+edit/+offsets/open.m

@@ -16,7 +16,7 @@ end
 callbacks = struct();
 callbacks.tableSoundsourceOffsetsEdit = @artoa.controller.edit.offsets.tableSoundsourceOffsetsEdit;
 callbacks.buttonCalculateOffsets = @artoa.controller.edit.offsets.buttonCalculateOffsets;
-callbacks.checkboxForceOptimumOffsets = @artoa.controller.edit.offsets.checkboxForceOptimumOffsets;
+callbacks.checkboxUseOffsets = @artoa.controller.edit.offsets.checkboxUseOffsets;
 
 %% Open the gui
 artoa.gui.edit.offsets(callbacks);
@@ -28,7 +28,7 @@ end
 
 %% Create workspace variables
 artoaWorkspace.editOffsets = struct();
-artoaWorkspace.editOffsets.forceOptimumOffsets = false;
+artoaWorkspace.editOffsets.useOffsets = false;
 artoa.controller.edit.offsets.updateWorkspaceOffsetsTable();
 
 %% Update gui

lib/+artoa/+controller/+edit/+offsets/selectOffsetsAndDrift.m

@@ -11,7 +11,7 @@ selectedOffsets = table();
 offsetsTable = artoaWorkspace.editOffsets.soundsourceOffsets;
 
 %% Select float offset and drift
-if artoaWorkspace.editOffsets.forceOptimumOffsets
+if artoaWorkspace.editOffsets.useOffsets
     tmp = table();
     tmp.offset = offsetsTable{'Float', 'OptimumTotalOffset'};
     tmp.drift = offsetsTable{'Float', 'OptimumTotalDrift'};
@@ -27,7 +27,7 @@ for i = 1:length(variableNames)
     if strcmp('Float', variableNames{i})
         continue;
     end
-    if artoaWorkspace.editOffsets.forceOptimumOffsets
+    if artoaWorkspace.editOffsets.useOffsets
         tmp = table();
         tmp.offset = offsetsTable{variableNames{i}, 'OptimumTotalOffset'};
         tmp.drift = offsetsTable{variableNames{i}, 'OptimumTotalDrift'};

lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m

@@ -21,18 +21,15 @@ end
 %% Save to workspace
 artoaWorkspace.editOffsets.soundsourceOffsets(:, :) = artoaGui.editOffsets.tableSoundsourceOffsets.Data;
 
-%% Update TOA
-
-% combine initial toa and current applied soundsources
-toaData = artoaWorkspace.toaData;
-toaData.toa = artoaDataInput.toaData.toa;
-
 %% Recalculate drift
 artoa.controller.edit.offsets.updateWorkspaceOffsetsTable();
 artoa.controller.edit.offsets.updateGui();
 
 %% Select offset and drift from the table
 artoa.controller.edit.offsets.selectOffsetsAndDrift();
+% combine initial toa and current applied soundsources
+toaData = artoaWorkspace.toaData;
+toaData.toa = artoaDataInput.toaData.toa;
 
 artoaWorkspace.toaData = artoa.toa.recalculate( ...
     artoaWorkspace.float, ...

lib/+artoa/+controller/+edit/+offsets/updateGui.m

@@ -16,7 +16,7 @@ fieldNames = fieldnames(fields);
 for i = 1:length(fieldNames)
     currentValue = fields.(fieldNames{i});
     switch fieldNames{i}
-        case 'forceOptimumOffsets'
+        case 'useOffsets'
             artoaGui.editOffsets.checkboxForceOptimumOffsets.Value = currentValue;
         case 'soundsourceOffsets'
             artoaGui.editOffsets.tableSoundsourceOffsets.Data = table2cell( ...

lib/+artoa/+controller/+edit/+timeOfArrival/open.m

@@ -11,12 +11,13 @@ if isfield(artoaGui.figures, 'editTimeOfArrival')
 end
 
 
-%% Open the gui
-artoa.gui.edit.timeOfArrival();
-
 %% Create workspace variables
 artoaWorkspace.editTimeOfArrival = struct();
 
+
+%% Open the gui
+artoa.gui.edit.timeOfArrival();
+
 %% Update duplicate toa table
 artoa.controller.edit.timeOfArrival.updateDuplicateToaTable();
 

lib/+artoa/+gui/+edit/offsets.m

@@ -14,7 +14,7 @@ availableCallbacks = { ...
     'tableSoundsourceOffsetsSelect', ...
     'tableSoundsourceOffsetsEdit', ...
     'buttonCalculateOffsets', ...
-    'checkboxForceOptimumOffsets' ...
+    'checkboxUseOffsets' ...
 };
 
 for i = 1:length(availableCallbacks) % check if a callback is undefined
@@ -77,14 +77,14 @@ artoaGui.editOffsets.buttonCalculateOffsets = uicontrol( ...
     'CallBack', pCallbacks.buttonCalculateOffsets ...
 );
 
-artoaGui.editOffsets.checkboxForceOptimumOffsets = uicontrol( ...
+artoaGui.editOffsets.checkboxUseOffsets = uicontrol( ...
     'Parent', artoaGui.editOffsets.frameOptimumOffsets, ...
-    'String', 'Force using optimum offsets', ...
+    'String', 'Use offsets', ...
     'Style', 'checkbox', ...
     'FontSize', 8, ...
     'Units', 'normalized', ...
     'Position', [left .75 fullwidth/2 .2], ...
-    'CallBack', pCallbacks.checkboxForceOptimumOffsets ...
+    'CallBack', pCallbacks.checkboxUseOffsets ...
 );