measurement state
This commit is contained in:
@@ -125,23 +125,49 @@ classdef DataStorage < handle
|
||||
lin_idx = obj.getIndicesByPhys(varargin);
|
||||
errcnt = 0;
|
||||
for i=1:numel(lin_idx)
|
||||
try
|
||||
|
||||
tmp = obj.sto.(storageVarName){lin_idx(i)};
|
||||
if ~isempty(tmp)
|
||||
if isa(tmp,'Signal')
|
||||
|
||||
if isa(tmp,'Signal') || isa(tmp,'struct') || isa(tmp,'Exfo_laser')
|
||||
if i == 1
|
||||
value = {};
|
||||
end
|
||||
value{i} = tmp ;
|
||||
|
||||
elseif isa(tmp,'cell')
|
||||
if isa(tmp{1},'Signal')
|
||||
if i == 1
|
||||
value = {};
|
||||
end
|
||||
value{i} = tmp{1} ;
|
||||
else
|
||||
value{i} = tmp{1} ;
|
||||
end
|
||||
|
||||
else
|
||||
value(i,:) = tmp ;
|
||||
|
||||
try
|
||||
value(i,:) = tmp ;
|
||||
catch
|
||||
% value(i,:) = tmp(1:size(value,2)) ;
|
||||
|
||||
if size(value,2) < size(tmp,2)
|
||||
|
||||
diff = size(tmp,2) - size(value,2);
|
||||
value(:,end+1:end+diff) = NaN(size(value,1),diff);
|
||||
value(i,:) = tmp ;
|
||||
|
||||
elseif size(value,2) > size(tmp,2)
|
||||
|
||||
diff = size(value,2) - size(tmp,2);
|
||||
tmp(:,end+1:end+diff) = NaN(1,diff);
|
||||
value(i,:) = tmp ;
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
else
|
||||
errcnt = errcnt+1;
|
||||
@@ -166,9 +192,7 @@ classdef DataStorage < handle
|
||||
% warning([num2str(errcnt),' requested datapoint(s) not in warehouse.']);
|
||||
end
|
||||
|
||||
catch
|
||||
error('Error in Datastorage: Something happened while looking up in warehouse.')
|
||||
end
|
||||
|
||||
end
|
||||
else
|
||||
error('Wrong Request using ExampleWarehouse.getStoValue(*parameter set*). Give me all the Parameters! Please!')
|
||||
|
||||
Reference in New Issue
Block a user