Skip to content

Commit ddecc6f

Browse files
committedSep 26, 2015
[GRASS] fixed interactive cat input selection for polygons
1 parent 9df1a08 commit ddecc6f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed
 

‎src/plugins/grass/qgsgrassmoduleinput.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,7 @@ QStringList QgsGrassModuleInput::currentLayerCodes()
975975
{
976976
Q_FOREACH ( QString type, currentGeometryTypeNames() )
977977
{
978+
type.replace( "area", "polygon" );
978979
list << QString( "%1_%2" ).arg( currentLayer()->number() ).arg( type );
979980
}
980981
}
@@ -1015,7 +1016,8 @@ void QgsGrassModuleInput::onChanged( const QString & text )
10151016
foreach ( QgsGrassVectorLayer *layer, mVector->layers() )
10161017
{
10171018
QgsDebugMsg( QString( "layer->number() = %1 layer.type() = %2 mGeometryTypeMask = %3" ).arg( layer->number() ).arg( layer->type() ).arg( mGeometryTypeMask ) );
1018-
if ( layer->type() & mGeometryTypeMask )
1019+
// TODO: does it make sense to add layer 0, i.e. no layer?
1020+
if ( layer->number() > 0 && layer->type() & mGeometryTypeMask )
10191021
{
10201022
mLayers.append( layer );
10211023
}

‎src/plugins/grass/qgsgrassmoduleparam.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,6 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
11971197

11981198
QDomNode promptNode = gnode.namedItem( "gisprompt" );
11991199
QDomElement promptElem = promptNode.toElement();
1200-
QString element = promptElem.attribute( "element" );
12011200

12021201
mLayerId = qdesc.attribute( "layerid" );
12031202

@@ -1213,11 +1212,9 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
12131212

12141213
QHBoxLayout *l = new QHBoxLayout( this );
12151214
mLineEdit = new QLineEdit( this );
1216-
//mLineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
12171215
l->addWidget( mLineEdit );
12181216

12191217
mModeComboBox = new QComboBox( this );
1220-
//mComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
12211218
mModeComboBox->setSizeAdjustPolicy( QComboBox::AdjustToContents );
12221219
mModeComboBox->addItem( tr( "Manual entry" ), Manual );
12231220
connect( mModeComboBox, SIGNAL( currentIndexChanged( int ) ), SLOT( onModeChanged() ) );

0 commit comments

Comments
 (0)
Please sign in to comment.