comparison framework/SVFileReader.cpp @ 450:d9d132c0e240 alignment_view

Merge from default branch

 
     QString name = attributes.value("name");
 
     SVDEBUG << "SVFileReader::readModel: model name \"" << name << "\"" << endl;
 
-    READ_MANDATORY(int, sampleRate, toInt);
+    READ_MANDATORY(double, sampleRate, toDouble);
 
     QString type = attributes.value("type").trimmed();
     bool isMainModel = (attributes.value("mainModel").trimmed() == "true");
 
     if (type == "wavefile") {

             cerr << "SVFileReader::readModel: Failed to retrieve file \"" << path << "\" for wave file model: Source unavailable" << endl;
         } else {
 
             file.waitForData();
 
-            int rate = sampleRate;
+            sv_samplerate_t rate = sampleRate;
 
             if (Preferences::getInstance()->getFixedSampleRate() != 0) {
                 rate = Preferences::getInstance()->getFixedSampleRate();
             } else if (rate == 0 &&
                        !isMainModel &&

 		Model *model = m_models[modelId];
 		m_document->setModel(layer, model);
 	    } else {
 		cerr << "WARNING: SV-XML: Unknown model id " << modelId
 			  << " in layer definition" << endl;
+
+                // Don't add a layer with an unknown model id
+                m_document->deleteLayer(layer);
+                m_layers[id] = layer = 0;
+                return false;
 	    }
 	}
 
-	layer->setProperties(attributes);
-    }
-
-    if (!m_inData && m_currentPane) {
+        if (layer) layer->setProperties(attributes);
+    }
+
+    if (!m_inData && m_currentPane && layer) {
 
         QString visible = attributes.value("visible");
         bool dormant = (visible == "false");
 
         // We need to do this both before and after adding the layer

 
         layer->setLayerDormant(m_currentPane, dormant);
     }
 
     m_currentLayer = layer;
-    m_inLayer = true;
+    m_inLayer = (layer != 0);
 
     return true;
 }
 
 bool

 
     SparseTimeValueModel *stvm = dynamic_cast<SparseTimeValueModel *>
 	(m_currentDataset);
 
     if (stvm) {
-        cerr << "Current dataset is a sparse time-value model" << endl;
+//        cerr << "Current dataset is a sparse time-value model" << endl;
 	float value = 0.0;
 	value = attributes.value("value").trimmed().toFloat(&ok);
 	QString label = attributes.value("label");
 	stvm->addPoint(SparseTimeValueModel::Point(frame, value, label));
 	return ok;
     }
 	
     NoteModel *nm = dynamic_cast<NoteModel *>(m_currentDataset);
 
     if (nm) {
-        cerr << "Current dataset is a note model" << endl;
+//        cerr << "Current dataset is a note model" << endl;
 	float value = 0.0;
 	value = attributes.value("value").trimmed().toFloat(&ok);
 	int duration = 0;
 	duration = attributes.value("duration").trimmed().toInt(&ok);
 	QString label = attributes.value("label");

     }
 
     FlexiNoteModel *fnm = dynamic_cast<FlexiNoteModel *>(m_currentDataset);
 
     if (fnm) {
-        cerr << "Current dataset is a flexinote model" << endl;
+//        cerr << "Current dataset is a flexinote model" << endl;
 	float value = 0.0;
 	value = attributes.value("value").trimmed().toFloat(&ok);
 	int duration = 0;
 	duration = attributes.value("duration").trimmed().toInt(&ok);
 	QString label = attributes.value("label");

     }
 
     RegionModel *rm = dynamic_cast<RegionModel *>(m_currentDataset);
 
     if (rm) {
-        cerr << "Current dataset is a region model" << endl;
+//        cerr << "Current dataset is a region model" << endl;
 	float value = 0.0;
 	value = attributes.value("value").trimmed().toFloat(&ok);
 	int duration = 0;
 	duration = attributes.value("duration").trimmed().toInt(&ok);
 	QString label = attributes.value("label");