Mercurial > hg > svapp
comparison framework/SVFileReader.cpp @ 459:74d575708e06 alignment-simple
Branch to test simple FFT model code
author | Chris Cannam |
---|---|
date | Mon, 15 Jun 2015 09:15:55 +0100 |
parents | dc1a360f2b69 |
children | 6f475df6f833 |
comparison
equal
deleted
inserted
replaced
450:d9d132c0e240 | 459:74d575708e06 |
---|---|
884 Model *model = m_models[modelId]; | 884 Model *model = m_models[modelId]; |
885 m_document->setModel(layer, model); | 885 m_document->setModel(layer, model); |
886 } else { | 886 } else { |
887 cerr << "WARNING: SV-XML: Unknown model id " << modelId | 887 cerr << "WARNING: SV-XML: Unknown model id " << modelId |
888 << " in layer definition" << endl; | 888 << " in layer definition" << endl; |
889 | 889 if (!layer->canExistWithoutModel()) { |
890 // Don't add a layer with an unknown model id | 890 // Don't add a layer with an unknown model id |
891 m_document->deleteLayer(layer); | 891 // unless it explicitly supports this state |
892 m_layers[id] = layer = 0; | 892 m_document->deleteLayer(layer); |
893 return false; | 893 m_layers[id] = layer = 0; |
894 } | 894 return false; |
895 } | |
896 } | |
895 } | 897 } |
896 | 898 |
897 if (layer) layer->setProperties(attributes); | 899 if (layer) layer->setProperties(attributes); |
898 } | 900 } |
899 | 901 |