Integrated the empiric_offset and empiric_drift parameter of the float,...

Integrated the empiric_offset and empiric_drift parameter of the float, Changed copy offsets layout.

VERSION

-242
+243
\ No newline at end of file

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

-function [] = buttonCopyFromMeasured(~, ~)
-%UNTITLED Summary of this function goes here
-%   Detailed explanation goes here
-
-global artoaWorkspace;
-
-%% Save Applied state
-artoa.controller.edit.offsets.saveAppliedState();
-
-%% Copy from optimum total offset columns to Applied columns
-% store float in table
-artoaWorkspace.editOffsets.offsets{:, 'AppliedOffset'} = artoaWorkspace.editOffsets.offsets{:, 'OffsetStart'};
-artoaWorkspace.editOffsets.offsets{:, 'AppliedDrift'} = artoaWorkspace.editOffsets.offsets{:, 'Drift'};
-
-artoaWorkspace.editOffsets.soundspeed.Applied(1) = artoaWorkspace.editOffsets.soundspeed.Measured(1);
-
-%% Update GUI
-artoa.controller.edit.offsets.updateGui();
-
-%% Recalculate
-artoa.controller.edit.recalculateToaGpsAndPlot();
-
-end
-

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

+function [] = buttonCopyOffsets(~, ~)
+%UNTITLED Summary of this function goes here
+%   Detailed explanation goes here
+
+global artoaWorkspace artoaGui;
+
+%% Save Applied state
+artoa.controller.edit.offsets.saveAppliedState();
+
+%% Get selected index
+index = artoaGui.editOffsets.comboboxOffsetToApplied.Value;
+
+%% Copy selected offset columns to Applied columns
+
+% get measured as default
+offset = artoaWorkspace.editOffsets.offsets{:, 'OffsetStart'};
+drift = artoaWorkspace.editOffsets.offsets{:, 'Drift'};
+
+% store float in table
+if strcmp(artoaGui.editOffsets.comboboxOffsetToApplied.String{index}, 'Empirical')
+    offset = artoaWorkspace.editOffsets.offsets{:, 'EmpiricalOffset'};
+    drift = artoaWorkspace.editOffsets.offsets{:, 'EmpiricalDrift'};
+end
+if strcmp(artoaGui.editOffsets.comboboxOffsetToApplied.String{index}, 'Optimum')
+    offset = artoaWorkspace.editOffsets.offsets{:, 'OptimumTotalOffset'};
+    drift = artoaWorkspace.editOffsets.offsets{:, 'OptimumTotalDrift'};
+end
+artoaWorkspace.editOffsets.offsets{:, 'AppliedOffset'} = offset;
+artoaWorkspace.editOffsets.offsets{:, 'AppliedDrift'} = drift;
+
+%% Soundspeed 
+if strcmp(artoaGui.editOffsets.comboboxOffsetToApplied.String{index}, 'Measured')
+    artoaWorkspace.editOffsets.soundspeed.Applied(1) = artoaWorkspace.editOffsets.soundspeed.Measured(1);
+end
+if strcmp(artoaGui.editOffsets.comboboxOffsetToApplied.String{index}, 'Optimum')
+    artoaWorkspace.editOffsets.soundspeed.Applied(1) = artoaWorkspace.editOffsets.soundspeed.Optimum(1);
+end
+
+%% Update GUI
+artoa.controller.edit.offsets.updateGui();
+
+%% Recalculate
+artoa.controller.edit.recalculateToaGpsAndPlot();
+
+end
+

lib/+artoa/+controller/+main/open.m

@@ -57,8 +57,7 @@ callbacks.tableSoundspeedEdit = @artoa.controller.edit.offsets.tableSoundspeedEd
 callbacks.buttonCalculateOffsets = @artoa.controller.edit.offsets.buttonCalculateOffsets;
 callbacks.checkboxUseOffsets = @artoa.controller.edit.offsets.checkboxUseOffsets;
 callbacks.inputSoundspeed = @artoa.controller.edit.offsets.inputSoundspeed;
-callbacks.buttonCopyFromOptimum = @artoa.controller.edit.offsets.buttonCopyFromOptimum;
-callbacks.buttonCopyFromMeasured = @artoa.controller.edit.offsets.buttonCopyFromMeasured;
+callbacks.buttonCopyOffsets = @artoa.controller.edit.offsets.buttonCopyOffsets;
 callbacks.buttonUndoLastCopy = @artoa.controller.edit.offsets.buttonUndoLastCopy;
 callbacks.buttonAppliedToNan = @artoa.controller.edit.offsets.buttonAppliedToNan;
 
@@ -69,7 +68,8 @@ artoa.gui.main( ...
     callbacks, ...
     artoa.controller.main.collectTrackingMethods(), ...
     artoaConfig.defaults.interpolationMethods, ...
-    artoaConfig.defaults.soundspeedMethods ...
+    artoaConfig.defaults.soundspeedMethods, ...
+    artoaConfig.defaults.offsetsToCopy ...
     );
 
 

lib/+artoa/+controller/addDefaults.m

@@ -19,6 +19,11 @@ artoaConfig.defaults.soundspeedMethods = { ...
     'Soundsource file', ...
     'Manual' ...
 };
+artoaConfig.defaults.offsetsToCopy = { ...
+    'Measured', ...
+    'Empirical', ...
+    'Optimum' ...
+};
 artoaConfig.defaults.pickPointMarkerSize = 80;
 artoaConfig.defaults.topographicalLines = { ...
         -1000; ...

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

@@ -104,11 +104,11 @@ artoaGui.editOffsets.checkboxUseOffsets = uicontrol( ...
 
 artoaGui.editOffsets.buttonCopyFromMeasured = uicontrol( ...
     'Parent', artoaGui.editOffsets.frameOptimumOffsets, ...
-    'String', 'Copy Measured to Applied', ...
+    'String', 'to Applied', ...
     'Style', 'PushButton', ...
     'FontSize', 8, ...
     'Units', 'normalized', ...
-    'Position', [(1.5*left + fullwidth/2) .725 fullwidth/2 .2], ...
+    'Position', [(1.5*left + 3*fullwidth/4) .725 fullwidth/4 .2], ...
     'CallBack', pCallbacks.buttonCopyFromMeasured ...
 );
 

lib/+artoa/+gui/main.m

-function [ ] = main(pCallbacks, pTrackingMethods, pInterpolationMethods, pSoundspeedMethods)
+function [ ] = main(pCallbacks, pTrackingMethods, pInterpolationMethods, pSoundspeedMethods, pOffsetsToCopy)
 %MAIN Contains the definition of main ARTOA4 gui.
 
 global artoaGui;
@@ -46,8 +46,7 @@ availableCallbacks = { ...
     'tableSoundspeedEdit', ...
     'buttonCalculateOffsets', ...
     'checkboxUseOffsets', ...
-    'buttonCopyFromOptimum', ...
-    'buttonCopyFromMeasured', ...
+    'buttonCopyOffsets', ...
     'buttonAppliedToNan', ...
     'buttonUndoLastCopy' ...
 };
@@ -596,24 +595,34 @@ artoaGui.editOffsets.checkboxUseOffsets = uicontrol( ...
     'CallBack', pCallbacks.checkboxUseOffsets ...
 );
 
-artoaGui.editOffsets.buttonCopyFromMeasured = uicontrol( ...
+artoaGui.editOffsets.textOffsetToApplied = uicontrol( ...
     'Parent', artoaGui.editOffsets.frameOptimumOffsets, ...
-    'String', 'Copy Measured to Applied', ...
-    'Style', 'PushButton', ...
+    'String', 'Copy', ...
+    'Style', 'text', ...
+    'FontSize', 8, ...
+    'Units', 'normalized', ...
+    'Position', [(1.5*left + 4*fullwidth/8) .725 fullwidth/8 .2], ...
+    'CallBack', '' ...
+);
+
+artoaGui.editOffsets.comboboxOffsetToApplied = uicontrol( ...
+    'Parent', artoaGui.editOffsets.frameOptimumOffsets, ...
+    'String', pOffsetsToCopy, ...
+    'Style', 'popupmenu', ...
     'FontSize', 8, ...
     'Units', 'normalized', ...
-    'Position', [(1.5*left + fullwidth/2) .725 fullwidth/2 .2], ...
-    'CallBack', pCallbacks.buttonCopyFromMeasured ...
+    'Position', [(1.5*left + 5*fullwidth/8) .725 2*fullwidth/8 .2], ...
+    'CallBack', pCallbacks.comboboxInterpolationMethod ...
 );
 
-artoaGui.editOffsets.buttonCopyFromOptimum = uicontrol( ...
+artoaGui.editOffsets.buttonCopyOffsets = uicontrol( ...
     'Parent', artoaGui.editOffsets.frameOptimumOffsets, ...
-    'String', 'Copy Optimum to Applied', ...
+    'String', 'to Applied', ...
     'Style', 'PushButton', ...
     'FontSize', 8, ...
     'Units', 'normalized', ...
-    'Position', [(1.5*left + fullwidth/2) .5 fullwidth/2 .2], ...
-    'CallBack', pCallbacks.buttonCopyFromOptimum ...
+    'Position', [(1.5*left + 7*fullwidth/8) .725 fullwidth/8 .2], ...
+    'CallBack', pCallbacks.buttonCopyOffsets ...
 );
 
 artoaGui.editOffsets.buttonAppliedToNan = uicontrol( ...

lib/+artoa/+offsets/generateOffsetTable.m

@@ -21,6 +21,8 @@ endDate = NaN;
 startOffset = NaN;
 endOffset = NaN;
 drift = NaN;
+floatEmpiricOffset = artoa.data.getMember(pFloatDetails, {'empiric_offset'}, NaN);
+floatEmpiricDrift = artoa.data.getMember(pFloatDetails, {'empiric_drift'}, NaN);
 if ~islogical(floatOffsets)
     sizeOffsets = size(floatOffsets);
     if sizeOffsets(1) >= 1 && sizeOffsets(2) >= 3 % start date can be calculated
@@ -53,7 +55,9 @@ offsetTable{1, variableNames{2}} = startOffset;
 offsetTable{1, variableNames{3}} = endDate;
 offsetTable{1, variableNames{4}} = endOffset;
 offsetTable{1, variableNames{5}} = drift;
-clear startDate startOffset endDate endOffset drift;
+offsetTable{1, variableNames{6}} = floatEmpiricOffset;
+offsetTable{1, variableNames{7}} = floatEmpiricDrift;
+clear startDate startOffset endDate endOffset drift floatEmpiricOffset floatEmpiricDrift;
 
 if nargin == 1
     return;

lib/+artoa/+versioning/+migrations/versions/v4243.m

+%% Add defaults for offsets to copy if required
+if ~artoa.data.hasMember(artoaConfig, 'defaults', 'offsetsToCopy')
+    artoaConfig.defaults.offsetsToCopy = { ...
+        'Measured', ...
+        'Empirical', ...
+        'Optimum' ...
+        };
+end