Mercurial > hg > svcore
diff data/fileio/CSVFormat.h @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | 53fa8d57b728 |
line wrap: on
line diff
--- a/data/fileio/CSVFormat.h Tue Apr 17 10:03:51 2018 +0100 +++ b/data/fileio/CSVFormat.h Tue Apr 17 10:35:42 2018 +0100 @@ -25,23 +25,23 @@ { public: enum ModelType { - OneDimensionalModel, - TwoDimensionalModel, + OneDimensionalModel, + TwoDimensionalModel, TwoDimensionalModelWithDuration, TwoDimensionalModelWithDurationAndPitch, - ThreeDimensionalModel + ThreeDimensionalModel }; enum TimingType { - ExplicitTiming, - ImplicitTiming + ExplicitTiming, + ImplicitTiming }; enum TimeUnits { - TimeSeconds, + TimeSeconds, TimeMilliseconds, - TimeAudioFrames, - TimeWindows, + TimeAudioFrames, + TimeWindows, }; enum ColumnPurpose { @@ -121,7 +121,7 @@ // read-only; only valid if format has been guessed: QList<QStringList> getExample() const { return m_example; } int getMaxExampleCols() const { return m_maxExampleCols; } - + protected: ModelType m_modelType; TimingType m_timingType;