Merge branch '597-nwb-to-table-bug' into 571-special-table-tutorial

+types/+util/+dynamictable/nwbToTable.m

@@ -2,7 +2,7 @@
 %NWBTOTABLE converts from a NWB DynamicTable to a MATLAB table 
 %
 %   MATLABTABLE = NWBTOTABLE(T) converts object T of class types.core.DynamicTable
-%   into a MATLAB Tale
+%   into a MATLAB Table
 %   
 %   MATLABTABLE = NWBTOTABLE(T, INDEX) If INDEX is FALSE, includes rows referenced by a
 %   DynamicTableRegion as nested subtables
@@ -50,10 +50,10 @@
 );
 
 % deal with DynamicTableRegion columns when index is false
-columns = DynamicTable.colnames;
-i = 1;
-while i < length(columns)
-    cn = DynamicTable.colnames{i};
+[columns, remainingColumns] = deal(DynamicTable.colnames);
+
+for i = 1:length(columns)
+    cn = columns{i};
     if isprop(DynamicTable, cn)
         cv = DynamicTable.(cn);
     elseif isprop(DynamicTable, 'vectorindex') && DynamicTable.vectorindex.isKey(cn) % Schema version < 2.3.0
@@ -71,15 +71,17 @@
             cv{r,1} = ref_table.getRow(row_idxs(r)+1);
         end
         matlabTable.(cn) = cv;
-        columns(i) = [];
+        remainingColumns(i) = [];
     else
-        i = i+1;
+        % pass
     end
 end
 % append remaining columns to table
 % making the assumption that length of ids reflects table height
 matlabTable = [matlabTable DynamicTable.getRow( ...
     1:length(ids), ...
-    'columns', columns ...
+    'columns', remainingColumns ...
 )];
 
+% Update the columns order to be the same as the original 
+matlabTable = matlabTable(:, [{'id'}, columns]);