sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

grass support for qbrowser

Browse Source
This commit is contained in:
Radim Blazek 2011-05-22 16:29:25 +02:00
parent b02d06ba73
commit 9784cd78e5
17 changed files with 282 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/images.qrc
View File

@ -13,6 +13,8 @@
<file>themes/default/geographic.png</file>
<file>themes/default/gpsicons/barchart.svg</file>
<file>themes/default/gpsicons/polarchart.svg</file>
<file>themes/default/grass_location.png</file>
<file>themes/default/grass_mapset.png</file>
<file>themes/default/join_bevel.png</file>
<file>themes/default/join_miter.png</file>
<file>themes/default/join_round.png</file>

BIN
images/themes/default/grass_location.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
images/themes/default/grass_mapset.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

6
src/browser/qgsbrowser.cpp
View File

@ -419,7 +419,7 @@ void QgsBrowser::updateCurrentTab()
if (current == Metadata && mDirtyMetadata)
{
if (mLayer)
if (mLayer && mLayer->isValid())
{
// Set meta
QString myStyle = QgsApplication::reportStyleSheet();
@ -436,7 +436,7 @@ void QgsBrowser::updateCurrentTab()
if (current == Preview && mDirtyPreview)
{
if (mLayer)
if (mLayer && mLayer->isValid())
{
// Create preview: add to map canvas
QList<QgsMapCanvasLayer> layers;
@ -452,7 +452,7 @@ void QgsBrowser::updateCurrentTab()
if (current == Attributes && mDirtyAttributes)
{
if ( mLayer && mLayer->type() == QgsMapLayer::VectorLayer )
if ( mLayer && mLayer->isValid() && mLayer->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( mLayer );
QApplication::setOverrideCursor(Qt::WaitCursor);

24
src/core/qgsdataitem.cpp
View File

@ -93,7 +93,7 @@ const QIcon &QgsDataCollectionItem::iconDir()
{
static QIcon icon;
if ( !icon.isNull() )
if ( icon.isNull() )
{
// initialize shared icons
QStyle *style = QApplication::style();
@ -250,6 +250,16 @@ void QgsDataItem::refresh()
}
}
bool QgsDataItem::equal( const QgsDataItem *other )
{
if ( typeid ( this ) == typeid ( other ) &&
mPath == other->path() )
{
return true;
}
return false;
}
// ---------------------------------------------------------------------
QgsLayerItem::QgsLayerItem( QgsDataItem* parent, QString name, QString path, QString uri, LayerType layerType, QString providerKey )
@ -327,9 +337,10 @@ QgsDirectoryItem::QgsDirectoryItem( QgsDataItem* parent, QString name, QString p
}
if ( dataCapabilities() == QgsDataProvider::NoDataCapabilities )
{
QgsDebugMsg( library->fileName() + " does not have File capability" );
QgsDebugMsg( library->fileName() + " has NoDataCapabilities" );
continue;
}
QgsDebugMsg( QString ( "%1 dataCapabilities : %2").arg(library->fileName()).arg(dataCapabilities() ) );
mLibraries.append( library );
}
else
@ -360,10 +371,11 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
children.append( item );
}
QStringList fileEntries = dir.entryList( QDir::Files, QDir::Name );
QStringList fileEntries = dir.entryList( QDir::Dirs|QDir::NoDotAndDotDot|QDir::Files, QDir::Name );
foreach( QString name, fileEntries )
{
QString path = dir.absoluteFilePath( name );
QFileInfo fileInfo ( path );
foreach( QLibrary *library, mLibraries )
{
// we could/should create separate list of providers for each purpose
@ -374,7 +386,11 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
int capabilities = dataCapabilities();
if ( !( capabilities & QgsDataProvider::File ) ) continue;
if ( !( (fileInfo.isFile() && (capabilities & QgsDataProvider::File)) ||
(fileInfo.isDir() && (capabilities & QgsDataProvider::Dir))) )
{
continue;
}
dataItem_t * dataItem = ( dataItem_t * ) cast_to_fptr( library->resolve( "dataItem" ) );
if ( ! dataItem )

2
src/core/qgsdataitem.h
View File

@ -73,7 +73,7 @@ class CORE_EXPORT QgsDataItem : public QObject
// remove and delete child item, signals to browser are emited
virtual void deleteChildItem( QgsDataItem * child );
virtual bool equal( const QgsDataItem *other ) { return false; }
virtual bool equal( const QgsDataItem *other );
virtual QWidget * paramWidget() { return 0; }

2
src/plugins/grass/qgsgrassbrowser.cpp
View File

@ -162,7 +162,7 @@ void QgsGrassBrowser::addMap()
else if ( type == QgsGrassModel::VectorLayer )
{
QStringList list = QgsGrassSelect::vectorLayers(
QStringList list = QgsGrass::vectorLayers(
QgsGrass::getDefaultGisdbase(),
QgsGrass::getDefaultLocation(),
mModel->itemMapset( *it ), map );

2
src/plugins/grass/qgsgrassmodel.cpp
View File

@ -759,7 +759,7 @@ void QgsGrassModel::refreshItem( QgsGrassModelItem *item )
case QgsGrassModel::Vector:
{
QStringList list = QgsGrassSelect::vectorLayers(
QStringList list = QgsGrass::vectorLayers(
QgsGrass::getDefaultGisdbase(),
QgsGrass::getDefaultLocation(),
item->mMapset, item->mMap );

2
src/plugins/grass/qgsgrassmodule.cpp
View File

@ -1593,7 +1593,7 @@ void QgsGrassModule::viewOutput()
{
QString map = mOutputVector.at( i );
QStringList layers = QgsGrassSelect::vectorLayers(
QStringList layers = QgsGrass::vectorLayers(
QgsGrass::getDefaultGisdbase(),
QgsGrass::getDefaultLocation(),
QgsGrass::getDefaultMapset(), map );

96
src/plugins/grass/qgsgrassselect.cpp
View File

@ -323,7 +323,7 @@ void QgsGrassSelect::setLayers()
if ( type != VECTOR ) return;
if ( emap->count() < 1 ) return;
QStringList layers = vectorLayers( egisdbase->text(),
QStringList layers = QgsGrass::vectorLayers( egisdbase->text(),
elocation->currentText(), emapset->currentText(),
emap->currentText().toUtf8() );
@ -369,100 +369,6 @@ void QgsGrassSelect::setLayers()
}
}
QStringList QgsGrassSelect::vectorLayers( QString gisdbase,
QString location, QString mapset, QString mapName )
{
QStringList list;
// Set location
QgsGrass::setLocation( gisdbase, location );
/* Open vector */
QgsGrass::resetError();
//Vect_set_open_level( 2 );
struct Map_info map;
int level = -1;
try
{
level = Vect_open_old_head( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );
}
catch ( QgsGrass::Exception &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
return list;
}
if ( level == 1 )
{
QgsDebugMsg( "Cannot open vector on level 2" );
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module)." ).arg( mapName ).arg( mapset ) );
// Vect_close here is correct, it should work, but it seems to cause
// crash on win http://trac.osgeo.org/qgis/ticket/2003
// disabled on win test it
#if !defined(WIN32)
Vect_close( &map );
#endif
return list;
}
else if ( level < 1 )
{
QgsDebugMsg( "Cannot open vector" );
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2" ).arg( mapName ).arg( mapset ) );
return list;
}
QgsDebugMsg( "GRASS vector successfully opened" );
// Get layers
int ncidx = Vect_cidx_get_num_fields( &map );
for ( int i = 0; i < ncidx; i++ )
{
int field = Vect_cidx_get_field_number( &map, i );
QString fs;
fs.sprintf( "%d", field );
QgsDebugMsg( QString( "i = %1 layer = %2" ).arg( i ).arg( field ) );
/* Points */
int npoints = Vect_cidx_get_type_count( &map, field, GV_POINT );
if ( npoints > 0 )
{
QString l = fs + "_point";
list.append( l );
}
/* Lines */
/* Lines without category appears in layer 0, but not boundaries */
int tp;
if ( field == 0 )
tp = GV_LINE;
else
tp = GV_LINE | GV_BOUNDARY;
int nlines = Vect_cidx_get_type_count( &map, field, tp );
if ( nlines > 0 )
{
QString l = fs + "_line";
list.append( l );
}
/* Polygons */
int nareas = Vect_cidx_get_type_count( &map, field, GV_AREA );
if ( nareas > 0 )
{
QString l = fs + "_polygon";
list.append( l );
}
}
Vect_close( &map );
return list;
}
void QgsGrassSelect::on_GisdbaseBrowse_clicked()
{
QString Gisdbase = QFileDialog::getExistingDirectory( this,

3
src/plugins/grass/qgsgrassselect.h
View File

@ -41,9 +41,6 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
MAPCALC // file in $MAPSET/mapcalc directory (used by QgsGrassMapcalc)
};
//! Get list of vector layer
static QStringList vectorLayers( QString, QString, QString, QString );
QString gisdbase;
QString location;
QString mapset;

2
src/plugins/grass/qgsgrassutils.cpp
View File

@ -36,7 +36,7 @@ QString QgsGrassUtils::vectorLayerName( QString map, QString layer,
void QgsGrassUtils::addVectorLayers( QgisInterface *iface,
QString gisbase, QString location, QString mapset, QString map )
{
QStringList layers = QgsGrassSelect::vectorLayers(
QStringList layers = QgsGrass::vectorLayers(
gisbase, location, mapset, map );

4
src/providers/grass/CMakeLists.txt
View File

@ -3,11 +3,11 @@ ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
########################################################
# Files
SET(GRASS_PROVIDER_SRCS provider.cpp)
SET(GRASS_PROVIDER_SRCS provider.cpp qgsgrassprovider.cpp )
SET(GRASS_RASTER_PROVIDER_SRCS qgsgrassrasterprovider.cpp)
SET(GRASS_LIB_SRCS qgsgrassprovider.cpp qgsgrass.cpp)
SET(GRASS_LIB_SRCS qgsgrass.cpp)
SET(QGIS_D_RAST_SRCS qgis.d.rast.c)

93
src/providers/grass/qgsgrass.cpp
View File

@ -767,6 +767,99 @@ QStringList GRASS_EXPORT QgsGrass::vectors( QString mapsetPath )
}
return list;
}
QStringList GRASS_EXPORT QgsGrass::vectorLayers( QString gisdbase,
QString location, QString mapset, QString mapName )
{
QStringList list;
// Set location
QgsGrass::setLocation( gisdbase, location );
/* Open vector */
QgsGrass::resetError();
//Vect_set_open_level( 2 );
struct Map_info map;
int level = -1;
try
{
level = Vect_open_old_head( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );
}
catch ( QgsGrass::Exception &e )
{
Q_UNUSED( e );
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
return list;
}
if ( level == 1 )
{
QgsDebugMsg( "Cannot open vector on level 2" );
QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module)." ).arg( mapName ).arg( mapset ) );
// Vect_close here is correct, it should work, but it seems to cause
// crash on win http://trac.osgeo.org/qgis/ticket/2003
// disabled on win test it
#if !defined(WIN32)
Vect_close( &map );
#endif
return list;
}
else if ( level < 1 )
{
QgsDebugMsg( "Cannot open vector" );
QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot open vector %1 in mapset %2" ).arg( mapName ).arg( mapset ) );
return list;
}
QgsDebugMsg( "GRASS vector successfully opened" );
// Get layers
int ncidx = Vect_cidx_get_num_fields( &map );
for ( int i = 0; i < ncidx; i++ )
{
int field = Vect_cidx_get_field_number( &map, i );
QString fs;
fs.sprintf( "%d", field );
QgsDebugMsg( QString( "i = %1 layer = %2" ).arg( i ).arg( field ) );
/* Points */
int npoints = Vect_cidx_get_type_count( &map, field, GV_POINT );
if ( npoints > 0 )
{
QString l = fs + "_point";
list.append( l );
}
/* Lines */
/* Lines without category appears in layer 0, but not boundaries */
int tp;
if ( field == 0 )
tp = GV_LINE;
else
tp = GV_LINE | GV_BOUNDARY;
int nlines = Vect_cidx_get_type_count( &map, field, tp );
if ( nlines > 0 )
{
QString l = fs + "_line";
list.append( l );
}
/* Polygons */
int nareas = Vect_cidx_get_type_count( &map, field, GV_AREA );
if ( nareas > 0 )
{
QString l = fs + "_polygon";
list.append( l );
}
}
Vect_close( &map );
return list;
}
QStringList GRASS_EXPORT QgsGrass::rasters( QString gisbase, QString locationName,
QString mapsetName )

3
src/providers/grass/qgsgrass.h
View File

@ -139,6 +139,9 @@ class QgsGrass
QString mapsetName );
static GRASS_EXPORT QStringList rasters( QString mapsetPath );
//! Get list of vector layers
static QStringList vectorLayers( QString, QString, QString, QString );
//! List of elements
static GRASS_EXPORT QStringList elements( QString gisbase, QString locationName,
QString mapsetName, QString element );

125
src/providers/grass/qgsgrassprovider.cpp
View File

@ -27,6 +27,8 @@
#include <QByteArray>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QMessageBox>
#include <QTextCodec>
//#include <QtGui/qwindowdefs.h>
@ -2372,3 +2374,126 @@ QString QgsGrassProvider::description() const
{
return GRASS_DESCRIPTION;
} // QgsGrassProvider::description()
QgsGrassLocationItem::QgsGrassLocationItem ( QgsDataItem* parent, QString path )
: QgsDataCollectionItem ( parent, "", path )
{
QFileInfo fi ( path );
mName =fi.baseName();
mIcon = QIcon ( getThemePixmap ( "grass_location.png" ) );
}
QgsGrassLocationItem::~QgsGrassLocationItem () {}
bool QgsGrassLocationItem::isLocation ( QString path )
{
//QgsDebugMsg( "path = " + path );
return QFile::exists( path + QDir::separator() + "PERMANENT" + QDir::separator() + "DEFAULT_WIND" );
}
QVector<QgsDataItem*>QgsGrassLocationItem::createChildren()
{
QVector<QgsDataItem*> mapsets;
QDir dir( mPath );
QStringList entries = dir.entryList( QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name );
foreach( QString name, entries )
{
QString path = dir.absoluteFilePath( name );
if ( QgsGrassMapsetItem::isMapset ( path ) )
{
QgsGrassMapsetItem * mapset = new QgsGrassMapsetItem ( this, path );
mapsets.append ( mapset );
}
}
return mapsets;
}
QgsGrassMapsetItem::QgsGrassMapsetItem ( QgsDataItem* parent, QString path )
: QgsDataCollectionItem ( parent, "", path )
{
QDir dir( path );
mName = dir.dirName();
dir.cdUp();
mLocation = dir.dirName();
dir.cdUp();
mGisdbase = dir.path();
mIcon = QIcon ( getThemePixmap ( "grass_mapset.png" ) );
}
QgsGrassMapsetItem::~QgsGrassMapsetItem () {}
bool QgsGrassMapsetItem::isMapset ( QString path )
{
return QFile::exists( path + QDir::separator() + "WIND" );
}
QVector<QgsDataItem*> QgsGrassMapsetItem::createChildren()
{
QVector<QgsDataItem*> items;
QStringList vectorNames = QgsGrass::vectors( mPath );
foreach( QString name, vectorNames )
{
QStringList layerNames = QgsGrass::vectorLayers( mGisdbase , mLocation, mName, name );
QString path = mPath + QDir::separator() + "vector" + QDir::separator() + name;
QgsDataCollectionItem *map;
if ( layerNames.size() != 1 ) map = new QgsDataCollectionItem( this, name );
foreach( QString layerName, layerNames )
{
QString uri = mPath + QDir::separator() + name + QDir::separator() +layerName;
QgsLayerItem::LayerType layerType = QgsLayerItem::Vector;
QString typeName = layerName.split("_")[1];
QString baseLayerName = layerName.split("_")[0];
if ( typeName == "point" ) layerType = QgsLayerItem::Point;
else if ( typeName == "line" ) layerType = QgsLayerItem::Line;
else if ( typeName == "polygon" ) layerType = QgsLayerItem::Polygon;
if ( layerNames.size() == 1 )
{
QgsLayerItem *layer = new QgsLayerItem ( this, name + " " + baseLayerName, path, uri, layerType, "grass" );
items.append( layer );
}
else
{
QgsLayerItem *layer = new QgsLayerItem ( map, baseLayerName, path, uri, layerType, "grass" );
map->addChild( layer );
}
}
if ( layerNames.size() != 1 ) items.append( map );
}
QStringList rasterNames = QgsGrass::rasters( mPath );
foreach( QString name, rasterNames )
{
QString uri = mPath + QDir::separator() + "cellhd" + QDir::separator() + name;
QgsDebugMsg ( "uri = " + uri );
QgsLayerItem *layer = new QgsLayerItem ( this, name, uri, uri, QgsLayerItem::Raster, "grassraster" );
items.append( layer );
}
return items;
}
QGISEXTERN int dataCapabilities () {
return QgsDataProvider::Dir;
}
QGISEXTERN QgsDataItem * dataItem ( QString thePath, QgsDataItem* parentItem )
{
if ( QgsGrassLocationItem::isLocation ( thePath ) )
{
QgsGrassLocationItem * location = new QgsGrassLocationItem ( parentItem, thePath );
return location;
}
return 0;
}

29
src/providers/grass/qgsgrassprovider.h
View File

@ -18,8 +18,9 @@
class QgsFeature;
class QgsField;
#include <QDateTime>
#include "qgsdataitem.h"
#include "qgsvectordataprovider.h"
#include <vector>
@ -685,4 +686,30 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
static std::vector<GMAP> mMaps; // Map
};
class QgsGrassLocationItem : public QgsDataCollectionItem
{
public:
QgsGrassLocationItem (QgsDataItem* parent, QString path );
~QgsGrassLocationItem();
static bool isLocation ( QString path );
QVector<QgsDataItem*> createChildren();
};
class QgsGrassMapsetItem : public QgsDataCollectionItem
{
public:
QgsGrassMapsetItem (QgsDataItem* parent, QString path );
~QgsGrassMapsetItem();
static bool isMapset ( QString path );
QVector<QgsDataItem*> createChildren();
QString mLocation;
QString mGisdbase;
};
#endif // QGSGRASSPROVIDER_H