diff --git a/VERSION b/VERSION index fba8ce006f0094e3ae686eaad14c468913979de9..bcad85486c9cd9d18f67e21823dd267b0cb2a00e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -224 \ No newline at end of file +225 \ No newline at end of file diff --git a/lib/+artoa/+controller/+file/loadArtoaIni.m b/lib/+artoa/+controller/+file/loadArtoaIni.m index 95fee8552cc536d9b1105ad0b16230f66da36003..69ac60da322917b35ad7b68d229aab9d9a2eea77 100644 --- a/lib/+artoa/+controller/+file/loadArtoaIni.m +++ b/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(); diff --git a/lib/+artoa/+controller/+track/+trajectoryOutput/clearTrajectoryPlot.m b/lib/+artoa/+controller/+track/+trajectoryOutput/clearTrajectoryPlot.m index 5d9ab105ed3fe8843f52499638b0d2df62415605..5da7a3690a4e3d570b5c454322c484d0137b38b6 100644 --- a/lib/+artoa/+controller/+track/+trajectoryOutput/clearTrajectoryPlot.m +++ b/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 diff --git a/lib/+artoa/+controller/addDefaults.m b/lib/+artoa/+controller/addDefaults.m new file mode 100644 index 0000000000000000000000000000000000000000..fa6838a80c2d36e1676268b00d9b9b9662f7bd88 --- /dev/null +++ b/lib/+artoa/+controller/addDefaults.m @@ -0,0 +1,32 @@ +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 + diff --git a/lib/+artoa/+controller/initializeArtoa4.m b/lib/+artoa/+controller/initializeArtoa4.m index b973f8dd02ccd18316172c8e1b428c3b890a7c92..9f5e4bc0a2dbe6c10b27f0e71fe87da472045d72 100644 --- a/lib/+artoa/+controller/initializeArtoa4.m +++ b/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 diff --git a/lib/+artoa/+versioning/+migrations/apply.m b/lib/+artoa/+versioning/+migrations/apply.m index 393ec8fbe4b0813aa49f7275baa8078244d49d05..71a6541a4760b21a3a81364fcbe82752d1a6c991 100644 --- a/lib/+artoa/+versioning/+migrations/apply.m +++ b/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';