fixed drive letter problems in stim::filename

David Mayerich
1 parent f097c379
Showing 3 changed files with 6 additions and 5 deletions Show diff stats
stim/grids/image_stack.h
stim/math/spharmonics.h
stim/parser/filename.h
@@ -155,12 +155,13 @@ public:
 	void save_images(std::string file_mask){
  
 		stim::filename file_path(file_mask);
+		//stim::filename abs_file_path = file_pat
  
 		//create a list of file names
 		std::vector<std::string> file_list = stim::wildcards::increment(file_path.str(), 0, R[3]-1, 1);
-
-		for(int i=0; i<R[3]; i++)
+		for (int i = 0; i < R[3]; i++) {
 			save_image(file_list[i], i);
+		}
 	}
  
 	/// Returns the pixel at the specified point
@@ -181,7 +181,7 @@ namespace stim {
 		/// @param n is the number of points of the surface of the sphere used to create the PDF. DEFAULT 1000
 		/// @param norm, a boolean that sets where the output vectors will be normalized between 0 and 1.
 		/// @param 
-		void pdf(std::vector<stim::vec3<T> > sph_pts, unsigned int l, int m, stim::vec3<T> c = stim::vec3<T>(0, 0, 0), unsigned int n = 1000, bool norm = true, std::vector<T> w = std::vector<T>())
+		/*void pdf(std::vector<stim::vec3<T> > sph_pts, unsigned int l, int m, stim::vec3<T> c = stim::vec3<T>(0, 0, 0), unsigned int n = 1000, bool norm = true, std::vector<T> w = std::vector<T>())
 		{
 			std::vector<double> weights;		///the weight at each point on the surface of the sphere.
 												//		weights.resize(n);
@@ -223,7 +223,7 @@ namespace stim {
 				}
 			}
 			mcEnd();
-		}
+		}*/
  
 		std::string str() {
  
@@ -65,6 +65,7 @@ protected:
 		std::string current_drive;
 		std::vector<std::string> current_dir;
 		parse_path(current_drive, current_dir, current);			//get the current drive and directories
+		drive = current_drive;										//all relative paths have to be relative to the current drive
 		if (current_dir.size() > 0) {
  
 			// step through each directory in the relative path, adjusting the current directory
@@ -91,7 +92,6 @@ protected:
 	}
  
 	/// Parses a directory string into a drive (NULL if not Windows) and list of hierarchical directories
-	/// Returns true if the path is relative, false if it is absolute
 	void parse_path(std::string &drive, std::vector<std::string> &absolute, std::string dir){
 		drive = "";											//initialize the drive to NULL (it will stay that way for Windows)
 		std::vector<std::string> path;