Mercurial > hg > svapp
comparison framework/Document.cpp @ 220:0b1886cee2cf templating
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 27 Apr 2011 11:33:48 +0100 |
parents | fe83e6e68683 |
children | 2c827ac7c8e7 67cea66bd588 |
comparison
equal
deleted
inserted
replaced
210:143e1b56e81b | 220:0b1886cee2cf |
---|---|
29 #include "transform/ModelTransformerFactory.h" | 29 #include "transform/ModelTransformerFactory.h" |
30 #include <QApplication> | 30 #include <QApplication> |
31 #include <QTextStream> | 31 #include <QTextStream> |
32 #include <QSettings> | 32 #include <QSettings> |
33 #include <iostream> | 33 #include <iostream> |
34 #include <typeinfo> | |
34 | 35 |
35 // For alignment: | 36 // For alignment: |
36 #include "data/model/AggregateWaveModel.h" | 37 #include "data/model/AggregateWaveModel.h" |
37 #include "data/model/SparseTimeValueModel.h" | 38 #include "data/model/SparseTimeValueModel.h" |
38 #include "data/model/AlignmentModel.h" | 39 #include "data/model/AlignmentModel.h" |
628 } | 629 } |
629 } | 630 } |
630 | 631 |
631 if (m_layers.find(layer) == m_layers.end()) { | 632 if (m_layers.find(layer) == m_layers.end()) { |
632 std::cerr << "Document::deleteLayer: Layer " | 633 std::cerr << "Document::deleteLayer: Layer " |
633 << layer << " does not exist, or has already been deleted " | 634 << layer << " (" << typeid(layer).name() << |
635 ") does not exist, or has already been deleted " | |
634 << "(this may not be as serious as it sounds)" << std::endl; | 636 << "(this may not be as serious as it sounds)" << std::endl; |
635 return; | 637 return; |
636 } | 638 } |
637 | 639 |
638 m_layers.erase(layer); | 640 m_layers.erase(layer); |