move MultiDimIterator into Common folder, include from CiftiFile and …

…NiftiIO, add convenience iterator construction method from CiftiFile

example/rewrite.cxx

@@ -1,5 +1,4 @@
 #include "CiftiFile.h"
-#include "CiftiMultiDimIterator.h"
 
 #include <iostream>
 #include <vector>
@@ -46,7 +45,7 @@ int main(int argc, char** argv)
         outputFile.setCiftiXML(inputFile.getCiftiXML());//the CiftiXML is how you access all the mapping information
         const vector<int64_t>& dims = inputFile.getDimensions();
         vector<float> scratchRow(dims[0]);//read/write a row at a time
-        for (MultiDimIterator<int64_t> iter(vector<int64_t>(dims.begin() + 1, dims.end())); !iter.atEnd(); ++iter)
+        for (MultiDimIterator<int64_t> iter = inputFile.getIteratorOverRows(); !iter.atEnd(); ++iter)
         {//helper class to iterate over 2D and 3D cifti with the same code - the "+ 1" is to drop the first dimension (row length)
             inputFile.getRow(scratchRow.data(), *iter);
             outputFile.setRow(scratchRow.data(), *iter);

src/CMakeLists.txt

@@ -3,7 +3,6 @@ PROJECT(src)
 SET(HEADERS
 CiftiFile.h
 NiftiIO.h
-CiftiMultiDimIterator.h
 )
 
 SET(SOURCES

src/CiftiFile.cxx

@@ -29,7 +29,6 @@
 
 #include "Common/CiftiAssert.h"
 #include "Common/MultiDimArray.h"
-#include "CiftiMultiDimIterator.h"
 #include "NiftiIO.h"
 
 #ifdef CIFTILIB_USE_QT

src/CiftiFile.h

@@ -30,6 +30,7 @@
 
 #include "Common/AString.h"
 #include "Common/CiftiException.h"
+#include "Common/MultiDimIterator.h"
 #include "Cifti/CiftiXML.h"
 
 #include "boost/shared_ptr.hpp"
@@ -76,6 +77,12 @@ namespace cifti
         void getRow(float* dataOut, const std::vector<int64_t>& indexSelect, const bool& tolerateShortRead = false) const;
         const std::vector<int64_t>& getDimensions() const { return m_dims; }
 
+        ///convenience function for iterating over arbitrary numbers of dimensions
+        MultiDimIterator<int64_t> getIteratorOverRows() const
+        {
+            return MultiDimIterator<int64_t>(std::vector<int64_t>(getDimensions().begin() + 1, getDimensions().end()));
+        }
+
         ///for 2D only, will be slow if on disk!
         void getColumn(float* dataOut, const int64_t& index) const;
 

src/Common/CMakeLists.txt

@@ -13,6 +13,7 @@ FloatMatrix.h
 MatrixFunctions.h
 MathFunctions.h
 MultiDimArray.h
+MultiDimIterator.h
 Vector3D.h
 VoxelIJK.h
 XmlAdapter.h

src/NiftiIO.h

@@ -35,6 +35,9 @@
 #include "Common/CiftiException.h"
 #include "Nifti/NiftiHeader.h"
 
+//include MultiDimIterator from a private include directory, in case people want to use it with NiftiIO
+#include "Common/MultiDimIterator.h"
+
 #include <cmath>
 #include <limits>
 #include <vector>