# HG changeset patch
# User Chris Cannam
# Date 1536063572 -3600
# Node ID c2fa7bb1eca9151f66b477c7580c2f25c116c06e
# Parent  fcc1f45f7bd50d744377de55795360b5410344fe# Parent  c0d8356e274f1ed9a4c0cc0b275421fe6ec5e893
Merge from default branch

diff -r c0d8356e274f -r c2fa7bb1eca9 layer/LayerFactory.h
--- 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>
diff -r c0d8356e274f -r c2fa7bb1eca9 widgets/CSVFormatDialog.cpp
--- 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));
diff -r c0d8356e274f -r c2fa7bb1eca9 widgets/CSVFormatDialog.h
--- 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"