[GRASS] use plain text for r/.proj, fixes partially #2575

blazek · blazek · commit 8af571ae06e4 · 2016-02-15T10:05:48.000+01:00
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
@@ -350,7 +350,7 @@
                 <grass name="v.extrude.fixed"/>
                 <grass name="v.extrude.attr"/>
             </section>
-            <section label="Reproject vector from another Location">
+            <section label="Transform or reproject vector from another Location">
                 <grass name="v.transform"/>
                 <grass name="v.proj"/>
             </section>
diff --git a/src/plugins/grass/modules/r.proj.qgm b/src/plugins/grass/modules/r.proj.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Re-project raster from a location to the current location" module="r.proj">
-	<option key="input" />
-	<option key="mapset"/>
 	<option key="location"/>
+	<option key="mapset"/>
+	<option key="input" widget="text" />
 	<option key="method" />
 	<option key="resolution" />
 	<option key="output" label="Name for the output raster map (optional)"/>
-        <option key="dbase" label="Path to GRASS database of input location (optional)"/> 
+	<option key="dbase" label="Path to GRASS database of input location (optional)"/> 
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.proj.qgm b/src/plugins/grass/modules/v.proj.qgm
@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Projection conversion of vector" module="v.proj">
-	<option key="input" />
-	<option key="mapset" />
 	<option key="location" />
+	<option key="mapset" />
+	<option key="input" widget="text" />
 	<option key="output" label="Name for output vector map (optional)" />
-        <option key="dbase" label="Path to GRASS database of input location (optional)" /> 
+	<option key="dbase" label="Path to GRASS database of input location (optional)" /> 
 </qgisgrassmodule>
diff --git a/src/plugins/grass/qgsgrassmoduleoptions.cpp b/src/plugins/grass/qgsgrassmoduleoptions.cpp
@@ -200,10 +200,12 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
         {
           QString element = promptElem.attribute( "element" );
           QString age = promptElem.attribute( "age" );
+
           //QgsDebugMsg("element = " + element + " age = " + age);
           if ( age == "old" && ( element == "vector" || element == "cell" ||
                                  element == "strds" || element == "stvds" ||
-                                 element == "str3ds" || element == "stds" ) )
+                                 element == "str3ds" || element == "stds" )
+               &&  confDomElement.attribute( "widget" ) != "text" )
           {
             QgsGrassModuleInput *mi = new QgsGrassModuleInput(
               mModule, this, key, confDomElement, descDocElem, gnode, mDirect, this );

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,12 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(`
`200`	`200`	`{`
`201`	`201`	`QString element = promptElem.attribute( "element" );`
`202`	`202`	`QString age = promptElem.attribute( "age" );`
	`203`	`+`
`203`	`204`	`//QgsDebugMsg("element = " + element + " age = " + age);`
`204`	`205`	`if ( age == "old" && ( element == "vector" \|\| element == "cell" \|\|`
`205`	`206`	`element == "strds" \|\| element == "stvds" \|\|`
`206`		`- element == "str3ds" \|\| element == "stds" ) )`
	`207`	`+ element == "str3ds" \|\| element == "stds" )`
	`208`	`+ && confDomElement.attribute( "widget" ) != "text" )`
`207`	`209`	`{`
`208`	`210`	`QgsGrassModuleInput *mi = new QgsGrassModuleInput(`
`209`	`211`	`mModule, this, key, confDomElement, descDocElem, gnode, mDirect, this );`