Commit 7c26ef50b99262ee59f3ef41e98432036f5bb93b
1 parent
0823bc01
add dim() methods
Showing
1 changed file
with
32 additions
and
28 deletions
include/GFitsTableCol.hpp
| ... | ... | @@ -30,6 +30,7 @@ |
| 30 | 30 | /* __ Includes ___________________________________________________________ */ |
| 31 | 31 | #include <iostream> |
| 32 | 32 | #include <string> |
| 33 | +#include <vector> | |
| 33 | 34 | #include "GLog.hpp" |
| 34 | 35 | |
| 35 | 36 | |
| ... | ... | @@ -68,37 +69,40 @@ public: |
| 68 | 69 | virtual void remove(const int& rownum, const int& nrows) = 0; |
| 69 | 70 | |
| 70 | 71 | // Base class Methods |
| 71 | - void name(const std::string& name); | |
| 72 | - void unit(const std::string& unit); | |
| 73 | - std::string name(void) const; | |
| 74 | - std::string unit(void) const; | |
| 75 | - int colnum(void) const; | |
| 76 | - int type(void) const; | |
| 77 | - int repeat(void) const; | |
| 78 | - int width(void) const; | |
| 79 | - int number(void) const; | |
| 80 | - int length(void) const; | |
| 81 | - int anynul(void) const; | |
| 82 | - std::string print(void) const; | |
| 72 | + void name(const std::string& name); | |
| 73 | + void unit(const std::string& unit); | |
| 74 | + void dim(const std::vector<int>& dim); | |
| 75 | + std::string name(void) const; | |
| 76 | + std::string unit(void) const; | |
| 77 | + std::vector<int> dim(void) const; | |
| 78 | + int colnum(void) const; | |
| 79 | + int type(void) const; | |
| 80 | + int repeat(void) const; | |
| 81 | + int width(void) const; | |
| 82 | + int number(void) const; | |
| 83 | + int length(void) const; | |
| 84 | + int anynul(void) const; | |
| 85 | + std::string print(void) const; | |
| 83 | 86 | |
| 84 | 87 | protected: |
| 85 | 88 | // Protected data area |
| 86 | - std::string m_name; //!< Column name | |
| 87 | - std::string m_unit; //!< Column unit | |
| 88 | - int m_colnum; //!< @brief Column number (starting from 1). | |
| 89 | - //!< This parameter is used to signal if a | |
| 90 | - //!< table column corresponds to a FITS file | |
| 91 | - //!< column. If it is set to 0 there is no | |
| 92 | - //!< correspondance. | |
| 93 | - int m_type; //!< Column type | |
| 94 | - int m_repeat; //!< Repeat value of column | |
| 95 | - int m_width; //!< Width of single column element | |
| 96 | - int m_number; //!< @brief Number of elements in column. | |
| 97 | - //!< m_number = m_repeat / m_width | |
| 98 | - int m_length; //!< Length of column | |
| 99 | - mutable int m_size; //!< Size of allocated data area (0 if not loaded) | |
| 100 | - int m_anynul; //!< Number of NULLs encountered | |
| 101 | - void* m_fitsfile; //!< FITS file pointer associated with column | |
| 89 | + std::string m_name; //!< Column name | |
| 90 | + std::string m_unit; //!< Column unit | |
| 91 | + std::vector<int> m_dim; //!< Column dimension | |
| 92 | + int m_colnum; //!< @brief Column number (starting from 1). | |
| 93 | + //!< This parameter is used to signal if a | |
| 94 | + //!< table column corresponds to a FITS file | |
| 95 | + //!< column. If it is set to 0 there is no | |
| 96 | + //!< correspondance. | |
| 97 | + int m_type; //!< Column type | |
| 98 | + int m_repeat; //!< Repeat value of column | |
| 99 | + int m_width; //!< Width of single column element | |
| 100 | + int m_number; //!< @brief Number of elements in column. | |
| 101 | + //!< m_number = m_repeat / m_width | |
| 102 | + int m_length; //!< Length of column | |
| 103 | + mutable int m_size; //!< Size of allocated data area (0 if not loaded) | |
| 104 | + int m_anynul; //!< Number of NULLs encountered | |
| 105 | + void* m_fitsfile; //!< FITS file pointer associated with column | |
| 102 | 106 | |
| 103 | 107 | // Protected pure virtual methods |
| 104 | 108 | virtual GFitsTableCol* clone(void) const = 0; | ... | ... |