File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -975,6 +975,7 @@ QStringList QgsGrassModuleInput::currentLayerCodes()
975
975
{
976
976
Q_FOREACH ( QString type, currentGeometryTypeNames () )
977
977
{
978
+ type.replace ( " area" , " polygon" );
978
979
list << QString ( " %1_%2" ).arg ( currentLayer ()->number () ).arg ( type );
979
980
}
980
981
}
@@ -1015,7 +1016,8 @@ void QgsGrassModuleInput::onChanged( const QString & text )
1015
1016
foreach ( QgsGrassVectorLayer *layer, mVector ->layers () )
1016
1017
{
1017
1018
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 )
1019
1021
{
1020
1022
mLayers .append ( layer );
1021
1023
}
Original file line number Diff line number Diff line change @@ -1197,7 +1197,6 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
1197
1197
1198
1198
QDomNode promptNode = gnode.namedItem ( " gisprompt" );
1199
1199
QDomElement promptElem = promptNode.toElement ();
1200
- QString element = promptElem.attribute ( " element" );
1201
1200
1202
1201
mLayerId = qdesc.attribute ( " layerid" );
1203
1202
@@ -1213,11 +1212,9 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
1213
1212
1214
1213
QHBoxLayout *l = new QHBoxLayout ( this );
1215
1214
mLineEdit = new QLineEdit ( this );
1216
- // mLineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
1217
1215
l->addWidget ( mLineEdit );
1218
1216
1219
1217
mModeComboBox = new QComboBox ( this );
1220
- // mComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
1221
1218
mModeComboBox ->setSizeAdjustPolicy ( QComboBox::AdjustToContents );
1222
1219
mModeComboBox ->addItem ( tr ( " Manual entry" ), Manual );
1223
1220
connect ( mModeComboBox , SIGNAL ( currentIndexChanged ( int ) ), SLOT ( onModeChanged () ) );
You can’t perform that action at this time.
0 commit comments