added further progress bar support (sifting, unsifting, cropping)

David Mayerich
1 parent cbce396e
Showing 3 changed files with 69 additions and 27 deletions Show diff stats
stim/envi/bil.h
stim/envi/bip.h
stim/envi/bsq.h
@@ -850,9 +850,9 @@ public:
 		std::ofstream target(outfile.c_str(), std::ios::binary);
  
 		//for loading pages:
-		unsigned XZ = X() * Z();		//calculate the number of values in an XZ page on disk
-		unsigned int B = Z();			//calculate the number of bands
-		unsigned L = XZ * sizeof(T);	//calculate the size of the page (in bytes)
+		unsigned long XZ = X() * Z();		//calculate the number of values in an XZ page on disk
+		unsigned long B = Z();			//calculate the number of bands
+		unsigned long L = XZ * sizeof(T);	//calculate the size of the page (in bytes)
  
 		//allocate temporary memory for a XZ slice
 		T* slice = (T*) malloc(L);
@@ -861,28 +861,32 @@ public:
 		T* spec = (T*) malloc(B * sizeof(T));
  
 		//for each slice along the y axis
-		for (unsigned int y = 0; y < Y(); y++)			//Select a page by choosing Y coordinate, Y()
+		for (unsigned long y = 0; y < Y(); y++)			//Select a page by choosing Y coordinate, Y()
 		{
 			read_plane_y(slice, y);							//retrieve an ZX page, store in "slice"
  
 			//for each sample along X			
-			for (unsigned x = 0; x < X(); x++)		//Select a pixel by choosing X coordinate in the page, X()
+			for (unsigned long x = 0; x < X(); x++)		//Select a pixel by choosing X coordinate in the page, X()
 			{
 				//if the mask != 0 at that xy pixel
 				if (p[y * X() + x] != 0)					//if the mask != 0 at that XY pixel
 				{
 					//for each band at that pixel
-					for (unsigned int b = 0; b < B; b++)		//Select a voxel by choosing Z coordinate at the pixel
+					for (unsigned long b = 0; b < B; b++)		//Select a voxel by choosing Z coordinate at the pixel
 					{
 						spec[b] = slice[b*X() + x];		//Pass the correct spectral value from XZ page into the spectrum to be saved.
 					}
 					target.write((char*)spec, B * sizeof(T));		//write that spectrum to disk. Size is L2.
 				}
+
+				thread_data = (double) (y * X() + x) / (Y() * X()) * 100;
 			}
 		}
 		target.close();
 		free(slice);
 		free(spec);
+
+		thread_data = 100;
 		return true;
 	}
  
@@ -1019,10 +1023,15 @@ public:
 			{
 				file.read((char *)(temp + j * sam), sizeof(T) * sam);
 				file.seekg(jumpb, std::ios::cur);    //go to the next band	
+
+				thread_data = (double)(i * Z() + j) / (lin * Z()) * 100;
 			}
 			out.write(reinterpret_cast<const char*>(temp), L);   //write slice data into target file	
 		}
 		free(temp);
+
+		thread_data = 100;
+
 		return true;
 	}
  
@@ -858,15 +858,15 @@ public:
 		std::ofstream target(outfile.c_str(), std::ios::binary);
  
 		//allocate space for a single spectrum
-		unsigned int B = Z();
+		unsigned long B = Z();
 		T* spectrum = (T*) malloc(B * sizeof(T));
  
 		//calculate the number of pixels in a band
-		unsigned int XY = X() * Y();
+		unsigned long XY = X() * Y();
  
 		//for each pixel
-		unsigned int skip = 0;					//number of spectra to skip
-		for(unsigned int x = 0; x < XY; x++){
+		unsigned long skip = 0;					//number of spectra to skip
+		for(unsigned long x = 0; x < XY; x++){
  
 			//if the current pixel isn't masked
 			if( mask[x] == 0){
@@ -887,6 +887,8 @@ public:
  
 				//write this pixel out
 				target.write((char *)spectrum, B * sizeof(T));
+
+				thread_data = (double) x / XY * 100;
 			}
  
 		}
@@ -895,6 +897,8 @@ public:
 		target.close();
 		free(spectrum);
  
+		thread_data = 100;
+
 		return true;
 	}
  
@@ -907,7 +911,7 @@ public:
 		file.seekg(0, std::ios::beg);		
  
 		//allocate space for a single spectrum
-		unsigned int B = Z();
+		unsigned long B = Z();
 		T* spectrum = (T*) malloc(B * sizeof(T));
  
 		//allocate space for a spectrum of zeros
@@ -915,11 +919,11 @@ public:
 		memset(zeros, 0, B * sizeof(T));
  
 		//calculate the number of pixels in a band
-		unsigned int XY = samples * lines;
+		unsigned long XY = samples * lines;
  
 		//for each pixel
-		unsigned int skip = 0;					//number of spectra to skip
-		for(unsigned int x = 0; x < XY; x++){
+		unsigned long skip = 0;					//number of spectra to skip
+		for(unsigned long x = 0; x < XY; x++){
  
 			//if the current pixel isn't masked
 			if( mask[x] == 0){
@@ -937,12 +941,16 @@ public:
 				target.write((char *)spectrum, B * sizeof(T));
 			}
  
+			thread_data = (double)x / XY * 100;
+
 		}
  
 		//close the output file
 		target.close();
 		free(spectrum);
  
+		thread_data = 100;
+
 		return true;
  
  
@@ -1070,9 +1078,13 @@ public:
 			{
 				pixel(temp, sp + j + i * X());
 				out.write(reinterpret_cast<const char*>(temp), L);   //write slice data into target file	
+
+				thread_data = (double)(i * sam + j) / (lin * sam) * 100;
 			}
 		}
 		free(temp);
+
+		thread_data = 100;
 		return true;
 	}
  
@@ -372,15 +372,21 @@ public:
 				file.read((char *)(xz_slice + z * X()), sizeof(T) * X());	//read a line
 				file.seekg(jump, std::ios::cur);							//seek to the next band
  
-				thread_data = (double)(y * Z() + z) / (Z() * Y()) * 100;	//update the progress counter	
+				
+				thread_data = (double)(y * Z() + z) / (Z() * Y()) * 100;	//update the progress counter
+				std::cout<<y<<","<<z<<"   "<<thread_data<<std::endl;	
 			}					
 			target.write(reinterpret_cast<const char*>(xz_slice), xz_bytes);   //write the generated XZ slice to the target file	
 		}
+
+
  
 		thread_data = 100;
  
 		free(xz_slice);
 		target.close();
+
+		std::cout<<"conversion finished"<<std::endl;
 		return true;
 	}
  
@@ -777,16 +783,16 @@ public:
 	bool sift(std::string outfile, unsigned char* p){
 		std::ofstream target(outfile.c_str(), std::ios::binary);
 		// open a band (XY plane)
-		unsigned XY = X() * Y(); //Number of XY pixels
-		unsigned L = XY * sizeof(T); //size of XY pixels
+		unsigned long XY = X() * Y(); //Number of XY pixels
+		unsigned long L = XY * sizeof(T); //size of XY pixels
  
 		T * temp = (T*)malloc(L); //allocate memory for a band
 		T * temp_vox = (T*)malloc(sizeof(T)); //allocate memory for one voxel
  
-		for (unsigned i = 0; i < Z(); i++)			//for each spectral bin
+		for (unsigned long i = 0; i < Z(); i++)			//for each spectral bin
 		{
 			band_index(temp, i);					//get the specified band (XY sheet by index)
-			for (unsigned j = 0; j < XY; j++)		// for each pixel
+			for (unsigned long j = 0; j < XY; j++)		// for each pixel
 			{
 				if (p[j] != 0){						//if the mask is != 0 at that pixel
 					temp_vox[0] = temp[j];
@@ -795,10 +801,15 @@ public:
 				else{
 					continue;
 				}
+
+				thread_data = (double)(i * XY + j) / (XY * Z()) * 100;
 			}
 		}
 		target.close();
 		free(temp);
+
+		thread_data = 100;
+
 		return true;
 	}
  
@@ -817,9 +828,9 @@ public:
 		std::cout<<"started sifting"<<std::endl;
  
 		//get the number of pixels and bands in the input image
-		unsigned int P = X(); 					//Number of pixels
-		unsigned int B = Z();					//number of bands
-		unsigned int XY = samples * lines;		//total number of pixels in an unsifted image
+		unsigned long P = X(); 					//Number of pixels
+		unsigned long B = Z();					//number of bands
+		unsigned long XY = samples * lines;		//total number of pixels in an unsifted image
  
 		// allocate memory for a sifted band
 		T * sifted = (T*)malloc(P * sizeof(T)); //allocate memory for a band
@@ -828,28 +839,33 @@ public:
 		T* unsifted = (T*) malloc(XY * sizeof(T));
  
 		//for each band
-		for(unsigned int b = 0; b < B; b++){
+		for(unsigned long b = 0; b < B; b++){
  
 			//set the unsifted index value to zero
-			unsigned int i = 0;
+			unsigned long i = 0;
  
 			//retrieve the sifted band (masked pixels only)
 			band_index(sifted, b);
  
 			//for each pixel in the final image (treat it as a 1D image)
-			for(unsigned int xi = 0; xi < XY; xi++){
+			for(unsigned long xi = 0; xi < XY; xi++){
 				if( p[xi] == 0 )
 					unsifted[xi] = 0;
 				else{
 					unsifted[xi] = sifted[i];
 					i++;
 				}
+				//std::cout<<xi<<"/"<<XY<<",   "<<b<<"/"<<B<<std::endl;
+				thread_data = (double)(b * XY + xi) / (B * XY) * 100;
 			}
-
+			//std::cout<<b*XY<<"/"<<B*XY<<"      "<<B<<"-"<<XY<<std::endl;
 			//write the band image to disk
 			target.write(reinterpret_cast<const char*>(unsifted), sizeof(T) * XY);
 		}
  
+		//std::cout<<"unsifted"<<std::endl;
+		thread_data = 100;
+
 		return true;
 	}
  
@@ -967,17 +983,22 @@ public:
 		unsigned long long jumpl = (X() - sam) * sizeof(T);	                           	//jump pointer to the next line
 		//get start
 		file.seekg((y0 * X() + x0) * sizeof(T), std::ios::beg);
-		for (unsigned i = 0; i < Z(); i++)
+		for (unsigned z = 0; z < Z(); z++)
 		{
 			for (unsigned j = 0; j < lin; j++)
 			{
 				file.read((char *)(temp + j * sam), sizeof(T) * sam);
 				file.seekg(jumpl, std::ios::cur);    //go to the next band	
+
+				thread_data = (double)(z * lin + j) / (Z() * lin) * 100;
 			}
 			out.write(reinterpret_cast<const char*>(temp), L);   //write slice data into target file	
 			file.seekg(jumpb, std::ios::cur);
 		}
 		free(temp);
+
+		thread_data = 100;
+
 		return true;
 	}