Mercurial > hg > svgui
changeset 1317:c2fa7bb1eca9 import-audio-data
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 04 Sep 2018 13:19:32 +0100 |
| parents | fcc1f45f7bd5 (diff) c0d8356e274f (current diff) |
| children | b149b53df365 |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/layer/LayerFactory.h Thu Aug 09 16:09:52 2018 +0100 +++ b/layer/LayerFactory.h Tue Sep 04 13:19:32 2018 +0100 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _LAYER_FACTORY_H_ -#define _LAYER_FACTORY_H_ +#ifndef SV_LAYER_FACTORY_H +#define SV_LAYER_FACTORY_H #include <QString> #include <set>
--- a/widgets/CSVFormatDialog.cpp Thu Aug 09 16:09:52 2018 +0100 +++ b/widgets/CSVFormatDialog.cpp Tue Sep 04 13:19:32 2018 +0100 @@ -244,6 +244,9 @@ case CSVFormat::ThreeDimensionalModel: s = f->getLayerPresentationName(LayerFactory::Colour3DPlot); break; + case CSVFormat::WaveFileModel: + s = f->getLayerPresentationName(LayerFactory::Waveform); + break; } m_modelLabel->setText("\n" + tr("Data will be displayed in a %1 layer.").arg(s));
--- a/widgets/CSVFormatDialog.h Thu Aug 09 16:09:52 2018 +0100 +++ b/widgets/CSVFormatDialog.h Tue Sep 04 13:19:32 2018 +0100 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _CSV_FORMAT_DIALOG_H_ -#define _CSV_FORMAT_DIALOG_H_ +#ifndef SV_CSV_FORMAT_DIALOG_H +#define SV_CSV_FORMAT_DIALOG_H #include "data/fileio/CSVFormat.h"