Skip to content
Permalink
Browse files
Ported r6762:6763 from 0.8 to trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6765 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Mar 4, 2007
1 parent 9080e5e commit 553b014bc55af8f1684127d343cae15f618edd7b
Showing with 38,541 additions and 24,328 deletions.
  1. +1,869 −1,242 i18n/qgis_cs_CZ.ts
  2. +7,923 −5,007 i18n/qgis_de.ts
  3. +1,878 −1,205 i18n/qgis_es.ts
  4. +1,858 −1,258 i18n/qgis_fr.ts
  5. +1,827 −1,354 i18n/qgis_id.ts
  6. +3,064 −2,353 i18n/qgis_it.ts
  7. +1,843 −1,300 i18n/qgis_ja.ts
  8. +3,560 −67 i18n/qgis_lv.ts
  9. +1,838 −1,447 i18n/qgis_nl.ts
  10. +1,843 −1,294 i18n/qgis_pl_PL.ts
  11. +1,833 −1,323 i18n/qgis_pt_BR.ts
  12. +1,855 −1,260 i18n/qgis_ro.ts
  13. +1,808 −1,399 i18n/qgis_ru.ts
  14. +1,815 −1,214 i18n/qgis_sk.ts
  15. +1,841 −1,309 i18n/qgis_vi.ts
  16. +1,851 −1,264 i18n/qgis_zh_CN.ts
  17. +2 −2 src/core/raster/qgsrasterlayer.cpp
  18. +33 −30 src/providers/wms/qgswmsprovider.cpp

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -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);
@@ -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;
}

0 comments on commit 553b014

Please sign in to comment.