the get_list function by using the windows.h, these changes are in the image_stack.h and filename.h

Laila Saadatifard
1 parent 91d8912e
Showing 5 changed files with 114 additions and 32 deletions Show diff stats
stim/cuda/arraymath/array_cart2polar.cuh
stim/grids/grid.h
stim/grids/image_stack.h
stim/image/image.h
stim/parser/filename.h
@@ -33,7 +33,6 @@ namespace stim{
 			dim3 threads(max_threads, 1);
 			dim3 blocks(x/threads.x + (x %threads.x == 0 ? 0:1) , y);
-
 			//call the kernel to do the multiplication
 			cuda_cart2polar <<< blocks, threads >>>(gpuGrad, x, y);
@@ -5,7 +5,7 @@
 #include <string>
 #include <sstream>
 #include <fstream>
-#include <cstdarg>
+#include <cstdarg> 
 #include <stim/math/vector.h>
@@ -51,7 +51,9 @@ protected:
 public:
 	///Default constructor doesn't do anything
-	grid(){}
+	grid(){
+		ptr = NULL;			//set the pointer to NULL so that we know nothing is allocated
+	}
 	///Constructor used to specify the grid size as a vector
@@ -110,6 +112,9 @@ public:
 		R = S;	//set the sample resolution
+		//allocate space for the data
+		init();
+
 		std::fstream file;
 		//open the file as binary for writing
@@ -118,6 +123,7 @@ public:
 		//seek past the header
 		file.seekg(header, std::ios::beg);
+
 		//read the data
 		file.read((char *)ptr, samples() * sizeof(T));
 	}
@@ -173,7 +179,9 @@ public:
 		for(unsigned int d = 0; d<D; d++){
 			if(d!=0) result<<", ";
 			result<<R[d];
+
 		}
+
 		result<<"]"<<std::endl;
 		//calculate the number of values to output
@@ -21,6 +21,7 @@ protected:
 	using stim::grid<T, 4>::R;
 	using stim::grid<T, 4>::ptr;
 	using stim::grid<T, 4>::samples;
+	using stim::grid<T, 4>::read;
 public:
@@ -62,11 +63,13 @@ public:
 		//load and copy each image into the grid
 		for(unsigned int i = 0; i<R[3]; i++){
+			std::cout<<"File to Load: "<<file_list[i].str()<<std::endl;
 			//load the image
 			stim::image<T> I(file_list[i].str());
 			//retrieve the interlaced data from the image - store it in the grid
 			I.data_interleaved(&ptr[ i * R[0] * R[1] * R[2] ]);
+			
 		}
 	}
@@ -117,6 +120,19 @@ public:
 			save_image(file_list[i], i);
 	}
+	/// Returns the pixel at the specified point
+	T get(unsigned int x, unsigned int y, unsigned int z, unsigned int c = 0){
+		return ptr[z * R[0] * R[1] * R[2] + y * R[0] * R[1] + x * R[0] + c];
+	}
+
+	void read(std::string file, unsigned int X, unsigned int Y, unsigned int Z, unsigned int C = 1, unsigned int header = 0){
+		read(file, stim::vec<unsigned long>(C, X, Y, Z), header);
+	}
+
+	T* data(){
+		return ptr;
+	}
+
 };
@@ -135,6 +135,7 @@ public:
 	}
 	T* data(){
+
 		return img.data();
 	}
@@ -260,6 +261,22 @@ public:
 		return result;
 	}
+
+	// leila's code for non_interleaving data in 3D
+	//create an data set from an interleaved buffer
+	void set_interleaved3(T* buffer, unsigned int width, unsigned int height, unsigned int depth, unsigned int channels = 3){
+
+		T* non_interleaved3 = (T*)malloc(width * height * depth * 3 * sizeof(T));
+		unsigned int p = width * height * depth;
+
+		for(unsigned int i = 0; i < p; i++){
+			for(unsigned int c = 0; c < channels; c++){
+				non_interleaved3[i + c * p] = buffer[i * channels + c];
+			}
+		}
+
+		img = cimg_library::CImg<T>(non_interleaved3, width, height, depth, channels);
+	}
 };
@@ -19,10 +19,6 @@
 #include <algorithm>
 #include "../parser/parser.h"
-#ifdef BOOST_PRECOMPILED
-#include <boost/filesystem.hpp>
-#endif
-
 namespace stim{
 //filename class designed to work with both Windows and Unix
@@ -155,47 +151,93 @@ public:
 		return ss.str();
 	}
-#ifdef BOOST_PRECOMPILED
-	//get a list of files matching the current template
-	std::vector<stim::filename> get_list(){
+	//*****************************************************************************************************************
+	// output is the directory and the prefix and the extension of the files, which are looking for in that directory. 
+	std::string dir_fname(){
+		std::stringstream ss;
-		boost::filesystem::path p(dir());	//create a path from the current filename
+		//if the path is absolute
+		if(absolute){
+			//output the drive letter if in Windows
+			#ifdef _WIN32
+				ss<<drive<<":";
+			#endif
+			ss<<STIM_FILENAME_DIV;
+		}
-		std::vector<stim::filename> file_list;
+		
+		for(unsigned int d = 0; d < path.size(); d++)
+			ss<<path[d]<<STIM_FILENAME_DIV;
+		ss<<get_name();
-		if(boost::filesystem::exists(p)){
-			if(boost::filesystem::is_directory(p)){
+		return ss.str();
-				typedef std::vector<boost::filesystem::path> vec;             // store paths,
-				vec v;                                // so we can sort them later
+	}
+	
+	// output is the directory and the name of the file which are found in that given directory
+	std::string f_name(std::string file_name){
+		std::stringstream ss;
-				std::copy(boost::filesystem::directory_iterator(p), boost::filesystem::directory_iterator(), back_inserter(v));
+		//if the path is absolute
+		if(absolute){
+			//output the drive letter if in Windows
+			#ifdef _WIN32
+				ss<<drive<<":";
+			#endif
+			ss<<STIM_FILENAME_DIV;
+		}
-				std::sort(v.begin(), v.end());             // sort, since directory iteration
-													  // is not ordered on some file systems
+		//output the directory
+		for(unsigned int d = 0; d < path.size(); d++)
+			ss<<path[d]<<STIM_FILENAME_DIV;
-				//compare file names to the current template (look for wild cards)
-				for (vec::const_iterator it(v.begin()), it_end(v.end()); it != it_end; ++it)
-				{
+		stim::filename fn = file_name;
+			std::string fn_prefix = fn.prefix;
+			std::string fn_ext = fn.ext;
+		ss<<fn_prefix + '.' + fn_ext;
-					//if the filename is a wild card *or* it matches the read file name
-					if( prefix == "*" || prefix == (*it).filename().stem().string()){
+		return ss.str();
-						//if the extension is a wild card *or* it matches the read file extension
-						if( ext == "*" || "." + ext == (*it).filename().extension().string()){
+	}
-							file_list.push_back((*it).string());	//include it in the final list
-						}
-					}
+	
+#ifdef _WIN32
+#include <windows.h>
+	//get a list of files matching the current template
+	std::vector<stim::filename> get_list(){
-				}
+		//stim::filename file_path;
+		stim::filename filepath(dir_fname());
+		HANDLE            hFind = INVALID_HANDLE_VALUE;
+		WIN32_FIND_DATAA   FindFileData;
+		std::vector<stim::filename> file_list;
+		
+		hFind = FindFirstFileA((filepath.str().c_str()), &FindFileData);
+
+		if (hFind == INVALID_HANDLE_VALUE) {
+		printf ("Invalid file handle. Error is %u.\n", GetLastError());
+		} 
+		else {
+			std::string file_name = FindFileData.cFileName;
+			stim::filename current_file(f_name(file_name));
+			file_list.push_back(current_file);
+
+			// List all the other files in the directory.
+			while (FindNextFileA(hFind, &FindFileData) != 0){
+				file_name = FindFileData.cFileName;
+				current_file = (f_name(file_name));
+				file_list.push_back(current_file);
 			}
-		}
-
+			FindClose(hFind);
+
 		return file_list;
 	}
+	
+	}
 #endif
+	//**************************************************************************************************
+
 	//gets the current working directory
 	static stim::filename cwd(){