diff --git a/VERSION b/VERSION index c6876402f55fcc4178060d4f0b5d16a8e23a5c96..ac7cd1ac708f39a4800c68c43a53d17b65a2ce07 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 16ef3be548f613195c67e3ab125f937fe78b7bb3..c4c0f9dd85f6dbdc4e5d9286f1b4980c3891712f 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 eccb195a169483959cde32bc673d0476b637c931..164fa4bb60487da759029029814f41855b6f9727 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 93ee5110dca0bc3ec2ea626bd21f4afb5749b55e..9f30456e1a1b8a347a5431ca3160c752d4d209c8 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 8ca6467a6a18475a239ceed2fa831e1eece0942b..8da0819ec11b6bc00f49f71d5818fc96e829b5e8 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( ...