Mercurial > hg > svcore
comparison data/model/EditableDenseThreeDimensionalModel.h @ 841:226733f3cf3f tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Fri, 22 Nov 2013 10:37:28 +0000 |
parents | 33fca917c800 |
children | 816c751a7979 |
comparison
equal
deleted
inserted
replaced
829:f63051833723 | 841:226733f3cf3f |
---|---|
137 virtual int getCompletion() const { return m_completion; } | 137 virtual int getCompletion() const { return m_completion; } |
138 | 138 |
139 QString getTypeName() const { return tr("Editable Dense 3-D"); } | 139 QString getTypeName() const { return tr("Editable Dense 3-D"); } |
140 | 140 |
141 virtual QString toDelimitedDataString(QString delimiter) const; | 141 virtual QString toDelimitedDataString(QString delimiter) const; |
142 virtual QString toDelimitedDataString(QString delimiter, size_t f0, size_t f1) const; | |
142 | 143 |
143 virtual void toXml(QTextStream &out, | 144 virtual void toXml(QTextStream &out, |
144 QString indent = "", | 145 QString indent = "", |
145 QString extraAttributes = "") const; | 146 QString extraAttributes = "") const; |
146 | 147 |