Skip to content

Commit

Permalink
Ported r6762:6763 from 0.8 to trunk
Browse files Browse the repository at this point in the history
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 553b014
Show file tree
Hide file tree
Showing 18 changed files with 38,541 additions and 24,328 deletions.
3,111 changes: 1,869 additions & 1,242 deletions i18n/qgis_cs_CZ.ts

Large diffs are not rendered by default.

12,930 changes: 7,923 additions & 5,007 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

3,083 changes: 1,878 additions & 1,205 deletions i18n/qgis_es.ts

Large diffs are not rendered by default.

3,116 changes: 1,858 additions & 1,258 deletions i18n/qgis_fr.ts

Large diffs are not rendered by default.

3,181 changes: 1,827 additions & 1,354 deletions i18n/qgis_id.ts

Large diffs are not rendered by default.

5,417 changes: 3,064 additions & 2,353 deletions i18n/qgis_it.ts

Large diffs are not rendered by default.

3,143 changes: 1,843 additions & 1,300 deletions i18n/qgis_ja.ts

Large diffs are not rendered by default.

3,627 changes: 3,560 additions & 67 deletions i18n/qgis_lv.ts

Large diffs are not rendered by default.

3,285 changes: 1,838 additions & 1,447 deletions i18n/qgis_nl.ts

Large diffs are not rendered by default.

3,137 changes: 1,843 additions & 1,294 deletions i18n/qgis_pl_PL.ts

Large diffs are not rendered by default.

3,156 changes: 1,833 additions & 1,323 deletions i18n/qgis_pt_BR.ts

Large diffs are not rendered by default.

3,115 changes: 1,855 additions & 1,260 deletions i18n/qgis_ro.ts

Large diffs are not rendered by default.

3,207 changes: 1,808 additions & 1,399 deletions i18n/qgis_ru.ts

Large diffs are not rendered by default.

3,029 changes: 1,815 additions & 1,214 deletions i18n/qgis_sk.ts

Large diffs are not rendered by default.

3,150 changes: 1,841 additions & 1,309 deletions i18n/qgis_vi.ts

Large diffs are not rendered by default.

3,115 changes: 1,851 additions & 1,264 deletions i18n/qgis_zh_CN.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ void QgsRasterLayer::drawSingleBandGray(QPainter * theQPainter, QgsRasterViewPor
}
}

/* TODO: Should readData be freed here? */
CPLFree ( myGdalScanData );

//render any inline filters
filterLayer(&myQImage);
Expand Down Expand Up @@ -1771,7 +1771,7 @@ void QgsRasterLayer::drawPalettedSingleBandColor(QPainter * theQPainter, QgsRast
}
}

/* TODO: Should readData be freed here? */
CPLFree(myGdalScanData);

//render any inline filters
filterLayer(&myQImage);
Expand Down
63 changes: 33 additions & 30 deletions src/providers/wms/qgswmsprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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

Expand All @@ -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;
}

Expand Down

0 comments on commit 553b014

Please sign in to comment.