Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[FEATURE]: experimental table join support refactored and ported from…
… branch to trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@15155 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
Showing
with
1,325 additions
and 61 deletions.
- +1 −0 images/images.qrc
- BIN images/themes/default/propertyicons/join.png
- +2 −0 src/app/CMakeLists.txt
- +1 −1 src/app/attributetable/qgsattributetablemodel.cpp
- +137 −0 src/app/qgsaddjoindialog.cpp
- +57 −0 src/app/qgsaddjoindialog.h
- +73 −3 src/app/qgsvectorlayerproperties.cpp
- +6 −0 src/app/qgsvectorlayerproperties.h
- +1 −0 src/core/CMakeLists.txt
- +1 −1 src/core/qgsdataprovider.h
- +15 −1 src/core/qgsproject.cpp
- +5 −0 src/core/qgsvectordataprovider.cpp
- +4 −0 src/core/qgsvectordataprovider.h
- +263 −34 src/core/qgsvectorlayer.cpp
- +66 −2 src/core/qgsvectorlayer.h
- +346 −0 src/core/qgsvectorlayerjoinbuffer.cpp
- +104 −0 src/core/qgsvectorlayerjoinbuffer.h
- +21 −4 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
- +28 −5 src/providers/ogr/qgsogrprovider.cpp
- +4 −1 src/providers/ogr/qgsogrprovider.h
- +5 −2 src/providers/postgres/qgspostgresprovider.cpp
- +1 −1 src/providers/postgres/qgspostgresprovider.h
- +4 −2 src/providers/spatialite/qgsspatialiteprovider.cpp
- +1 −1 src/providers/spatialite/qgsspatialiteprovider.h
- +108 −0 src/ui/qgsaddjoindialogbase.ui
- +71 −3 src/ui/qgsvectorlayerpropertiesbase.ui
Binary file not shown.
| @@ -0,0 +1,137 @@ | ||
| /*************************************************************************** | ||
| qgsaddjoindialog.cpp | ||
| -------------------- | ||
| begin : July 10, 2010 | ||
| copyright : (C) 2010 by Marco Hugentobler | ||
| email : marco dot hugentobler at sourcepole dot ch | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "qgsaddjoindialog.h" | ||
| #include "qgsmaplayer.h" | ||
| #include "qgsmaplayerregistry.h" | ||
| #include "qgsvectordataprovider.h" | ||
| #include "qgsvectorlayer.h" | ||
|
|
||
| QgsAddJoinDialog::QgsAddJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mLayer( layer ) | ||
| { | ||
| setupUi( this ); | ||
|
|
||
| if ( !mLayer ) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| //insert possible vector layers into mJoinLayerComboBox | ||
|
|
||
| mJoinLayerComboBox->blockSignals( true ); | ||
| const QMap<QString, QgsMapLayer*>& layerList = QgsMapLayerRegistry::instance()->mapLayers(); | ||
| QMap<QString, QgsMapLayer*>::const_iterator layerIt = layerList.constBegin(); | ||
| for ( ; layerIt != layerList.constEnd(); ++layerIt ) | ||
| { | ||
| QgsMapLayer* currentLayer = layerIt.value(); | ||
| if ( currentLayer->type() == QgsMapLayer::VectorLayer ) | ||
| { | ||
| QgsVectorLayer* currentVectorLayer = dynamic_cast<QgsVectorLayer*>( currentLayer ); | ||
| if ( currentVectorLayer && currentVectorLayer != mLayer ) | ||
| { | ||
| if ( currentVectorLayer->dataProvider() && currentVectorLayer->dataProvider()->supportsSubsetString() ) | ||
| mJoinLayerComboBox->addItem( currentLayer->name(), QVariant( currentLayer->getLayerID() ) ); | ||
| } | ||
| } | ||
| } | ||
| mJoinLayerComboBox->blockSignals( false ); | ||
| on_mJoinLayerComboBox_currentIndexChanged( mJoinLayerComboBox->currentIndex() ); | ||
|
|
||
| //insert possible target fields | ||
| const QgsFieldMap& layerFieldMap = mLayer->pendingFields(); | ||
| QgsFieldMap::const_iterator fieldIt = layerFieldMap.constBegin(); | ||
| for ( ; fieldIt != layerFieldMap.constEnd(); ++fieldIt ) | ||
| { | ||
| mTargetFieldComboBox->addItem( fieldIt.value().name(), fieldIt.key() ); | ||
| } | ||
|
|
||
| mCacheInMemoryCheckBox->setChecked( true ); | ||
| } | ||
|
|
||
| QgsAddJoinDialog::~QgsAddJoinDialog() | ||
| { | ||
| } | ||
|
|
||
| QString QgsAddJoinDialog::joinedLayerId() const | ||
| { | ||
| return mJoinLayerComboBox->itemData( mJoinLayerComboBox->currentIndex() ).toString(); | ||
| } | ||
|
|
||
| int QgsAddJoinDialog::joinField() const | ||
| { | ||
| return mJoinFieldComboBox->itemData( mJoinFieldComboBox->currentIndex() ).toInt(); | ||
| } | ||
|
|
||
| QString QgsAddJoinDialog::joinFieldName() const | ||
| { | ||
| return mJoinFieldComboBox->itemText( mJoinFieldComboBox->currentIndex() ); | ||
| } | ||
|
|
||
| int QgsAddJoinDialog::targetField() const | ||
| { | ||
| return mTargetFieldComboBox->itemData( mTargetFieldComboBox->currentIndex() ).toInt(); | ||
| } | ||
|
|
||
| QString QgsAddJoinDialog::targetFieldName() const | ||
| { | ||
| return mTargetFieldComboBox->itemText( mTargetFieldComboBox->currentIndex() ); | ||
| } | ||
|
|
||
| bool QgsAddJoinDialog::cacheInMemory() const | ||
| { | ||
| return mCacheInMemoryCheckBox->isChecked(); | ||
| } | ||
|
|
||
| bool QgsAddJoinDialog::createAttributeIndex() const | ||
| { | ||
| return mCreateIndexCheckBox->isChecked(); | ||
| } | ||
|
|
||
| void QgsAddJoinDialog::on_mJoinLayerComboBox_currentIndexChanged( int index ) | ||
| { | ||
| mJoinFieldComboBox->clear(); | ||
| QString layerId = mJoinLayerComboBox->itemData( index ).toString(); | ||
| QgsMapLayer* layer = QgsMapLayerRegistry::instance()->mapLayer( layerId ); | ||
| if ( !layer ) | ||
| { | ||
| return; | ||
| } | ||
| QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( layer ); | ||
| if ( !vLayer ) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| const QgsFieldMap& layerFieldMap = vLayer->pendingFields(); | ||
| QgsFieldMap::const_iterator fieldIt = layerFieldMap.constBegin(); | ||
| for ( ; fieldIt != layerFieldMap.constEnd(); ++fieldIt ) | ||
| { | ||
| mJoinFieldComboBox->addItem( fieldIt.value().name(), fieldIt.key() ); | ||
| } | ||
|
|
||
| //does provider support creation of attribute indices? | ||
| QgsVectorDataProvider* dp = vLayer->dataProvider(); | ||
| if ( dp && ( dp->capabilities() & QgsVectorDataProvider::CreateAttributeIndex ) ) | ||
| { | ||
| mCreateIndexCheckBox->setEnabled( true ); | ||
| } | ||
| else | ||
| { | ||
| mCreateIndexCheckBox->setEnabled( false ); | ||
| mCreateIndexCheckBox->setChecked( false ); | ||
| } | ||
| } |
| @@ -0,0 +1,57 @@ | ||
| /*************************************************************************** | ||
| qgsaddjoindialog.h | ||
| ------------------ | ||
| begin : July 10, 2010 | ||
| copyright : (C) 2010 by Marco Hugentobler | ||
| email : marco dot hugentobler at sourcepole dot ch | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #ifndef QGSADDJOINDIALOG_H | ||
| #define QGSADDJOINDIALOG_H | ||
|
|
||
| #include "ui_qgsaddjoindialogbase.h" | ||
| class QgsVectorLayer; | ||
|
|
||
| class QgsAddJoinDialog: public QDialog, private Ui::QgsAddJoinDialogBase | ||
| { | ||
| Q_OBJECT | ||
| public: | ||
| QgsAddJoinDialog( QgsVectorLayer* layer, QWidget * parent = 0, Qt::WindowFlags f = 0 ); | ||
| ~QgsAddJoinDialog(); | ||
|
|
||
| //retrieve results | ||
|
|
||
| /**Get the id of the layer to join*/ | ||
| QString joinedLayerId() const; | ||
| /**Returns the index of the join field*/ | ||
| int joinField() const; | ||
| /**Returns the name of the join field*/ | ||
| QString joinFieldName() const; | ||
| /**Returns the index of the target field (join-to field)*/ | ||
| int targetField() const; | ||
| /**Returns the name of the target field (join-to field)*/ | ||
| QString targetFieldName() const; | ||
| /**True if joined layer should be cached in virtual memory*/ | ||
| bool cacheInMemory() const; | ||
| /**Returns true if user wants to create an attribute index on the join field*/ | ||
| bool createAttributeIndex() const; | ||
|
|
||
| private slots: | ||
| void on_mJoinLayerComboBox_currentIndexChanged( int index ); | ||
|
|
||
| private: | ||
| /**Target layer*/ | ||
| QgsVectorLayer* mLayer; | ||
| }; | ||
|
|
||
|
|
||
| #endif // QGSADDJOINDIALOG_H |
Oops, something went wrong.