From 42d17584c6124582f64f1e8f3fe20492fc86603d Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Thu, 2 Jul 2020 16:53:19 +0200
Subject: [PATCH] The topographical lines can now be set in the artoa.ini at
the defaults section.
---
VERSION | 2 +-
artoa.ini.example | 1 +
lib/+artoa/+controller/+track/+trajectoryOutput/open.m | 2 +-
lib/+artoa/+controller/addDefaults.m | 5 -----
lib/+artoa/+gui/+track/trajectoryOutput.m | 2 +-
5 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/VERSION b/VERSION
index c687640..ac7cd1a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-278
\ No newline at end of file
+279
\ No newline at end of file
diff --git a/artoa.ini.example b/artoa.ini.example
index 16ef3be..c4c0f9d 100644
--- a/artoa.ini.example
+++ b/artoa.ini.example
@@ -56,6 +56,7 @@
-pressure 9999
-temperature 9999
-toa 9999
+-topographical_lines -4000 -3000 -2000
[offsetvariations]
1 1
diff --git a/lib/+artoa/+controller/+track/+trajectoryOutput/open.m b/lib/+artoa/+controller/+track/+trajectoryOutput/open.m
index eccb195..164fa4b 100644
--- a/lib/+artoa/+controller/+track/+trajectoryOutput/open.m
+++ b/lib/+artoa/+controller/+track/+trajectoryOutput/open.m
@@ -36,7 +36,7 @@ if ~isfield(artoaWorkspace, 'trajectoryOutput')
artoaWorkspace.trajectoryOutput = struct();
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
artoaWorkspace.trajectoryOutput.showPositionDates = true;
- artoaWorkspace.trajectoryOutput.topographicalLines = artoaConfig.defaults.topographicalLines;
+ artoaWorkspace.trajectoryOutput.topographicalLines = artoaConfig.defaults.topographical_lines';
artoaWorkspace.trajectoryOutput.enableMercatorProjection = false;
artoaWorkspace.trajectoryOutput.syncZoomToaWindow = true;
artoaWorkspace.trajectoryOutput.enableTrueDistance = false;
diff --git a/lib/+artoa/+controller/addDefaults.m b/lib/+artoa/+controller/addDefaults.m
index 93ee511..9f30456 100644
--- a/lib/+artoa/+controller/addDefaults.m
+++ b/lib/+artoa/+controller/addDefaults.m
@@ -29,11 +29,6 @@ artoaConfig.defaults.soundvelocityToCopy = { ...
'Optimum' ...
};
artoaConfig.defaults.pickPointMarkerSize = 80;
-artoaConfig.defaults.topographicalLines = { ...
- -1000; ...
- -2000; ...
- -3000 ...
- };
end
diff --git a/lib/+artoa/+gui/+track/trajectoryOutput.m b/lib/+artoa/+gui/+track/trajectoryOutput.m
index 8ca6467..8da0819 100644
--- a/lib/+artoa/+gui/+track/trajectoryOutput.m
+++ b/lib/+artoa/+gui/+track/trajectoryOutput.m
@@ -55,7 +55,7 @@ leftSidebarWidth = .2;
leftSidebarLeft = .015;
%% Setup axes
-if ~artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'enableMercatorProjection'})
+if ~artoa.data.hasMember(artoaWorkspace, 'trajectoryOutput', 'enableMercatorProjection')
artoaWorkspace.trajectoryOutput.enableMercatorProjection = false;
end
artoa.controller.track.trajectoryOutput.setupTrajectoryAxes( ...
--
GitLab