[GRASS] check if there is input vector for G_OPT_DB_COLUMN

blazek · blazek · commit 7ac8f41bd258 · 2015-09-03T11:04:37.000+02:00
diff --git a/src/plugins/grass/qgsgrassmoduleoptions.cpp b/src/plugins/grass/qgsgrassmoduleoptions.cpp
@@ -219,7 +219,14 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
 
           if ( promptElem.attribute( "prompt" ) == "dbcolumn" )
           {
-            mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );
+            // G_OPT_DB_COLUMN may be also used for new columns (v.in.db) so we check also if there is at least one input vector
+            // but a vector input may also exist (v.random).
+            QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );
+            QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );
+            if ( !vectorNodes.isEmpty() )
+            {
+              mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );
+            }
           }
         }
       }
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -124,7 +124,7 @@ QStringList QgsGrassModuleParam::options()
   return QStringList();
 }
 
-QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement )
+QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement, const QString & name )
 {
   QDomNode gispromptNode = descDomElement.namedItem( "gisprompt" );
 
@@ -133,7 +133,7 @@ QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement )
     QDomElement gispromptElement = gispromptNode.toElement();
     if ( !gispromptElement.isNull() )
     {
-      return gispromptElement.attribute( "prompt" );
+      return gispromptElement.attribute( name );
     }
   }
   return QString();
@@ -164,7 +164,7 @@ QDomNode QgsGrassModuleParam::nodeByKey( QDomElement descDomElement, QString key
   return QDomNode();
 }
 
-QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, STD_OPT optionType )
+QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, STD_OPT optionType, const QString & age )
 {
   // TODO: never tested
   QList<QDomNode> nodes;
@@ -182,15 +182,19 @@ QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, ST
   typeMap.insert( "dbname", G_OPT_DB_DATABASE );
   typeMap.insert( "dbcolumn", G_OPT_DB_COLUMN );
 #endif
+  typeMap.insert( "vector", G_OPT_V_INPUT );
 
   QDomNode n = descDomElement.firstChild();
 
   while ( !n.isNull() )
   {
-    QString prompt = getDescPrompt( n.toElement() );
+    QString prompt = getDescPrompt( n.toElement(), "prompt" );
     if ( typeMap.value( prompt ) == optionType )
     {
-      nodes << n;
+      if ( age.isEmpty() || getDescPrompt( n.toElement(), "age" ) == age )
+      {
+        nodes << n;
+      }
     }
 
     n = n.nextSibling();
diff --git a/src/plugins/grass/qgsgrassmoduleparam.h b/src/plugins/grass/qgsgrassmoduleparam.h
@@ -110,15 +110,17 @@ class QgsGrassModuleParam
 
     QStringList errors() { return mErrors; }
 
-    /** Get gisprompt tag prompt attribute */
-    static QString getDescPrompt( QDomElement descDomElement );
+    /** Get gisprompt attribute
+     * @paream name gisprompt tag attribute name (age, element, prompt)
+     */
+    static QString getDescPrompt( QDomElement descDomElement, const QString & name );
 
     //! Find element in GRASS module description by key, if not found, returned element is null
     static QDomNode nodeByKey( QDomElement descDocElement, QString key );
 
     /** Find list of elements in GRASS module description by option type.
      *  Option type is identified by gisprompt prompt. Only few types are supported */
-    static QList<QDomNode> nodesByType( QDomElement descDomElement, STD_OPT optionType );
+    static QList<QDomNode> nodesByType( QDomElement descDomElement, STD_OPT optionType, const QString & age = QString() );
 
   protected:
 
@@ -538,7 +540,7 @@ class QgsGrassModuleField : public QgsGrassModuleGroupBoxItem
     // ! Field type (integer,double,string,datetime)
     QString mType;
 
-    //! Combobox for QGIS layer fields
+    //! Combobox for QGIS layer fieldsnviz
     QComboBox *mFieldComboBox;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,14 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(`
`219`	`219`
`220`	`220`	`if ( promptElem.attribute( "prompt" ) == "dbcolumn" )`
`221`	`221`	`{`
`222`		`- mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );`
	`222`	`+ // G_OPT_DB_COLUMN may be also used for new columns (v.in.db) so we check also if there is at least one input vector`
	`223`	`+ // but a vector input may also exist (v.random).`
	`224`	`+ QList<QDomNode> vectorNodes = QgsGrassModuleParam::nodesByType( descDocElem, G_OPT_V_INPUT, "old" );`
	`225`	`+ QgsDebugMsg( QString( "vectorNodes.size() = %1" ).arg( vectorNodes.size() ) );`
	`226`	`+ if ( !vectorNodes.isEmpty() )`
	`227`	`+ {`
	`228`	`+ mErrors << tr( "Option '%1' should be configured as field" ).arg( so->key() );`
	`229`	`+ }`
`223`	`230`	`}`
`224`	`231`	`}`
`225`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ QStringList QgsGrassModuleParam::options()`
`124`	`124`	`return QStringList();`
`125`	`125`	`}`
`126`	`126`
`127`		`-QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement )`
	`127`	`+QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement, const QString & name )`
`128`	`128`	`{`
`129`	`129`	`QDomNode gispromptNode = descDomElement.namedItem( "gisprompt" );`
`130`	`130`
`@@ -133,7 +133,7 @@ QString QgsGrassModuleParam::getDescPrompt( QDomElement descDomElement )`
`133`	`133`	`QDomElement gispromptElement = gispromptNode.toElement();`
`134`	`134`	`if ( !gispromptElement.isNull() )`
`135`	`135`	`{`
`136`		`- return gispromptElement.attribute( "prompt" );`
	`136`	`+ return gispromptElement.attribute( name );`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`return QString();`
`@@ -164,7 +164,7 @@ QDomNode QgsGrassModuleParam::nodeByKey( QDomElement descDomElement, QString key`
`164`	`164`	`return QDomNode();`
`165`	`165`	`}`
`166`	`166`
`167`		`-QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, STD_OPT optionType )`
	`167`	`+QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, STD_OPT optionType, const QString & age )`
`168`	`168`	`{`
`169`	`169`	`// TODO: never tested`
`170`	`170`	`QList<QDomNode> nodes;`
`@@ -182,15 +182,19 @@ QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, ST`
`182`	`182`	`typeMap.insert( "dbname", G_OPT_DB_DATABASE );`
`183`	`183`	`typeMap.insert( "dbcolumn", G_OPT_DB_COLUMN );`
`184`	`184`	`#endif`
	`185`	`+ typeMap.insert( "vector", G_OPT_V_INPUT );`
`185`	`186`
`186`	`187`	`QDomNode n = descDomElement.firstChild();`
`187`	`188`
`188`	`189`	`while ( !n.isNull() )`
`189`	`190`	`{`
`190`		`- QString prompt = getDescPrompt( n.toElement() );`
	`191`	`+ QString prompt = getDescPrompt( n.toElement(), "prompt" );`
`191`	`192`	`if ( typeMap.value( prompt ) == optionType )`
`192`	`193`	`{`
`193`		`- nodes << n;`
	`194`	`+ if ( age.isEmpty() \|\| getDescPrompt( n.toElement(), "age" ) == age )`
	`195`	`+ {`
	`196`	`+ nodes << n;`
	`197`	`+ }`
`194`	`198`	`}`
`195`	`199`
`196`	`200`	`n = n.nextSibling();`