FIX - resolved invalid pointcloud datatype, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3158

Author: robertoostenveld

fileio/private/ft_checkdata.m

@@ -130,7 +130,6 @@
 isfreqmvar      = ft_datatype(data, 'freqmvar');
 ischan          = ft_datatype(data, 'chan');
 ismesh          = ft_datatype(data, 'mesh');
-ispointcloud    = ft_datatype(data, 'pointcloud');
 % FIXME use the istrue function on ismeg and hasxxx options
 
 if ~isequal(feedback, 'no')
@@ -211,9 +210,6 @@
   else
     fprintf('the input is mesh data multiple surfaces\n');
   end
-elseif ispointcloud
-  data = fixpos(data);
-    fprintf('the input is point cloud data with %d vertices ', size(data.pos,1));
 end % give feedback    
 
 if issource && isvolume
@@ -222,6 +218,7 @@
   data = rmfield(data, 'pos');
   issource = false;
 end
+
 % the ft_datatype_XXX functions ensures the consistency of the XXX datatype
 % and provides a detailed description of the dataformat and its history
 if iscomp % this should go before israw/istimelock/isfreq
@@ -291,8 +288,6 @@
         okflag = okflag + isparcellation;
       case 'mesh'
         okflag = okflag + ismesh;
-      case 'pointcloud'
-        okflag = okflag + ispointcloud;
     end % switch dtype
   end % for dtype
 

ft_defacevolume.m

@@ -71,11 +71,10 @@
 cfg.feedback  = ft_getopt(cfg, 'feedback', 'yes');
 
 % check if the input data is valid for this function
-mri = ft_checkdata(mri, 'datatype', {'volume', 'mesh', 'pointcloud'}, 'feedback', 'yes');
+mri = ft_checkdata(mri, 'datatype', {'volume', 'mesh'}, 'feedback', 'yes');
 
 ismri  = ft_datatype(mri, 'mri');
 ismesh = ft_datatype(mri, 'mesh');
-ispointcloud = ft_datatype(mri,'pointcloud');
 
 % determine the size of the "unit" sphere in the origin and the length of the axes
 switch mri.unit
@@ -114,7 +113,7 @@
   anatomy = (mri.anatomy-clim(1))/(clim(2)-clim(1));
 
   ft_plot_ortho(anatomy, 'transform', mri.transform, 'unit', mri.unit, 'resolution', resolution, 'style', 'intersect');
-elseif ismesh || ispointcloud
+elseif ismesh
   ft_plot_mesh(mri);
 end
 
@@ -187,7 +186,7 @@
     voxpos(:,3) > -0.5 & ...
     voxpos(:,3) < +0.5;
 
-elseif ismesh || ispointcloud
+elseif ismesh
   meshpos = ft_warp_apply(inv(T*R*S), mri.pos);               % mesh vertex positions in box coordinates
 
   remove = ...
@@ -236,13 +235,14 @@
 
 elseif ismesh 
   fprintf('keeping %d and removing %d vertices in the mesh\n', sum(remove==0), sum(remove==1));
-  [mri.pos, mri.tri] = remove_vertices(mri.pos, mri.tri, remove);
+  if isfield(mri, 'tri')
+    [mri.pos, mri.tri] = remove_vertices(mri.pos, mri.tri, remove);
+  else
+    mri.pos = mri.pos(remove,1:3);
+  end
   if isfield(mri, 'color')
     mri.color = mri.color(~remove,:);
   end
-elseif ispointcloud  
-  fprintf('keeping %d and removing %d vertices in the mesh\n', sum(remove==0), sum(remove==1));
-  mri.pos = mri.pos(remove,1:3);
 end
 
 % remove the temporary fields from the configuration, keep the rest for provenance

utilities/ft_checkdata.m

@@ -130,7 +130,6 @@
 isfreqmvar      = ft_datatype(data, 'freqmvar');
 ischan          = ft_datatype(data, 'chan');
 ismesh          = ft_datatype(data, 'mesh');
-ispointcloud    = ft_datatype(data, 'pointcloud');
 % FIXME use the istrue function on ismeg and hasxxx options
 
 if ~isequal(feedback, 'no')
@@ -211,9 +210,6 @@
   else
     fprintf('the input is mesh data multiple surfaces\n');
   end
-elseif ispointcloud
-  data = fixpos(data);
-    fprintf('the input is point cloud data with %d vertices ', size(data.pos,1));
 end % give feedback    
 
 if issource && isvolume
@@ -222,6 +218,7 @@
   data = rmfield(data, 'pos');
   issource = false;
 end
+
 % the ft_datatype_XXX functions ensures the consistency of the XXX datatype
 % and provides a detailed description of the dataformat and its history
 if iscomp % this should go before israw/istimelock/isfreq
@@ -291,8 +288,6 @@
         okflag = okflag + isparcellation;
       case 'mesh'
         okflag = okflag + ismesh;
-      case 'pointcloud'
-        okflag = okflag + ispointcloud;
     end % switch dtype
   end % for dtype