Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[GRASS] add auto relation between column and layer option (disabled)
  • Loading branch information
blazek committed Aug 24, 2015
1 parent 5807875 commit d909597
Show file tree
Hide file tree
Showing 7 changed files with 2,705 additions and 2,502 deletions.
2 changes: 2 additions & 0 deletions src/plugins/grass/CMakeLists.txt
Expand Up @@ -26,6 +26,7 @@ SET (GRASS_PLUGIN_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmapcalc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmodule.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleoptions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleparam.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassnewmapset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassattributes.cpp
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassregion.cpp
Expand Down Expand Up @@ -53,6 +54,7 @@ SET (GRASS_PLUGIN_MOC_HDRS
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmapcalc.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmodule.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleoptions.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassmoduleparam.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassnewmapset.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassattributes.h
${CMAKE_CURRENT_SOURCE_DIR}/qgsgrassregion.h
Expand Down
25 changes: 0 additions & 25 deletions src/plugins/grass/qgsgrassmodule.cpp
Expand Up @@ -1036,31 +1036,6 @@ QString QgsGrassModule::translate( QString msg )
return QString::fromUtf8( G_gettext( "grassmods", msg.trimmed().toUtf8() ) );
}

QDomNode QgsGrassModule::nodeByKey( QDomElement elem, QString key )
{
QgsDebugMsg( "called with key=" + key );
QDomNode n = elem.firstChild();

while ( !n.isNull() )
{
QDomElement e = n.toElement();

if ( !e.isNull() )
{
if ( e.tagName() == "parameter" || e.tagName() == "flag" )
{
if ( e.attribute( "name" ) == key )
{
return n;
}
}
}
n = n.nextSibling();
}

return QDomNode();
}

QString QgsGrassModule::libraryPathVariable()
{
#ifdef Q_OS_WIN
Expand Down
3 changes: 0 additions & 3 deletions src/plugins/grass/qgsgrassmodule.h
Expand Up @@ -67,9 +67,6 @@ class QgsGrassModule : public QDialog, private Ui::QgsGrassModuleBase
*/
static QPixmap pixmap( QString path, int height );

//! Find element in GRASS module description by key, if not found, returned element is null
static QDomNode nodeByKey( QDomElement gDocElem, QString key );

//! Returns pointer to QGIS interface
QgisInterface *qgisIface();

Expand Down

0 comments on commit d909597

Please sign in to comment.