Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Data/DataColumn.cpp (1 of 355 files). Show all
Unified · Split
| @@ -54,10 +54,12 @@ const char* GSF::Data::EnumName(DataType type) · 53 unmodified lines | ||
| 54 | 54 | |
| 55 | 55 | const DataColumnPtr DataColumn::NullPtr = nullptr; |
| 56 | 56 | |
| 57 | −DataColumn::DataColumn(DataTablePtr parent, string name, DataType type) : | |
| 57 | +DataColumn::DataColumn(DataTablePtr parent, string name, DataType type, string expression) : | |
| 58 | 58 | m_parent(std::move(parent)), |
| 59 | 59 | m_name(std::move(name)), |
| 60 | 60 | m_type(type), |
| 61 | + m_expression(std::move(expression)), | |
| 62 | + m_computed(!m_expression.empty()), | |
| 61 | 63 | m_index(-1) |
| 62 | 64 | { |
| 63 | 65 | if (m_parent == nullptr) |
| @@ -81,6 +83,16 @@ DataType DataColumn::Type() const · 17 unmodified lines | ||
| 81 | 83 | return m_type; |
| 82 | 84 | } |
| 83 | 85 | |
| 86 | +const std::string& DataColumn::Expression() const | |
| 87 | +{ | |
| 88 | + return m_expression; | |
| 89 | +} | |
| 90 | + | |
| 91 | +bool DataColumn::Computed() const | |
| 92 | +{ | |
| 93 | + return m_computed; | |
| 94 | +} | |
| 95 | + | |
| 84 | 96 | int32_t DataColumn::Index() const |
| 85 | 97 | { |
| 86 | 98 | return m_index; |