Commit 6422f96a071b07e70f37fb463495395c9a57d80d
1 parent
11c1b46b
minor bug fixes and comments
Showing
3 changed files
with
12 additions
and
2 deletions
Show diff stats
stim/gl/gl_spider.h
@@ -869,8 +869,8 @@ class gl_spider : public virtual gl_texture<T> | @@ -869,8 +869,8 @@ class gl_spider : public virtual gl_texture<T> | ||
869 | GenerateFBO(16, numSamplesPos*8, ptexbufferID, pfboID); | 869 | GenerateFBO(16, numSamplesPos*8, ptexbufferID, pfboID); |
870 | GenerateFBO(16, numSamplesMag*8, mtexbufferID, mfboID); | 870 | GenerateFBO(16, numSamplesMag*8, mtexbufferID, mfboID); |
871 | GenerateFBO(16, 216, btexbufferID, bfboID); | 871 | GenerateFBO(16, 216, btexbufferID, bfboID); |
872 | - setDims(0.6, 0.6, 1.0); | ||
873 | - setSize(1024.0, 1024.0, 1024.0); | 872 | +// setDims(0.6, 0.6, 1.0); |
873 | +// setSize(1024.0, 1024.0, 1024.0); | ||
874 | setMatrix(); | 874 | setMatrix(); |
875 | dList = glGenLists(3); | 875 | dList = glGenLists(3); |
876 | glListBase(dList); | 876 | glListBase(dList); |
stim/grids/image_stack.h
@@ -46,6 +46,8 @@ public: | @@ -46,6 +46,8 @@ public: | ||
46 | std::cout<<"STIM ERROR (image_stack): No matching files for loading a stack."<<std::endl; | 46 | std::cout<<"STIM ERROR (image_stack): No matching files for loading a stack."<<std::endl; |
47 | exit(1); | 47 | exit(1); |
48 | } | 48 | } |
49 | + for(int i = 0; i < file_list.size(); i++) | ||
50 | + std::cout << file_list[i].str() << std::endl; | ||
49 | 51 | ||
50 | //load the first image and set all of the image_stack properties | 52 | //load the first image and set all of the image_stack properties |
51 | // std::cout<<"File to Load: "<<file_list[0].str()<<std::endl; | 53 | // std::cout<<"File to Load: "<<file_list[0].str()<<std::endl; |
stim/parser/filename.h
@@ -146,6 +146,14 @@ public: | @@ -146,6 +146,14 @@ public: | ||
146 | 146 | ||
147 | } | 147 | } |
148 | 148 | ||
149 | + void clear() | ||
150 | + { | ||
151 | + drive = ""; //drive letter (for Windows) | ||
152 | + path.resize(0); | ||
153 | + prefix= ""; //file prefix (without extension) | ||
154 | + ext = ""; //file extension | ||
155 | + } | ||
156 | + | ||
149 | std::string str(){ | 157 | std::string str(){ |
150 | 158 | ||
151 | std::stringstream ss; | 159 | std::stringstream ss; |