Skip to content

Commit

Permalink
Merge pull request #7735 from 3nids/snap3
Browse files Browse the repository at this point in the history 
add layer filter in snapping configuration
  • Loading branch information
@3nids
3nids committed Aug 31, 2018
2 parents c3fd631 + 04e7c7a commit 6917860
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 17 deletions.
30 changes: 21 additions & 9 deletions src/app/qgssnappinglayertreemodel.cpp
View file
Expand Up @@ -53,7 +53,7 @@ QWidget *QgsSnappingLayerDelegate::createEditor( QWidget *parent, const QStyleOp
QVariant val = index.model()->data( index.model()->sibling( index.row(), QgsSnappingLayerTreeModel::UnitsColumn, index ), Qt::UserRole );
if ( val.isValid() )
{
QgsTolerance::UnitType units = ( QgsTolerance::UnitType )val.toInt();
QgsTolerance::UnitType units = static_cast<QgsTolerance::UnitType>( val.toInt() );
if ( units == QgsTolerance::Pixels )
{
w->setDecimals( 0 );
Expand Down Expand Up @@ -90,7 +90,7 @@ void QgsSnappingLayerDelegate::setEditorData( QWidget *editor, const QModelIndex

if ( index.column() == QgsSnappingLayerTreeModel::TypeColumn )
{
QgsSnappingConfig::SnappingType type = ( QgsSnappingConfig::SnappingType )val.toInt();
QgsSnappingConfig::SnappingType type = static_cast<QgsSnappingConfig::SnappingType>( val.toInt() );
QComboBox *cb = qobject_cast<QComboBox *>( editor );
if ( cb )
{
Expand All @@ -107,7 +107,7 @@ void QgsSnappingLayerDelegate::setEditorData( QWidget *editor, const QModelIndex
}
else if ( index.column() == QgsSnappingLayerTreeModel::UnitsColumn )
{
QgsTolerance::UnitType units = ( QgsTolerance::UnitType )val.toInt();
QgsTolerance::UnitType units = static_cast<QgsTolerance::UnitType>( val.toInt() );
QComboBox *w = qobject_cast<QComboBox *>( editor );
if ( w )
{
Expand Down Expand Up @@ -229,6 +229,15 @@ QgsVectorLayer *QgsSnappingLayerTreeModel::vectorLayer( const QModelIndex &idx )
return qobject_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( node )->layer() );
}

void QgsSnappingLayerTreeModel::setFilterText( const QString &filterText )
{
if ( filterText == mFilterText )
return;

mFilterText = filterText;
invalidateFilter();
}

void QgsSnappingLayerTreeModel::onSnappingSettingsChanged()
{
const QHash<QgsVectorLayer *, QgsSnappingConfig::IndividualLayerSettings> oldSettings = mIndividualLayerSettings;
Expand Down Expand Up @@ -317,7 +326,7 @@ bool QgsSnappingLayerTreeModel::nodeShown( QgsLayerTreeNode *node ) const
else
{
QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( node )->layer() );
return layer && layer->isSpatial();
return layer && layer->isSpatial() && ( mFilterText.isEmpty() || layer->name().contains( mFilterText, Qt::CaseInsensitive ) );
}
}

Expand Down Expand Up @@ -441,8 +450,6 @@ QVariant QgsSnappingLayerTreeModel::data( const QModelIndex &idx, int role ) con
return tr( "vertex and segment" );
case QgsSnappingConfig::Segment:
return tr( "segment" );
default:
return tr( "N/A" );
}
}

Expand Down Expand Up @@ -537,12 +544,13 @@ bool QgsSnappingLayerTreeModel::setData( const QModelIndex &index, const QVarian
else if ( value.toInt() == Qt::Unchecked )
ls.setEnabled( false );
else
Q_ASSERT( "expected checked or unchecked" );
Q_ASSERT( false ); // expected checked or unchecked

QgsSnappingConfig config = mProject->snappingConfig();
config.setIndividualLayerSettings( vl, ls );
mProject->setSnappingConfig( config );
}
emit dataChanged( index, index );
return true;
}

Expand All @@ -561,10 +569,11 @@ bool QgsSnappingLayerTreeModel::setData( const QModelIndex &index, const QVarian
if ( !ls.valid() )
return false;

ls.setType( ( QgsSnappingConfig::SnappingType )value.toInt() );
ls.setType( static_cast<QgsSnappingConfig::SnappingType>( value.toInt() ) );
QgsSnappingConfig config = mProject->snappingConfig();
config.setIndividualLayerSettings( vl, ls );
mProject->setSnappingConfig( config );
emit dataChanged( index, index );
return true;
}
}
Expand All @@ -585,6 +594,7 @@ bool QgsSnappingLayerTreeModel::setData( const QModelIndex &index, const QVarian
QgsSnappingConfig config = mProject->snappingConfig();
config.setIndividualLayerSettings( vl, ls );
mProject->setSnappingConfig( config );
emit dataChanged( index, index );
return true;
}
}
Expand All @@ -601,10 +611,11 @@ bool QgsSnappingLayerTreeModel::setData( const QModelIndex &index, const QVarian
if ( !ls.valid() )
return false;

ls.setUnits( ( QgsTolerance::UnitType )value.toInt() );
ls.setUnits( static_cast<QgsTolerance::UnitType>( value.toInt() ) );
QgsSnappingConfig config = mProject->snappingConfig();
config.setIndividualLayerSettings( vl, ls );
mProject->setSnappingConfig( config );
emit dataChanged( index, index );
return true;
}
}
Expand All @@ -625,6 +636,7 @@ bool QgsSnappingLayerTreeModel::setData( const QModelIndex &index, const QVarian
avoidIntersectionsList.removeAll( vl );

mProject->setAvoidIntersectionsLayers( avoidIntersectionsList );
emit dataChanged( index, index );
return true;
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgssnappinglayertreemodel.h
View file
Expand Up @@ -76,6 +76,9 @@ class APP_EXPORT QgsSnappingLayerTreeModel : public QSortFilterProxyModel

QgsVectorLayer *vectorLayer( const QModelIndex &idx ) const;

public slots:
void setFilterText( const QString &filterText = QString() );

protected:
bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const override;

Expand All @@ -86,6 +89,7 @@ class APP_EXPORT QgsSnappingLayerTreeModel : public QSortFilterProxyModel
bool nodeShown( QgsLayerTreeNode *node ) const;

QgsProject *mProject = nullptr;
QString mFilterText;
QHash<QgsVectorLayer *, QgsSnappingConfig::IndividualLayerSettings> mIndividualLayerSettings;
QgsLayerTreeModel *mLayerTreeModel = nullptr;

Expand Down
35 changes: 27 additions & 8 deletions src/app/qgssnappingwidget.cpp
View file
Expand Up @@ -62,6 +62,11 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
}

// Advanced config layer tree view
mAdvancedConfigWidget = new QWidget( this );
QVBoxLayout *advancedLayout = new QVBoxLayout();
if ( mDisplayMode == Widget )
advancedLayout->setContentsMargins( 0, 0, 0, 0 );
// tree view
mLayerTreeView = new QTreeView();
QgsSnappingLayerTreeModel *model = new QgsSnappingLayerTreeModel( mProject, this );
model->setLayerTreeModel( new QgsLayerTreeModel( mProject->layerTreeRoot(), model ) );
Expand All @@ -82,6 +87,20 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
mLayerTreeView->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding );
mLayerTreeView->setMinimumWidth( 500 );
mLayerTreeView->resizeColumnToContents( 0 );
// filter line edit
QHBoxLayout *filterLayout = new QHBoxLayout();
filterLayout->setContentsMargins( 0, 0, 0, 0 );
filterLayout->addStretch();
QgsFilterLineEdit *filterLineEdit = new QgsFilterLineEdit();
filterLineEdit->setShowClearButton( true );
filterLineEdit->setShowSearchIcon( true );
filterLineEdit->setPlaceholderText( tr( "Filter layers…" ) );
connect( filterLineEdit, &QgsFilterLineEdit::textChanged, model, &QgsSnappingLayerTreeModel::setFilterText );
filterLayout->addStretch();
filterLayout->addWidget( filterLineEdit );
advancedLayout->addWidget( mLayerTreeView );
advancedLayout->addLayout( filterLayout );
mAdvancedConfigWidget->setLayout( advancedLayout );

// enable button
mEnabledAction = new QAction( tr( "Toggle Snapping" ), this );
Expand Down Expand Up @@ -206,7 +225,7 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
advConfigButton->setPopupMode( QToolButton::InstantPopup );
QMenu *advConfigMenu = new QMenu( this );
QWidgetAction *advConfigWidgetAction = new QWidgetAction( advConfigMenu );
advConfigWidgetAction->setDefaultWidget( mLayerTreeView );
advConfigWidgetAction->setDefaultWidget( mAdvancedConfigWidget );
advConfigMenu->addAction( advConfigWidgetAction );
advConfigButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.svg" ) ) );
advConfigButton->setToolTip( tr( "Edit advanced configuration" ) );
Expand Down Expand Up @@ -255,7 +274,7 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,

QGridLayout *topLayout = new QGridLayout();
topLayout->addLayout( layout, 0, 0, Qt::AlignLeft | Qt::AlignTop );
topLayout->addWidget( mLayerTreeView, 1, 0 );
topLayout->addWidget( mAdvancedConfigWidget, 1, 0 );
setLayout( topLayout );
}

Expand Down Expand Up @@ -333,7 +352,7 @@ void QgsSnappingWidget::projectSnapSettingsChanged()
mToleranceSpinBox->setValue( config.tolerance() );
}

if ( ( QgsTolerance::UnitType )mUnitsComboBox->currentData().toInt() != config.units() )
if ( static_cast<QgsTolerance::UnitType>( mUnitsComboBox->currentData().toInt() ) != config.units() )
{
mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData( config.units() ) );
}
Expand Down Expand Up @@ -367,9 +386,9 @@ void QgsSnappingWidget::toggleSnappingWidgets( bool enabled )
mTypeButton->setEnabled( enabled );
mToleranceSpinBox->setEnabled( enabled );
mUnitsComboBox->setEnabled( enabled );
if ( mLayerTreeView )
if ( mAdvancedConfigWidget )
{
mLayerTreeView->setEnabled( enabled );
mAdvancedConfigWidget->setEnabled( enabled );
}
mIntersectionSnappingAction->setEnabled( enabled );
mEnableTracingAction->setEnabled( enabled );
Expand All @@ -383,7 +402,7 @@ void QgsSnappingWidget::changeTolerance( double tolerance )

void QgsSnappingWidget::changeUnit( int idx )
{
QgsTolerance::UnitType unit = ( QgsTolerance::UnitType )mUnitsComboBox->itemData( idx ).toInt();
QgsTolerance::UnitType unit = static_cast<QgsTolerance::UnitType>( mUnitsComboBox->itemData( idx ).toInt() );
mConfig.setUnits( unit );
mProject->setSnappingConfig( mConfig );

Expand Down Expand Up @@ -495,9 +514,9 @@ void QgsSnappingWidget::modeChanged()
mTypeButton->setVisible( !advanced );
mToleranceSpinBox->setVisible( !advanced );
mUnitsComboBox->setVisible( !advanced );
if ( mDisplayMode == Widget && mLayerTreeView )
if ( mDisplayMode == Widget && mAdvancedConfigWidget )
{
mLayerTreeView->setVisible( advanced );
mAdvancedConfigWidget->setVisible( advanced );
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/app/qgssnappingwidget.h
View file
Expand Up @@ -150,6 +150,7 @@ class APP_EXPORT QgsSnappingWidget : public QWidget
QAction *mEnableTracingAction = nullptr;
QgsDoubleSpinBox *mTracingOffsetSpinBox = nullptr;
QTreeView *mLayerTreeView = nullptr;
QWidget *mAdvancedConfigWidget = nullptr;
QgsFloatingWidget *mAdvancedConfigContainer = nullptr;

void cleanGroup( QgsLayerTreeNode *node );
Expand Down

0 comments on commit 6917860

Please sign in to comment.