codebase / stimlib

Commit ad4a30c58ffb92aa8758190646062db9ef8131de

Authored by David Mayerich
1 parent 025d4bf3

changed grid_data to grid

Showing 2 changed files with 9 additions and 9 deletions   Show diff stats
Inline Side-by-side
stim/grids/grid_data.h
  Show/Hide comments   View file @ad4a30c
1 -#ifndef STIM_GRID_DATA_CUH  
2 -#define STIM_GRID_DATA_CUH 1 +#ifndef STIM_GRID_H
  2 +#define STIM_GRID_H
3 3
4 #include <vector> 4 #include <vector>
5 #include <string> 5 #include <string>
@@ -18,7 +18,7 @@ namespace stim{ @@ -18,7 +18,7 @@ namespace stim{
18 // data can be loaded in the form of images 18 // data can be loaded in the form of images
19 // data can be saved in the form of binary files 19 // data can be saved in the form of binary files
20 template<typename T, unsigned int D = 1> 20 template<typename T, unsigned int D = 1>
21 -class grid_data{ 21 +class grid{
22 22
23 protected: 23 protected:
24 24
stim/grids/image_stack.h
  Show/Hide comments   View file @ad4a30c
@@ -3,22 +3,22 @@ @@ -3,22 +3,22 @@
3 3
4 #include "../parser/wildcards.h" 4 #include "../parser/wildcards.h"
5 #include "../parser/filename.h" 5 #include "../parser/filename.h"
6 -#include "../grids/grid_data.h" 6 +#include "../grids/grid.h"
7 #include "../image/image.h" 7 #include "../image/image.h"
8 8
9 namespace stim{ 9 namespace stim{
10 10
11 //this creates a class that can be used to load 3D grid data from stacks of images 11 //this creates a class that can be used to load 3D grid data from stacks of images
12 -// The class uses a 4D grid_data object, where the first dimension is color 12 +// The class uses a 4D grid object, where the first dimension is color
13 template<typename T> 13 template<typename T>
14 -class image_stack : public virtual grid_data<T, 4>{ 14 +class image_stack : public virtual stim::grid<T, 4>{
15 15
16 enum image_type {stimAuto, stimMono, stimRGB, stimRGBA}; 16 enum image_type {stimAuto, stimMono, stimRGB, stimRGBA};
17 17
18 protected: 18 protected:
19 - using grid_data<T, 4>::R;  
20 - using grid_data<T, 4>::ptr;  
21 - using grid_data<T, 4>::samples; 19 + using stim::grid<T, 4>::R;
  20 + using stim::grid<T, 4>::ptr;
  21 + using stim::grid<T, 4>::samples;
22 22
23 public: 23 public:
24 24