comparison layer/LayerFactory.cpp @ 327:29fcf125f98b

* Pass StorageAdviser::Criteria into FFTModel constructor etc

 
     if (!layer) {
 	std::cerr << "LayerFactory::createLayer: Unknown layer type " 
 		  << type << std::endl;
     } else {
-//	std::cerr << "LayerFactory::createLayer: Setting object name "
-//		  << getLayerPresentationName(type).toStdString() << " on " << layer << std::endl;
+	std::cerr << "LayerFactory::createLayer: Setting object name "
+		  << getLayerPresentationName(type).toStdString() << " on " << layer << std::endl;
 	layer->setObjectName(getLayerPresentationName(type));
         setLayerDefaultProperties(type, layer);
     }
 
     return layer;
 }
 
 void
 LayerFactory::setLayerDefaultProperties(LayerType type, Layer *layer)
 {
+    std::cerr << "LayerFactory::setLayerDefaultProperties: type " << type << " (name \"" << getLayerTypeName(type).toStdString() << "\"" << std::endl;
+
     QSettings settings;
     settings.beginGroup("LayerDefaults");
     QString defaults = settings.value(getLayerTypeName(type), "").toString();
     if (defaults == "") return;
+
+    std::cerr << "defaults=\"" << defaults.toStdString() << "\"" << std::endl;
 
     QString xml = layer->toXmlString();
     QDomDocument docOld, docNew;
     
     if (docOld.setContent(xml, false) &&

         QDomNamedNodeMap attrNodes = layerElt.attributes();
         
         for (unsigned int i = 0; i < attrNodes.length(); ++i) {
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
+            std::cerr << "append \"" << attr.name().toStdString()
+                      << "\" -> \"" << attr.value().toStdString() << "\""
+                      << std::endl;
             attrs.append(attr.name(), "", "", attr.value());
         }
         
         layerElt = docOld.firstChildElement("layer");
         attrNodes = layerElt.attributes();
         for (unsigned int i = 0; i < attrNodes.length(); ++i) {
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
             if (attrs.value(attr.name()) == "") {
+                std::cerr << "append \"" << attr.name().toStdString()
+                          << "\" -> \"" << attr.value().toStdString() << "\""
+                          << std::endl;
                 attrs.append(attr.name(), "", "", attr.value());
             }
         }
         
         layer->setProperties(attrs);