Skip to content
Snippets Groups Projects

fix 3D node from AUG side ala sf2sig

Merged Olivier Sauter requested to merge fix_aug_3d into master
2 files
+ 36
2
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 24
1
@@ -345,11 +345,35 @@ if strcmp(mapping_for_aug.method,'signal')
if isfield(aatmp,'data'); gdat_data.data = aatmp.data; end
if isfield(aatmp,'t'); gdat_data.t = aatmp.t; end
if isfield(aatmp,'x'); gdat_data.x = aatmp.x; end
if isfield(aatmp,'dim'); gdat_data.dim = aatmp.dim; end
if isfield(aatmp,'dimunits'); gdat_data.dimunits = aatmp.dimunits; end
gdat_data.data_fullpath=mapping_for_aug.expression;
if isempty(aatmp.data) || (isempty(gdat_data.t) && isempty(gdat_data.x))
return
end
% construct .dim if not present (means coming from sf2sig)
if ~isfield(aatmp,'dim')
len_t = numel(aatmp.t);
len_x = numel(aatmp.x);
len_data= size(aatmp.data);
itime = find(len_data==len_t);
nbdims_eff = sum([size(gdat_data.data)~=1]);
aatmp.dim{itime} = aatmp.t;
aatmp.dimunits{itime} = aatmp.time_aug.unit;
if nbdims_eff >= 2
% assume area-base is main 2nd coordinate (did not find a case with 2 area-base (2 coordinates defined in addition to time) to be able to test)
i_x = setdiff([1:2],itime);
aatmp.dim{i_x} = aatmp.x;
aatmp.dimunits(i_x) = aatmp.area.unit;
if isempty(aatmp.dimunits{i_x}); aatmp.dimunits{i_x} = ''; end
for i=3:nbdims_eff
aatmp.dim{i} = [1:size(aatmp.data,i)];
aatmp.dimunits{i} = '';
end
end
gdat_data.dim = aatmp.dim;
gdat_data.dimunits = aatmp.dimunits;
end
mapping_for_aug_timedim_orig = mapping_for_aug.timedim;
if mapping_for_aug.timedim<=0
% need to guess timedim
@@ -404,7 +428,6 @@ if strcmp(mapping_for_aug.method,'signal')
gdat_data.t = gdat_data.dim{mapping_for_aug.timedim};
adata = gdat_data.data;
gdat_data.data = permute(adata,[2 1 3:numel(size(adata))]);
end
end
end
Loading