Bugfixes.

VERSION

-224
+225
\ No newline at end of file

lib/+artoa/+controller/+file/loadArtoaIni.m

@@ -16,6 +16,8 @@ if isempty(artoaConfig)
     error([mfilename ': artoa.ini has been found but is empty. Please use a valid artoa.ini!']);
 end
 
+artoa.controller.addDefaults();
+
 artoa.controller.edit.updateAvailablePlots();
 
 

lib/+artoa/+controller/+track/+trajectoryOutput/clearTrajectoryPlot.m

@@ -6,21 +6,21 @@ global artoaGui;
 
 
 %% Scatter sound sources
-if artoa.data.hasMember(artoaGui, {'trajectoryOutput', 'scatterSoundsources'}) ...
+if artoa.data.hasMember(artoaGui, 'trajectoryOutput', 'scatterSoundsources') ...
         & isvalid(artoaGui.trajectoryOutput.scatterSoundsources)
     delete(artoaGui.trajectoryOutput.scatterSoundsources);
 end
-if artoa.data.hasMember(artoaGui, {'trajectoryOutput', 'textScatterSoundsources'}) ...
+if artoa.data.hasMember(artoaGui, 'trajectoryOutput', 'textScatterSoundsources') ...
         & isvalid(artoaGui.trajectoryOutput.textScatterSoundsources)
     delete(artoaGui.trajectoryOutput.textScatterSoundsources);
 end
 
 %% Scatter sat data
-if artoa.data.hasMember(artoaGui, {'trajectoryOutput', 'scatterFloatSatData'}) ...
+if artoa.data.hasMember(artoaGui, 'trajectoryOutput', 'scatterFloatSatData') ...
         & isvalid(artoaGui.trajectoryOutput.scatterFloatSatData)
     delete(artoaGui.trajectoryOutput.scatterFloatSatData);
 end
-if artoa.data.hasMember(artoaGui, {'trajectoryOutput', 'textScatterFloatSatData'}) ...
+if artoa.data.hasMember(artoaGui, 'trajectoryOutput', 'textScatterFloatSatData') ...
         & isvalid(artoaGui.trajectoryOutput.textScatterFloatSatData)
     delete(artoaGui.trajectoryOutput.textScatterFloatSatData);
 end

lib/+artoa/+controller/addDefaults.m

+function [] = addDefaults()
+%ADDDEFAULTS Summary of this function goes here
+%   Detailed explanation goes here
+
+global artoaConfig;
+
+if ~artoa.data.hasMember(artoaConfig, 'defaults')
+    artoaConfig.defaults = struct();
+end
+artoaConfig.defaults.interpolationMethods = { ...
+    'None', ...
+    'Linear', ...
+    'Spline', ...
+    'Cubic' ...
+};
+artoaConfig.defaults.soundspeedMethods = { ...
+    'Del Grosso', ...
+    'Linear', ...
+    'Soundsource file', ...
+    'Levitus', ...
+    'Manual' ...
+};
+artoaConfig.defaults.pickPointMarkerSize = 80;
+artoaConfig.defaults.topographicalLines = { ...
+        -1000; ...
+        -2000; ...
+        -3000 ...
+        };
+
+
+end
+

lib/+artoa/+controller/initializeArtoa4.m

@@ -32,23 +32,7 @@ artoaWorkspace.editOffsets.useOffsets = false;
 artoa.controller.file.loadArtoaIni();
 
 %% Configure artoa defaults
-if ~artoa.data.hasMember(artoaConfig, 'defaults')
-    artoaConfig.defaults = struct();
-end
-artoaConfig.defaults.interpolationMethods = { ...
-    'None', ...
-    'Linear', ...
-    'Spline', ...
-    'Cubic' ...
-};
-artoaConfig.defaults.soundspeedMethods = { ...
-    'Del Grosso', ...
-    'Linear', ...
-    'Soundsource file', ...
-    'Levitus', ...
-    'Manual' ...
-};
-artoaConfig.defaults.pickPointMarkerSize = 80;
+artoa.controller.addDefaults();
 
 %% Read soundsource file if existent
 try

lib/+artoa/+versioning/+migrations/apply.m

@@ -36,7 +36,7 @@ try
     versionsFileNames = dir(fullfile(versionsFilePath, 'versions', 'v*.m'));
 
     %% Load the interim file
-    load(pInterimFilename, 'artoaWorkspace', 'artoaDataInput', '-mat');
+    load(pInterimFilename, 'artoaWorkspace', 'artoaDataInput', 'artoaConfig', '-mat');
 
     %% Get itm version
     itmVersion = 'unknown';