# HG changeset patch
# User Chris Cannam
# Date 1423834228 0
# Node ID 920699b6989df6a8ca846f1dd88a73fb8010e894
# Parent  1ecd533a9977ea81ea2adc4e3cce7b20ec851d0b
Use filename as object name when reading data file to model (so it shows in the resulting layer name)

diff -r 1ecd533a9977 -r 920699b6989d data/fileio/CSVFileReader.cpp
--- a/data/fileio/CSVFileReader.cpp	Fri Feb 13 13:29:44 2015 +0000
+++ b/data/fileio/CSVFileReader.cpp	Fri Feb 13 13:30:28 2015 +0000
@@ -26,6 +26,7 @@
 #include "DataFileReaderFactory.h"
 
 #include <QFile>
+#include <QFileInfo>
 #include <QString>
 #include <QRegExp>
 #include <QStringList>
@@ -55,6 +56,7 @@
 
     if (good) {
         m_device = file;
+        m_filename = QFileInfo(path).fileName();
     } else {
 	delete file;
     }
@@ -263,6 +265,12 @@
                     model = model3;
                     break;
                 }
+
+                if (model) {
+                    if (m_filename != "") {
+                        model->setObjectName(m_filename);
+                    }
+                }
             }
 
             float value = 0.f;
diff -r 1ecd533a9977 -r 920699b6989d data/fileio/CSVFileReader.h
--- a/data/fileio/CSVFileReader.h	Fri Feb 13 13:29:44 2015 +0000
+++ b/data/fileio/CSVFileReader.h	Fri Feb 13 13:30:28 2015 +0000
@@ -53,6 +53,7 @@
     CSVFormat m_format;
     QIODevice *m_device;
     bool m_ownDevice;
+    QString m_filename;
     QString m_error;
     mutable int m_warnings;
     int m_mainModelSampleRate;
diff -r 1ecd533a9977 -r 920699b6989d data/fileio/MIDIFileReader.cpp
--- a/data/fileio/MIDIFileReader.cpp	Fri Feb 13 13:29:44 2015 +0000
+++ b/data/fileio/MIDIFileReader.cpp	Fri Feb 13 13:30:28 2015 +0000
@@ -36,6 +36,7 @@
 #include "model/NoteModel.h"
 
 #include <QString>
+#include <QFileInfo>
 
 #include <sstream>
 
@@ -932,6 +933,7 @@
     if (!model) {
 	model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false);
 	model->setValueQuantization(1.0);
+        model->setObjectName(QFileInfo(m_path).fileName());
     }
 
     const MIDITrack &track = m_midiComposition.find(trackToLoad)->second;