Skip to content
Snippets Groups Projects
Commit e3f0f585 authored by leprob001's avatar leprob001
Browse files

Bugfixes.

parent e0b32856
No related branches found
No related tags found
No related merge requests found
...@@ -57,21 +57,21 @@ ...@@ -57,21 +57,21 @@
-temp_counts 20 -temp_counts 20
[SAT_FORMAT] [SAT_FORMAT]
-lat_sat 1 -lat_sat 14
-lon_sat 2 -lon_sat 15
-src 3 -src 1
-year_sat 4 -year_sat 2
-month_sat 5 -month_sat 3
-day_sat 6 -day_sat 4
-hour_sat 7 -hour_sat 5
-minutes_sat 8 -minutes_sat 6
-seconds_sat 9 -seconds_sat 7
-year_rtc 10 -year_rtc 8
-month_rtc 11 -month_rtc 9
-day_rtc 12 -day_rtc 10
-hour_rtc 13 -hour_rtc 11
-minutes_rtc 14 -minutes_rtc 12
-seconds_rtc 15 -seconds_rtc 13
[SAT_DATA] [SAT_DATA]
1 2015 1 29 11 34 33 2015 1 29 11 34 39 -42.843552 15.2630016 1 2015 1 29 11 34 33 2015 1 29 11 34 39 -42.843552 15.2630016
......
...@@ -28,7 +28,6 @@ end ...@@ -28,7 +28,6 @@ end
artoaDataInput.soundsources = artoa.load.soundsources(filepath); artoaDataInput.soundsources = artoa.load.soundsources(filepath);
%% Update workspace %% Update workspace
artoa.soundsources.generateSoundSourceColors();
%% Update menu buttons %% Update menu buttons
if ~islogical(artoaDataInput.soundsources) if ~islogical(artoaDataInput.soundsources)
......
...@@ -13,6 +13,8 @@ filter = artoa.data.getMember(artoaDataInput, {'ini', 'filemask', 'interim'}, '* ...@@ -13,6 +13,8 @@ filter = artoa.data.getMember(artoaDataInput, {'ini', 'filemask', 'interim'}, '*
filepath = fullfile(pathname, filename); filepath = fullfile(pathname, filename);
save(filepath, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput');
return
if isfile(filepath) if isfile(filepath)
save(filepath, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput'); save(filepath, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput');
else else
......
...@@ -92,7 +92,7 @@ for o = 1:gpsMeasurementCount ...@@ -92,7 +92,7 @@ for o = 1:gpsMeasurementCount
+ distanceSoundSourceToFloat / (artoa.data.calculateSoundVelocity( ... + distanceSoundSourceToFloat / (artoa.data.calculateSoundVelocity( ...
pSoundSpeedParameter.temperature, pSoundSpeedParameter.pressure, ... pSoundSpeedParameter.temperature, pSoundSpeedParameter.pressure, ...
pSoundSpeedParameter.method, pSoundSpeedParameter.soundSource ... pSoundSpeedParameter.method, pSoundSpeedParameter.soundSource ...
)/1000) + pRfb.FLOAT.windowstart * 60; % TODO: CHECK IF /1000 IS CORRECT )/1000) + pRfb.FLOAT.windowstart * 60;
end end
......
...@@ -5,6 +5,9 @@ function [register] = remove(pSoundsourceName, pRegister) ...@@ -5,6 +5,9 @@ function [register] = remove(pSoundsourceName, pRegister)
register = pRegister; register = pRegister;
soundsourceLogical = strcmp(register, pSoundsourceName); soundsourceLogical = strcmp(register, pSoundsourceName);
register(soundsourceLogical) = {''}; register(soundsourceLogical) = {''};
if all(cellfun(@isempty, register))
register = {};
end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment