[GRASS] fixed interactive cat input selection for polygons

blazek · blazek · commit ddecc6f5d8e6 · 2015-09-26T16:09:19.000+02:00
diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
@@ -975,6 +975,7 @@ QStringList QgsGrassModuleInput::currentLayerCodes()
   {
     Q_FOREACH ( QString type, currentGeometryTypeNames() )
     {
+      type.replace( "area", "polygon" );
       list << QString( "%1_%2" ).arg( currentLayer()->number() ).arg( type );
     }
   }
@@ -1015,7 +1016,8 @@ void QgsGrassModuleInput::onChanged( const QString & text )
         foreach ( QgsGrassVectorLayer *layer, mVector->layers() )
         {
           QgsDebugMsg( QString( "layer->number() = %1 layer.type() = %2 mGeometryTypeMask = %3" ).arg( layer->number() ).arg( layer->type() ).arg( mGeometryTypeMask ) );
-          if ( layer->type() & mGeometryTypeMask )
+          // TODO: does it make sense to add layer 0, i.e. no layer?
+          if ( layer->number() > 0 && layer->type() & mGeometryTypeMask )
           {
             mLayers.append( layer );
           }
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -1197,7 +1197,6 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
 
   QDomNode promptNode = gnode.namedItem( "gisprompt" );
   QDomElement promptElem = promptNode.toElement();
-  QString element = promptElem.attribute( "element" );
 
   mLayerId = qdesc.attribute( "layerid" );
 
@@ -1213,11 +1212,9 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
 
   QHBoxLayout *l = new QHBoxLayout( this );
   mLineEdit = new QLineEdit( this );
-//mLineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
   l->addWidget( mLineEdit );
 
   mModeComboBox = new QComboBox( this );
-  //mComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
   mModeComboBox->setSizeAdjustPolicy( QComboBox::AdjustToContents );
   mModeComboBox->addItem( tr( "Manual entry" ), Manual );
   connect( mModeComboBox, SIGNAL( currentIndexChanged( int ) ), SLOT( onModeChanged() ) );

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`	`}`