Skip to content

Commit d909597

Browse files
committed
[GRASS] add auto relation between column and layer option (disabled)
1 parent 5807875 commit d909597

File tree

7 files changed

+2705
-2502
lines changed

7 files changed

+2705
-2502
lines changed

src/plugins/grass/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ SET (GRASS_PLUGIN_SRCS
2626
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmapcalc.cpp
2727
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmodule.cpp
2828
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleoptions.cpp
29+
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleparam.cpp
2930
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassnewmapset.cpp
3031
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassattributes.cpp
3132
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassregion.cpp
@@ -53,6 +54,7 @@ SET (GRASS_PLUGIN_MOC_HDRS
5354
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmapcalc.h
5455
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmodule.h
5556
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleoptions.h
57+
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleparam.h
5658
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassnewmapset.h
5759
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassattributes.h
5860
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassregion.h

src/plugins/grass/qgsgrassmodule.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,31 +1036,6 @@ QString QgsGrassModule::translate( QString msg )
10361036
return QString::fromUtf8( G_gettext( "grassmods", msg.trimmed().toUtf8() ) );
10371037
}
10381038

1039-
QDomNode QgsGrassModule::nodeByKey( QDomElement elem, QString key )
1040-
{
1041-
QgsDebugMsg( "called with key=" + key );
1042-
QDomNode n = elem.firstChild();
1043-
1044-
while ( !n.isNull() )
1045-
{
1046-
QDomElement e = n.toElement();
1047-
1048-
if ( !e.isNull() )
1049-
{
1050-
if ( e.tagName() == "parameter" || e.tagName() == "flag" )
1051-
{
1052-
if ( e.attribute( "name" ) == key )
1053-
{
1054-
return n;
1055-
}
1056-
}
1057-
}
1058-
n = n.nextSibling();
1059-
}
1060-
1061-
return QDomNode();
1062-
}
1063-
10641039
QString QgsGrassModule::libraryPathVariable()
10651040
{
10661041
#ifdef Q_OS_WIN

src/plugins/grass/qgsgrassmodule.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ class QgsGrassModule : public QDialog, private Ui::QgsGrassModuleBase
6767
*/
6868
static QPixmap pixmap( QString path, int height );
6969

70-
//! Find element in GRASS module description by key, if not found, returned element is null
71-
static QDomNode nodeByKey( QDomElement gDocElem, QString key );
72-
7370
//! Returns pointer to QGIS interface
7471
QgisInterface *qgisIface();
7572

0 commit comments

Comments
 (0)