comparison framework/SVFileReader.cpp @ 233:8aace2d9f1c2

Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)

 	return false;
     }
 
     QString name = attributes.value("name");
 
-    DEBUG << "SVFileReader::readModel: model name \"" << name << "\"" << endl;
+    SVDEBUG << "SVFileReader::readModel: model name \"" << name << "\"" << endl;
 
     READ_MANDATORY(int, sampleRate, toInt);
 
     QString type = attributes.value("type").trimmed();
     bool mainModel = (attributes.value("mainModel").trimmed() == "true");

 {
     bool ok = false;
 
     READ_MANDATORY(int, frame, toInt);
 
-//    DEBUG << "SVFileReader::addPointToDataset: frame = " << frame << endl;
+//    SVDEBUG << "SVFileReader::addPointToDataset: frame = " << frame << endl;
 
     SparseOneDimensionalModel *sodm = dynamic_cast<SparseOneDimensionalModel *>
 	(m_currentDataset);
 
     if (sodm) {

     if (tm) {
 //        std::cerr << "Current dataset is a text model" << std::endl;
 	float height = 0.0;
 	height = attributes.value("height").trimmed().toFloat(&ok);
 	QString label = attributes.value("label");
-//        DEBUG << "SVFileReader::addPointToDataset: TextModel: frame = " << frame << ", height = " << height << ", label = " << label << ", ok = " << ok << endl;
+//        SVDEBUG << "SVFileReader::addPointToDataset: TextModel: frame = " << frame << ", height = " << height << ", label = " << label << ", ok = " << ok << endl;
 	tm->addPoint(TextModel::Point(frame, height, label));
 	return ok;
     }
 
     PathModel *pm = dynamic_cast<PathModel *>(m_currentDataset);
 
     if (pm) {
 //        std::cerr << "Current dataset is a path model" << std::endl;
         int mapframe = attributes.value("mapframe").trimmed().toInt(&ok);
-//        DEBUG << "SVFileReader::addPointToDataset: PathModel: frame = " << frame << ", mapframe = " << mapframe << ", ok = " << ok << endl;
+//        SVDEBUG << "SVFileReader::addPointToDataset: PathModel: frame = " << frame << ", mapframe = " << mapframe << ", ok = " << ok << endl;
 	pm->addPoint(PathModel::Point(frame, mapframe));
 	return ok;
     }
 
     ImageModel *im = dynamic_cast<ImageModel *>(m_currentDataset);
 
     if (im) {
 //        std::cerr << "Current dataset is an image model" << std::endl;
 	QString image = attributes.value("image");
 	QString label = attributes.value("label");
-//        DEBUG << "SVFileReader::addPointToDataset: ImageModel: frame = " << frame << ", image = " << image << ", label = " << label << ", ok = " << ok << endl;
+//        SVDEBUG << "SVFileReader::addPointToDataset: ImageModel: frame = " << frame << ", image = " << image << ", label = " << label << ", ok = " << ok << endl;
 	im->addPoint(ImageModel::Point(frame, image, label));
 	return ok;
     }
 
     std::cerr << "WARNING: SV-XML: Point element found in non-point dataset" << std::endl;

     if (type == "transform") {
         m_currentTransformIsNewStyle = true;
         return true;
     } else {
         m_currentTransformIsNewStyle = false;
-        DEBUG << "NOTE: SV-XML: Reading old-style derivation element"
+        SVDEBUG << "NOTE: SV-XML: Reading old-style derivation element"
                   << endl;
     }
 
     QString transformId = attributes.value("transform");
 

 }
 
 bool
 SVFileReader::readMeasurement(const QXmlAttributes &attributes)
 {
-    DEBUG << "SVFileReader::readMeasurement: inLayer "
+    SVDEBUG << "SVFileReader::readMeasurement: inLayer "
               << m_inLayer << ", layer " << m_currentLayer << endl;
 
     if (!m_inLayer) {
         std::cerr << "WARNING: SV-XML: Measurement found outside layer" << std::endl;
         return false;