Ported r6762:6763 from 0.8 to trunk

git-svn-id: http://svn.osgeo.org/qgis/trunk@6765 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 4, 2007 · c165463 · c165463
1 parent e8017c7
commit c165463
Show file tree

Hide file tree

Showing 18 changed files with 38,541 additions and 24,328 deletions.
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_id.ts b/i18n/qgis_id.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_lv.ts b/i18n/qgis_lv.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_pl_PL.ts b/i18n/qgis_pl_PL.ts
diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts
diff --git a/i18n/qgis_ro.ts b/i18n/qgis_ro.ts
diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts
diff --git a/i18n/qgis_sk.ts b/i18n/qgis_sk.ts
diff --git a/i18n/qgis_vi.ts b/i18n/qgis_vi.ts
diff --git a/i18n/qgis_zh_CN.ts b/i18n/qgis_zh_CN.ts
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1454,7 +1454,7 @@ void QgsRasterLayer::drawSingleBandGray(QPainter * theQPainter, QgsRasterViewPor
     }
   }
 
-  /* TODO: Should readData be freed here? */
+  CPLFree ( myGdalScanData );
 
   //render any inline filters
   filterLayer(&myQImage);
@@ -1771,7 +1771,7 @@ void QgsRasterLayer::drawPalettedSingleBandColor(QPainter * theQPainter, QgsRast
     }
   }
 
-  /* TODO: Should readData be freed here? */
+  CPLFree(myGdalScanData);
 
   //render any inline filters
   filterLayer(&myQImage);

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -2313,13 +2313,13 @@ QString QgsWmsProvider::getMetadata()
 
 QString QgsWmsProvider::identifyAsText(const QgsPoint& point)
 {
-#ifdef QGISDEBUG
-  std::cout << "QgsWmsProvider::identifyAsText: entering." << std::endl;
-#endif
+
+  QgsDebugMsg("Entering.");
 
   // Collect which layers to query on
 
   QStringList queryableLayers = QStringList();
+  QString text = "";;
 
   // Test for which layers are suitable for querying with
   for ( QStringList::const_iterator it  = activeSubLayers.begin(); 
@@ -2332,25 +2332,18 @@ QString QgsWmsProvider::identifyAsText(const QgsPoint& point)
       // Is sublayer queryable?
       if (TRUE == mQueryableForLayer.find( *it )->second)
       {
-#ifdef QGISDEBUG
-  std::cout << "QgsWmsProvider::identifyAsText: '" << (*it).toLocal8Bit().data() << "' is queryable." << std::endl;
-#endif
-        queryableLayers += *it;
-      }
-    }
-  }
+        QgsDebugMsg("Layer '" + *it + "' is queryable.");
+        // Compose request to WMS server
 
-  QString layers = QUrl::toPercentEncoding(queryableLayers.join(","));
+        QString requestUrl = mGetFeatureInfoUrlBase;
+        QString layer = QUrl::toPercentEncoding(*it);
 
-  // Compose request to WMS server
+        requestUrl += "&";
+        requestUrl += "QUERY_LAYERS=" + layer ;
+        requestUrl += "&";
+        //! \todo Need to tie this into the options provided by GetCapabilities
+        requestUrl += "INFO_FORMAT=text/plain";
 
-  QString requestUrl = mGetFeatureInfoUrlBase;
-
-  requestUrl += "&";
-  requestUrl += "QUERY_LAYERS=" + layers;
-  requestUrl += "&";
-   //! \todo Need to tie this into the options provided by GetCapabilities
-  requestUrl += "INFO_FORMAT=text/plain";
 
 // X,Y in WMS 1.1.1; I,J in WMS 1.3.0
 
@@ -2361,19 +2354,29 @@ QString QgsWmsProvider::identifyAsText(const QgsPoint& point)
 //   requestUrl += QString( "J=%1" )
 //                    .arg( point.y() );
 
-  requestUrl += "&";
-  requestUrl += QString( "X=%1" )
-                   .arg( point.x() );
-  requestUrl += "&";
-  requestUrl += QString( "Y=%1" )
-                   .arg( point.y() );
+        requestUrl += "&";
+        requestUrl += QString( "X=%1" )
+          .arg( point.x() );
+        requestUrl += "&";
+        requestUrl += QString( "Y=%1" )
+          .arg( point.y() );
 
-  QString text = retrieveUrl(requestUrl);
+        text += "---------------\n" + retrieveUrl(requestUrl);
+      }
+    }
+  }
 
-#ifdef QGISDEBUG
-  std::cout << "QgsWmsProvider::identifyAsText: exiting with '"
-            << text.toLocal8Bit().data() << "'." << std::endl;
-#endif
+
+  if (text.isEmpty())
+  {
+    // No layers were queryably. This can happen if identify tool was
+    // active when this non-queriable layer was selected.
+    // Return a descriptive text.
+
+    text = tr("Layer cannot be queried.");
+  }
+
+  QgsDebugMsg("Exiting with: " + text);
   return text;
 }