From 43e31d00c08b3578cef881383036f138b6046468 Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Tue, 9 Jun 2020 17:06:08 +0200
Subject: [PATCH] Bugfixes.

---
 VERSION                                       |  2 +-
 lib/+artoa/+controller/+file/loadArtoaIni.m   |  2 ++
 .../+trajectoryOutput/clearTrajectoryPlot.m   |  8 ++---
 lib/+artoa/+controller/addDefaults.m          | 32 +++++++++++++++++++
 lib/+artoa/+controller/initializeArtoa4.m     | 18 +----------
 lib/+artoa/+versioning/+migrations/apply.m    |  2 +-
 6 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 lib/+artoa/+controller/addDefaults.m

diff --git a/VERSION b/VERSION
index fba8ce0..bcad854 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 95fee85..69ac60d 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 5d9ab10..5da7a36 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 0000000..fa6838a
--- /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 b973f8d..9f5e4bc 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 393ec8f..71a6541 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';
-- 
GitLab