Skip to content

Commit 3d7b6fb

Browse files
committedSep 10, 2015
[GRASS] removed multiple input sorting
1 parent a44bfb2 commit 3d7b6fb

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed
 

‎src/plugins/grass/qgsgrassmoduleinput.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@ QgsGrassModuleInputComboBox::QgsGrassModuleInputComboBox( QgsGrassObject::Type t
456456
QCompleter *completer = new QgsGrassModuleInputCompleter( completerProxy, this );
457457
completer->setCompletionRole( Qt::DisplayRole );
458458
completer->setCaseSensitivity( Qt::CaseInsensitive );
459+
// TODO: enable when Qt version requirement gets over 5.2
460+
//setFilterMode( Qt::MatchWildcard );
459461
completer->setCompletionMode( QCompleter::PopupCompletion );
460462
completer->setMaxVisibleItems( 20 );
461463
// TODO: set custom treeview for completer popup to show items in tree structure, if feasible
@@ -636,7 +638,6 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
636638
, mModuleStandardOptions( options )
637639
, mModel( 0 )
638640
, mSelectedModel( 0 )
639-
, mSelectedProxy( 0 )
640641
, mComboBox( 0 )
641642
, mRegionButton( 0 )
642643
, mLayerLabel( 0 )
@@ -792,10 +793,8 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,
792793
if ( multiple() )
793794
{
794795
mSelectedModel = new QStandardItemModel( 0, 2 );
795-
mSelectedProxy = new QSortFilterProxyModel( this );
796-
mSelectedProxy->setSourceModel( mSelectedModel );
797796
mSelectedTreeView = new QgsGrassModuleInputSelectedView( this );
798-
mSelectedTreeView->setModel( mSelectedProxy );
797+
mSelectedTreeView->setModel( mSelectedModel );
799798
connect( mSelectedTreeView, SIGNAL( deleteItem( const QModelIndex & ) ), this, SLOT( deleteSelectedItem( const QModelIndex & ) ) );
800799
layout->addWidget( mSelectedTreeView );
801800
}
@@ -1154,10 +1153,9 @@ void QgsGrassModuleInput::onActivated( const QString & text )
11541153
void QgsGrassModuleInput::deleteSelectedItem( const QModelIndex &index )
11551154
{
11561155
QgsDebugMsg( "entered" );
1157-
QModelIndex sourceIndex = mSelectedProxy->mapToSource( index );
1158-
if ( sourceIndex.isValid() )
1156+
if ( index.isValid() )
11591157
{
1160-
mSelectedModel->removeRow( sourceIndex.row() );
1158+
mSelectedModel->removeRow( index.row() );
11611159
emit valueChanged();
11621160
}
11631161
}

‎src/plugins/grass/qgsgrassmoduleinput.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ class QgsGrassModuleInput : public QgsGrassModuleGroupBoxItem
301301
//! Model containing currently selected maps
302302
QStandardItemModel *mSelectedModel;
303303

304-
QSortFilterProxyModel *mSelectedProxy;
305-
306304
//! Combo box with GRASS layers
307305
QgsGrassModuleInputComboBox *mComboBox;
308306

0 commit comments

Comments
 (0)
Please sign in to comment.