132 changes: 94 additions & 38 deletions src/app/qgstilescalewidget.cpp → src/providers/wms/qgstilescalewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@
#include "qgstilescalewidget.h"
#include "qgsmapcanvas.h"
#include "qgsrasterlayer.h"
#include "qgswmsprovider.h"
#include "qgsmessagelog.h"
#include "qgslogger.h"

#include <QDockWidget>
#include <QMainWindow>
#include <QMenu>
#include <QGraphicsView>

QgsTileScaleWidget::QgsTileScaleWidget( QgsMapCanvas * mapCanvas, QWidget * parent, Qt::WindowFlags f )
: QWidget( parent, f )
, mMapCanvas( mapCanvas )
Expand All @@ -31,54 +38,46 @@ QgsTileScaleWidget::QgsTileScaleWidget( QgsMapCanvas * mapCanvas, QWidget * pare
layerChanged( mMapCanvas->currentLayer() );
}

QgsTileScaleWidget::~QgsTileScaleWidget()
{
QSettings settings;
settings.setValue( "/UI/tileScaleEnabled", isVisible() );
}

void QgsTileScaleWidget::layerChanged( QgsMapLayer *layer )
{
QgsRasterLayer *rl = qobject_cast<QgsRasterLayer *>( layer );
if ( !rl )
return;

mResolutions.clear();
mSlider->setDisabled( true );
QgsWmsProvider *wms = qobject_cast<QgsWmsProvider *>( rl->dataProvider() );
if ( !wms )
return;

if ( !rl || rl->providerType() != "wms" )
QgsWmtsTileMatrixSet *tileMatrixSet = wms->tileMatrixSet();
if ( !tileMatrixSet )
return;

QString uri = rl->source();
int tiledpos = uri.indexOf( "tiled=" );
int urlpos = uri.indexOf( "url=" );
mSlider->setDisabled( true );

mResolutions = tileMatrixSet->tileMatrices.keys();
qSort( mResolutions );

if ( tiledpos >= 0 && urlpos >= 0 && urlpos > tiledpos )
for ( int i = 0; i < mResolutions.size(); i++ )
{
uri = uri.mid( tiledpos + 6 );
int pos = uri.indexOf( "," );
if ( pos >= 0 )
uri = uri.left( pos );
QStringList params = uri.split( ";" );
if ( params.size() < 3 )
return;

params.takeFirst();
params.takeFirst();

mResolutions.clear();
foreach( QString r, params )
{
mResolutions << r.toDouble();
}
qSort( mResolutions );

for ( int i = 0; i < mResolutions.size(); i++ )
QgsDebugMsg( QString( "found resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );

mSlider->setRange( 0, mResolutions.size() - 1 );
mSlider->setTickInterval( 1 );
mSlider->setInvertedAppearance( true );
mSlider->setPageStep( 1 );
mSlider->setTracking( false );

scaleChanged( mMapCanvas->scale() );

mSlider->setEnabled( true );
show();
QgsDebugMsg( QString( "found resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );
}

mSlider->setRange( 0, mResolutions.size() - 1 );
mSlider->setTickInterval( 1 );
mSlider->setInvertedAppearance( true );
mSlider->setPageStep( 1 );
mSlider->setTracking( false );

scaleChanged( mMapCanvas->scale() );

mSlider->setEnabled( true );
show();
}

void QgsTileScaleWidget::scaleChanged( double scale )
Expand All @@ -103,7 +102,9 @@ void QgsTileScaleWidget::scaleChanged( double scale )
}

QgsDebugMsg( QString( "selected resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );
mSlider->blockSignals( true );
mSlider->setValue( i );
mSlider->blockSignals( false );
}

void QgsTileScaleWidget::on_mSlider_valueChanged( int value )
Expand All @@ -112,3 +113,58 @@ void QgsTileScaleWidget::on_mSlider_valueChanged( int value )
QgsDebugMsg( QString( "slider released at %1: %2" ).arg( mSlider->value() ).arg( mResolutions[mSlider->value()] ) );
mMapCanvas->zoomByFactor( mResolutions[mSlider->value()] / mMapCanvas->mapUnitsPerPixel() );
}

void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
{
QDockWidget *dock = mainWindow->findChild<QDockWidget *>( "theTileScaleDock" );
if ( dock )
{
dock->setVisible( dock->isHidden() );
return;
}

QgsMapCanvas *canvas = mainWindow->findChild<QgsMapCanvas *>( "theMapCanvas" );
QgsDebugMsg( QString( "canvas:%1 [%2]" ).arg(( ulong ) canvas, 0, 16 ).arg( canvas ? canvas->objectName() : "" ) );
if ( !canvas )
{
QgsDebugMsg( "map canvas theMapCanvas not found" );
return;
}

QgsTileScaleWidget *tws = new QgsTileScaleWidget( canvas );
tws->setObjectName( "theTileScaleWidget" );

QObject *legend = mainWindow->findChild<QObject*>( "theMapLegend" );
if ( legend )
{
connect( legend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
tws, SLOT( layerChanged( QgsMapLayer* ) ) );
}
else
{
QgsDebugMsg( "legend not found" );
}

//create the dock widget
dock = new QDockWidget( tr( "Tile scale" ), mainWindow );
dock->setObjectName( "theTileScaleDock" );
dock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
mainWindow->addDockWidget( Qt::RightDockWidgetArea, dock );

// add to the Panel submenu
QMenu *panelMenu = mainWindow->findChild<QMenu *>( "mPanelMenu" );
if ( panelMenu )
{
// add to the Panel submenu
panelMenu->addAction( dock->toggleViewAction() );
}
else
{
QgsDebugMsg( "panel menu not found" );
}

panelMenu->addAction( dock->toggleViewAction() );

dock->setWidget( tws );
dock->show();
}
8 changes: 6 additions & 2 deletions src/app/qgstilescalewidget.h → src/providers/wms/qgstilescalewidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,24 @@

class QgsMapCanvas;
class QgsMapLayer;
class QwtSlider;
class QMainWindow;

class QgsTileScaleWidget : public QWidget, private Ui::QgsTileScaleWidget
{
Q_OBJECT

public:
QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget * parent = 0, Qt::WindowFlags f = 0 );
static void showTileScale( QMainWindow *mainWindow );

public slots:
void layerChanged( QgsMapLayer *layer );
void scaleChanged( double );
void on_mSlider_valueChanged( int );

private:
QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget *parent = 0, Qt::WindowFlags f = 0 );
~QgsTileScaleWidget();

QgsMapCanvas *mMapCanvas;
QList<double> mResolutions;
};
Expand Down
26 changes: 4 additions & 22 deletions src/providers/wms/qgswmsconnection.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/***************************************************************************
qgswmsconnection.cpp - selector for WMS servers, etc.
-------------------
begin : 3 April 2005
copyright :
original : (C) 2005 by Brendan Morley email : morb at ozemail dot com dot au
wms search : (C) 2009 Mathias Walker <mwa at sourcepole.ch>, Sourcepole AG
wms-c support : (C) 2010 Juergen E. Fischer < jef at norbit dot de >, norBIT GmbH
begin : May 2011
original : (C) 2011 by Martin Dobias
***************************************************************************/

Expand All @@ -20,28 +17,13 @@

#include "../providers/wms/qgswmsprovider.h"
#include "qgis.h" // GEO_EPSG_CRS_ID
//#include "qgisapp.h" //for getThemeIcon
//#include "qgscontexthelp.h"
//#include "qgscoordinatereferencesystem.h"
//#include "qgsgenericprojectionselector.h"
//#include "qgslogger.h"
//#include "qgsmanageconnectionsdialog.h"
//#include "qgsmessageviewer.h"
#include "qgsnewhttpconnection.h"
//#include "qgsnumericsortlistviewitem.h"
#include "qgsproject.h"
#include "qgsproviderregistry.h"
#include "qgswmsconnection.h"
#include "qgsnetworkaccessmanager.h"

//#include <QButtonGroup>
//#include <QFileDialog>
//#include <QRadioButton>
//#include <QDomDocument>
//#include <QHeaderView>
//#include <QImageReader>
#include <QInputDialog>
//#include <QMap>
#include <QMessageBox>
#include <QPicture>
#include <QSettings>
Expand Down Expand Up @@ -110,12 +92,12 @@ QgsWMSConnection::~QgsWMSConnection()

}

QString QgsWMSConnection::connectionInfo( )
QString QgsWMSConnection::connectionInfo()
{
return mConnectionInfo;
}

QgsWmsProvider * QgsWMSConnection::provider( )
QgsWmsProvider *QgsWMSConnection::provider()
{
// TODO: Create and bind to data provider

Expand Down
9 changes: 8 additions & 1 deletion src/providers/wms/qgswmsdataitems.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include "qgsnewhttpconnection.h"

#include "qgstilescalewidget.h"

// ---------------------------------------------------------------------------
QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, QString path )
: QgsDataCollectionItem( parent, name, path )
Expand All @@ -23,7 +25,7 @@ QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
QgsDebugMsg( "Entered" );
QVector<QgsDataItem*> children;
QgsWMSConnection connection( mName );
QgsWmsProvider *wmsProvider = connection.provider( );
QgsWmsProvider *wmsProvider = connection.provider();
if ( !wmsProvider )
return children;

Expand Down Expand Up @@ -248,6 +250,11 @@ void QgsWMSRootItem::newConnection()

// ---------------------------------------------------------------------------

QGISEXTERN void registerGui( QMainWindow *mainWindow )
{
QgsTileScaleWidget::showTileScale( mainWindow );
}

QGISEXTERN QgsWMSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
{
return new QgsWMSSourceSelect( parent, fl );
Expand Down
2,165 changes: 1,428 additions & 737 deletions src/providers/wms/qgswmsprovider.cpp
View file

Large diffs are not rendered by default.

247 changes: 192 additions & 55 deletions src/providers/wms/qgswmsprovider.h
View file

Large diffs are not rendered by default.

178 changes: 112 additions & 66 deletions src/providers/wms/qgswmssourceselect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
copyright :
original : (C) 2005 by Brendan Morley email : morb at ozemail dot com dot au
wms search : (C) 2009 Mathias Walker <mwa at sourcepole.ch>, Sourcepole AG
wms-c support : (C) 2010 Juergen E. Fischer < jef at norbit dot de >, norBIT GmbH
wmts/wms-c support : (C) 2010-2012 Juergen E. Fischer < jef at norbit dot de >, norBIT GmbH
***************************************************************************/

Expand All @@ -18,7 +18,7 @@
* *
***************************************************************************/

#include "../providers/wms/qgswmsprovider.h"
#include "qgswmsprovider.h"
#include "qgis.h" // GEO_EPSG_CRS_ID
#include "qgscontexthelp.h"
#include "qgscoordinatereferencesystem.h"
Expand All @@ -33,6 +33,7 @@
#include "qgswmsconnection.h"
#include "qgswmsprovider.h"
#include "qgswmssourceselect.h"
#include "qgswmtsdimensions.h"
#include "qgsnetworkaccessmanager.h"

#include <QButtonGroup>
Expand Down Expand Up @@ -333,57 +334,64 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )

lstLayers->sortByColumn( 0, Qt::AscendingOrder );

QVector<QgsWmsTileSetProfile> tilesets;
wmsProvider->supportedTileSets( tilesets );
wmsProvider->supportedTileLayers( mTileLayers );

tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), tilesets.size() > 0 );
tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), mTileLayers.size() > 0 );
if ( tabServers->isTabEnabled( tabServers->indexOf( tabTilesets ) ) )
tabServers->setCurrentWidget( tabTilesets );

if ( tilesets.size() > 0 )
if ( mTileLayers.size() > 0 )
{
QHash<QString, QgsWmtsTileMatrixSet> tileMatrixSets;
wmsProvider->supportedTileMatrixSets( tileMatrixSets );

int rows = 0;
foreach( const QgsWmtsTileLayer &l, mTileLayers )
{
rows += l.styles.size() * l.setLinks.size();
}

lstTilesets->clearContents();
lstTilesets->setRowCount( tilesets.size() );
lstTilesets->setRowCount( rows );
lstTilesets->setSortingEnabled( true );

for ( int i = 0; i < tilesets.size(); i++ )
int row = 0;
foreach( const QgsWmtsTileLayer &l, mTileLayers )
{
QTableWidgetItem *item = new QTableWidgetItem( tilesets[i].layers.join( ", " ) );

item->setData( Qt::UserRole + 0, tilesets[i].layers.join( "," ) );
item->setData( Qt::UserRole + 1, tilesets[i].styles.join( "," ) );
item->setData( Qt::UserRole + 2, tilesets[i].format );
item->setData( Qt::UserRole + 3, tilesets[i].crs );
item->setData( Qt::UserRole + 4, tilesets[i].tileWidth );
item->setData( Qt::UserRole + 5, tilesets[i].tileHeight );
item->setData( Qt::UserRole + 6, tilesets[i].resolutions );

lstTilesets->setItem( i, 0, item );
lstTilesets->setItem( i, 1, new QTableWidgetItem( tilesets[i].styles.join( ", " ) ) );
lstTilesets->setItem( i, 2, new QTableWidgetItem( QString( "%1x%2" ).arg( tilesets[i].tileWidth ).arg( tilesets[i].tileHeight ) ) );
lstTilesets->setItem( i, 3, new QTableWidgetItem( tilesets[i].format ) );
lstTilesets->setItem( i, 4, new QTableWidgetItem( tilesets[i].crs ) );

for ( int j = 0; j < 5; j++ )
foreach( const QgsWmtsStyle &style, l.styles )
{
QTableWidgetItem *item = lstTilesets->item( i, j );
item->setFlags( item->flags() & ~Qt::ItemIsEditable );
}

if ( !mMimeMap.contains( tilesets[i].format ) )
{
for ( int j = 0; j < 5; j++ )
foreach( const QgsWmtsTileMatrixSetLink &setLink, l.setLinks )
{
QTableWidgetItem *item = lstTilesets->item( i, j );
item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
item->setToolTip( tr( "encoding %1 not supported." ).arg( tilesets[i].format ) );
QTableWidgetItem *item = new QTableWidgetItem( l.identifier );
item->setData( Qt::UserRole + 0, l.identifier );
item->setData( Qt::UserRole + 1, l.format );
item->setData( Qt::UserRole + 2, style.identifier );
item->setData( Qt::UserRole + 3, setLink.tileMatrixSet );
item->setData( Qt::UserRole + 4, tileMatrixSets[ setLink.tileMatrixSet ].crs );

lstTilesets->setItem( row, 0, item );
lstTilesets->setItem( row, 1, new QTableWidgetItem( l.format ) );
lstTilesets->setItem( row, 2, new QTableWidgetItem( style.identifier ) );
QTableWidgetItem *styleItem = new QTableWidgetItem( l.title );
if ( !l.abstract.isEmpty() )
styleItem->setToolTip( "<p>" + l.abstract + "</p>" );
lstTilesets->setItem( row, 3, styleItem );
lstTilesets->setItem( row, 4, new QTableWidgetItem( setLink.tileMatrixSet ) );
lstTilesets->setItem( row, 5, new QTableWidgetItem( tileMatrixSets[ setLink.tileMatrixSet ].crs ) );

if ( !mMimeMap.contains( l.format ) )
{
for ( int i = 0; i < lstTilesets->columnCount(); i++ )
{
QTableWidgetItem *item = lstTilesets->item( row, i );
item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
item->setToolTip( tr( "encoding %1 not supported." ).arg( l.format ) );
}
}

row++;
}
}

QString crsName = descriptionForAuthId( tilesets[i].crs );
if ( crsName.isEmpty() )
crsName = tr( "CRS %1 not supported." ).arg( tilesets[i].crs );
lstTilesets->item( i, 4 )->setToolTip( crsName );
}

lstTilesets->resizeColumnsToContents();
Expand All @@ -405,7 +413,7 @@ void QgsWMSSourceSelect::on_btnConnect_clicked()
mConnName = cmbConnections->currentText();

QgsWMSConnection connection( cmbConnections->currentText() );
QgsWmsProvider *wmsProvider = connection.provider( );
QgsWmsProvider *wmsProvider = connection.provider();
mConnectionInfo = connection.connectionInfo();

if ( wmsProvider )
Expand Down Expand Up @@ -444,52 +452,90 @@ void QgsWMSSourceSelect::addClicked()
QString crs;
QString connInfo = connectionInfo();

QString connArgs;
QStringList connArgs;

if ( mTileWidth->text().toInt() > 0 && mTileHeight->text().toInt() > 0 )
{
connArgs << QString( "maxSize=%1;%2" ).arg( mTileWidth->text().toInt() ).arg( mTileHeight->text().toInt() );
}

if ( lstTilesets->selectedItems().isEmpty() )
{
collectSelectedLayers( layers, styles );
crs = mCRS;
format = mFormats[ mImageFormatGroup->checkedId()].format;

if ( mTileWidth->text().toInt() > 0 && mTileHeight->text().toInt() > 0 )
{
connArgs = QString( "tiled=%1;%2" ).arg( mTileWidth->text().toInt() ).arg( mTileHeight->text().toInt() );
}
}
else
{
QTableWidgetItem *item = lstTilesets->selectedItems().first();
layers = item->data( Qt::UserRole + 0 ).toStringList();
styles = item->data( Qt::UserRole + 1 ).toStringList();
format = item->data( Qt::UserRole + 2 ).toString();
crs = item->data( Qt::UserRole + 3 ).toString();

connArgs = QString( "tiled=%1;%2;%3" )
.arg( item->data( Qt::UserRole + 4 ).toInt() )
.arg( item->data( Qt::UserRole + 5 ).toInt() )
.arg( item->data( Qt::UserRole + 6 ).toStringList().join( ";" ) );

layers = QStringList( item->data( Qt::UserRole + 0 ).toString() );
format = item->data( Qt::UserRole + 1 ).toString();
styles = QStringList( item->data( Qt::UserRole + 2 ).toString() );
crs = item->data( Qt::UserRole + 4 ).toString();

connArgs << QString( "tileMatrixSet=%1" ).arg( item->data( Qt::UserRole + 3 ).toStringList().join( ";" ) );

const QgsWmtsTileLayer *layer = 0;

foreach( const QgsWmtsTileLayer &l, mTileLayers )
{
if ( l.identifier == layers.join( "," ) )
{
layer = &l;
break;
}
}

Q_ASSERT( layer );

if ( !layer->dimensions.isEmpty() )
{
QgsWmtsDimensions *dlg = new QgsWmtsDimensions( *layer, this );
if ( dlg->exec() != QDialog::Accepted )
{
delete dlg;
return;
}

QHash<QString, QString> dims;
dlg->selectedDimensions( dims );

QString dimString = "tileDimensions=";
QString delim;

for ( QHash<QString, QString>::const_iterator it = dims.constBegin();
it != dims.constEnd();
++it )
{
dimString += delim + it.key() + "=" + it.value();
delim = ";";
}

delete dlg;

connArgs << dimString;
}
}

if ( mFeatureCount->text().toInt() > 0 )
{
if ( !connArgs.isEmpty() )
connArgs += ",";
connArgs += QString( "featureCount=%1" ).arg( mFeatureCount->text().toInt() );
connArgs << QString( "featureCount=%1" ).arg( mFeatureCount->text().toInt() );
}

if ( !connArgs.isEmpty() )
{
if ( connInfo.startsWith( "username=" ) || connInfo.startsWith( "ignoreUrl=" ) )
{
connInfo.prepend( connArgs + "," );
}
else
if ( !connInfo.startsWith( "username=" ) && !connInfo.startsWith( "ignoreUrl=" ) )
{
connInfo.prepend( connArgs + ",url=" );
connInfo.prepend( "url=" );
}

connArgs << connInfo;

connInfo = connArgs.join( "," );
}
QgsDebugMsg( "crs = " + crs );

QgsDebugMsg( QString( "connInfo=%1 crs=%2 " ).arg( connInfo ).arg( crs ) );

emit addRasterLayer( connInfo,
leLayerName->text().isEmpty() ? layers.join( "/" ) : leLayerName->text(),
Expand Down
5 changes: 4 additions & 1 deletion src/providers/wms/qgswmssourceselect.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
qgserversourceselect.h - selector for WMS servers, etc.
qgswmssourceselect.h - selector for WMS servers, etc.
-------------------
begin : 3 April 2005
original : (C) 2005 by Brendan Morley email : morb at ozemail dot com dot au
Expand Down Expand Up @@ -195,6 +195,9 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase

QList<QTreeWidgetItem*> mCurrentSelection;
QTableWidgetItem* mCurrentTileset;

QList<QgsWmtsTileLayer> mTileLayers;

signals:
void addRasterLayer( QString const & rasterLayerPath,
QString const & baseName,
Expand Down
6 changes: 0 additions & 6 deletions src/ui/qgisapp.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
<addaction name="mActionNewBookmark"/>
<addaction name="mActionShowBookmarks"/>
<addaction name="mActionDraw"/>
<addaction name="mActionTileScale"/>
</widget>
<widget class="QMenu" name="mLayerMenu">
<property name="title">
Expand Down Expand Up @@ -1251,11 +1250,6 @@
<string>Set Project CRS from Layer</string>
</property>
</action>
<action name="mActionTileScale">
<property name="text">
<string>Tile scale slider</string>
</property>
</action>
<action name="mActionLayerProperties">
<property name="text">
<string>Properties...</string>
Expand Down
13 changes: 9 additions & 4 deletions src/ui/qgswmssourceselectbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,22 +355,27 @@
</attribute>
<column>
<property name="text">
<string>Layers</string>
<string>Layer</string>
</property>
</column>
<column>
<property name="text">
<string>Styles</string>
<string>Format</string>
</property>
</column>
<column>
<property name="text">
<string>Size</string>
<string>Style</string>
</property>
</column>
<column>
<property name="text">
<string>Format</string>
<string>Title</string>
</property>
</column>
<column>
<property name="text">
<string>Tileset</string>
</property>
</column>
<column>
Expand Down