diff --git a/stim/grids/image_stack.h b/stim/grids/image_stack.h index f0c3752..1eb7359 100644 --- a/stim/grids/image_stack.h +++ b/stim/grids/image_stack.h @@ -33,10 +33,10 @@ public: stim::filename file_path(file_mask); //if the file path is relative, update it with the current working directory - if(file_path.is_relative()){ - stim::filename wd = stim::filename::cwd(); - file_path = wd.get_relative(file_mask); - } +// if(file_path.is_relative()){ +// stim::filename wd = stim::filename::cwd(); +// file_path = wd.get_relative(file_mask); +// } //get the list of files std::vector file_list = file_path.get_list(); @@ -134,10 +134,10 @@ public: stim::filename file_path(file_mask); //if the file path is relative, update it with the current working directory - if(file_path.is_relative()){ - stim::filename wd = stim::filename::cwd(); - file_path = wd.get_relative(file_mask); - } +// if(file_path.is_relative()){ +// stim::filename wd = stim::filename::cwd(); +// file_path = wd.get_relative(file_mask); +// } //create a list of file names std::vector file_list = stim::wildcards::increment(file_path.str(), 0, R[3]-1, 1); diff --git a/stim/math/vec3.h b/stim/math/vec3.h index 99e3809..80f7257 100644 --- a/stim/math/vec3.h +++ b/stim/math/vec3.h @@ -216,7 +216,6 @@ public: return result; } -#ifndef __NVCC__ /// Outputs the vector as a string std::string str() const{ std::stringstream ss; @@ -234,7 +233,6 @@ public: return ss.str(); } -#endif size_t size(){ return 3; } diff --git a/stim/parser/filename.h b/stim/parser/filename.h index 5303084..0922d67 100644 --- a/stim/parser/filename.h +++ b/stim/parser/filename.h @@ -203,6 +203,9 @@ public: operator=(s); } + bool is_relative(){ + return false; + } std::string str(){ @@ -331,7 +334,7 @@ public: #elif BOOST_PRECOMPILED - boost::filesystem::path p(dir()); //create a path from the current filename + boost::filesystem::path p(path()); //create a path from the current filename std::vector file_list; if(boost::filesystem::exists(p)){ if(boost::filesystem::is_directory(p)){ @@ -344,9 +347,9 @@ public: for (vec::const_iterator it(v.begin()), it_end(v.end()); it != it_end; ++it) { //if the filename is a wild card *or* it matches the read file name - if( prefix == "*" || prefix == (*it).filename().stem().string()){ + if( _prefix == "*" || _prefix == (*it).filename().stem().string()){ //if the extension is a wild card *or* it matches the read file extension - if( ext == "*" || "." + ext == (*it).filename().extension().string()){ + if( _extension == "*" || "." + _extension == (*it).filename().extension().string()){ file_list.push_back((*it).string()); //include it in the final list } @@ -368,4 +371,4 @@ public: } }; //end filename } //end namespace stim -#endif \ No newline at end of file +#endif -- libgit2 0.21.4