From 8b72ada52c65790a2799cfb1fde91dbb33d8ef39 Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Mon, 5 Aug 2019 17:14:20 +0200
Subject: [PATCH] Refactoring, started to add toaData to artoaWorkspace.
---
lib/+artoa/+controller/+edit/+pressure/plot.m | 2 +-
lib/+artoa/+controller/copyRfbToWorkspace.m | 31 +++++++++++++------
lib/+artoa/+gui/+edit/pressure.m | 2 +-
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/lib/+artoa/+controller/+edit/+pressure/plot.m b/lib/+artoa/+controller/+edit/+pressure/plot.m
index e95d092..619acae 100644
--- a/lib/+artoa/+controller/+edit/+pressure/plot.m
+++ b/lib/+artoa/+controller/+edit/+pressure/plot.m
@@ -1,5 +1,5 @@
function [] = plot()
-%PLOT Plots or updates the temperature points.
+%PLOT Plots or updates the pressure points.
% If the plot already exists and is valid, the points only get updated.
% Otherwise the plot will be initialized
%
diff --git a/lib/+artoa/+controller/copyRfbToWorkspace.m b/lib/+artoa/+controller/copyRfbToWorkspace.m
index a53b084..2ebabb4 100644
--- a/lib/+artoa/+controller/copyRfbToWorkspace.m
+++ b/lib/+artoa/+controller/copyRfbToWorkspace.m
@@ -6,31 +6,44 @@ global artoaDataInput artoaWorkspace;
%% Generate workspace
-% TOA
+%% TOA
artoaWorkspace.toaData = struct();
artoaWorkspace.toaData.status = zeros( ...
size(artoaDataInput.rfb.DATA, 1) * length(artoaDataInput.rfb.VARIABLE_LIST.time_of_arrival), ...
1 ...
);
-% TEMPERATURE
-artoaWorkspace.temperature = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature);
-% PRESSURE
-artoaWorkspace.pressure = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure);
+artoaWorkspace.toaData.toa = [];
+toaColumns = artoaDataInput.rfb.VARIABLE_LIST.time_of_arrival;
+for i = 1:length(toaColumns)
+ artoaWorkspace.toaData.toa = [ ...
+ artoaWorkspace.toaData.toa; ...
+ artoaDataInput.rfb.DATA(:, toaColumns(i)) ...
+ ];
+end
+
+%% EXCLUDE INVALID TOAs
+toaToExclude = artoaWorkspace.toaData.toa(:) == 9999;
+artoaWorkspace.toaData.status(toaToExclude) = 2;
-% STATUS
+
+%% TEMPERATURE
+artoaWorkspace.temperature = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature);
artoaWorkspace.statusTemperature = zeros(size(artoaDataInput.rfb.DATA, 1), 1);
+
+%% PRESSURE
+artoaWorkspace.pressure = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure);
artoaWorkspace.statusPressure = zeros(size(artoaDataInput.rfb.DATA, 1), 1);
-% EXCLUDE LINES CONTAINING 9999
+%% EXCLUDE LINES CONTAINING 9999
temperatureToExclude = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.temperature) == 9999;
pressureToExclude = artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.pressure) == 9999;
%pointsToExclude = or(temperatureToExclude, pressureToExclude);
artoaWorkspace.statusTemperature(temperatureToExclude) = 2;
artoaWorkspace.statusPressure(pressureToExclude) = 2;
-% RAFOS DATE
+%% RAFOS DATE
artoaWorkspace.rafosDate = artoa.convert.dmy2rd( ...
artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_day), ...
artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_mon), ...
@@ -43,7 +56,7 @@ artoa.convert.hms2rd( ...
artoaDataInput.rfb.DATA(:, artoaDataInput.rfb.VARIABLE_LIST.start_listen_sec) ...
);
-% FLOAT DETAILS
+%% FLOAT DETAILS
artoaWorkspace.float = artoaDataInput.rfb.FLOAT;
diff --git a/lib/+artoa/+gui/+edit/pressure.m b/lib/+artoa/+gui/+edit/pressure.m
index 3de7316..025e0aa 100644
--- a/lib/+artoa/+gui/+edit/pressure.m
+++ b/lib/+artoa/+gui/+edit/pressure.m
@@ -8,7 +8,7 @@ global artoaGui artoaWorkspace;
windowTitle = [ 'ARTOA4 - Float ' num2str(artoaWorkspace.float.floatname) ' - Pressure' ];
-%% Initialize temperature gui
+%% Initialize pressure gui
artoaGui.figures.editPressure = figure( ...
'Name', windowTitle, ...
--
GitLab