Skip to content

Commit

Permalink
[GRASS] removed warnings from raster provider
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Oct 5, 2015
1 parent 6d2367f commit 32e6d9c
Show file tree
Hide file tree
Showing 7 changed files with 144 additions and 65 deletions.
6 changes: 4 additions & 2 deletions src/plugins/grass/qgsgrassregion.cpp
View file
Expand Up @@ -41,7 +41,8 @@ QgsGrassRegionEdit::QgsGrassRegionEdit( QgsMapCanvas* canvas )
mDraw = false;
mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
mSrcRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
mCrs = QgsGrass::crs( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation() );
QString error;
mCrs = QgsGrass::crs( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), error );
QgsDebugMsg( "mCrs: " + mCrs.toWkt() );
setTransform();
connect( canvas, SIGNAL( destinationCrsChanged() ), this, SLOT( setTransform() ) );
Expand Down Expand Up @@ -312,7 +313,8 @@ void QgsGrassRegion::mapsetChanged()
mRegionEdit = new QgsGrassRegionEdit( mCanvas );
connect( mRegionEdit, SIGNAL( captureEnded() ), this, SLOT( onCaptureFinished() ) );

mCrs = QgsGrass::crs( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation() );
QString error;
mCrs = QgsGrass::crs( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), error );
reloadRegion();
}
}
Expand Down
36 changes: 16 additions & 20 deletions src/providers/grass/qgsgrass.cpp
View file
Expand Up @@ -1847,7 +1847,7 @@ QString QgsGrass::getInfo( const QString& info, const QString& gisdbase,
}

QgsCoordinateReferenceSystem QgsGrass::crs( const QString& gisdbase, const QString& location,
bool interactive )
QString &error )
{
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem();
Expand All @@ -1860,10 +1860,8 @@ QgsCoordinateReferenceSystem QgsGrass::crs( const QString& gisdbase, const QStri
}
catch ( QgsGrass::Exception &e )
{
if ( interactive )
{
warning( tr( "Cannot get projection " ) + "\n" + e.what() );
}
error = tr( "Cannot get projection " ) + "\n" + e.what();
QgsDebugMsg( error );
}

return crs;
Expand Down Expand Up @@ -1910,7 +1908,7 @@ QgsCoordinateReferenceSystem QgsGrass::crsDirect( const QString& gisdbase, const

QgsRectangle QgsGrass::extent( const QString& gisdbase, const QString& location,
const QString& mapset, const QString& map,
QgsGrassObject::Type type, bool interactive )
QgsGrassObject::Type type, QString &error )
{
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );

Expand All @@ -1926,16 +1924,13 @@ QgsRectangle QgsGrass::extent( const QString& gisdbase, const QString& location,
}
catch ( QgsGrass::Exception &e )
{
if ( interactive )
{
warning( tr( "Cannot get raster extent" ) + "\n" + e.what() );
}
error = tr( "Cannot get raster extent" ) + " : " + e.what();
}
return QgsRectangle( 0, 0, 0, 0 );
}

void QgsGrass::size( const QString& gisdbase, const QString& location,
const QString& mapset, const QString& map, int *cols, int *rows )
void QgsGrass::size( const QString& gisdbase, const QString& location, const QString& mapset,
const QString& map, int *cols, int *rows, QString &error )
{
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );

Expand All @@ -1954,7 +1949,8 @@ void QgsGrass::size( const QString& gisdbase, const QString& location,
}
catch ( QgsGrass::Exception &e )
{
warning( tr( "Cannot get raster extent" ) + "\n" + e.what() );
error = tr( "Cannot get raster extent" ) + " : " + e.what();
QgsDebugMsg( error );
}

QgsDebugMsg( QString( "raster size = %1 %2" ).arg( *cols ).arg( *rows ) );
Expand All @@ -1966,7 +1962,7 @@ QHash<QString, QString> QgsGrass::info( const QString& gisdbase, const QString&
const QString& info,
const QgsRectangle& extent,
int sampleRows, int sampleCols,
int timeOut, bool interactive )
int timeOut, QString &error )
{
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
QHash<QString, QString> inf;
Expand All @@ -1990,15 +1986,14 @@ QHash<QString, QString> QgsGrass::info( const QString& gisdbase, const QString&
}
catch ( QgsGrass::Exception &e )
{
if ( interactive )
{
warning( tr( "Cannot get map info" ) + "\n" + e.what() );
}
error = tr( "Cannot get map info" ) + "\n" + e.what();
QgsDebugMsg( error );
}
return inf;
}

QList<QgsGrass::Color> QgsGrass::colors( QString gisdbase, QString location, QString mapset, QString map )
QList<QgsGrass::Color> QgsGrass::colors( QString gisdbase, QString location, QString mapset,
QString map, QString& error )
{
QgsDebugMsg( QString( "gisdbase = %1 location = %2" ).arg( gisdbase ).arg( location ) );
QList<QgsGrass::Color> ct;
Expand All @@ -2022,7 +2017,8 @@ QList<QgsGrass::Color> QgsGrass::colors( QString gisdbase, QString location, QSt
}
catch ( QgsGrass::Exception &e )
{
warning( tr( "Cannot get colors" ) + "\n" + e.what() );
error = tr( "Cannot get colors" ) + " : " + e.what();
QgsDebugMsg( error );
}
return ct;
}
Expand Down
24 changes: 12 additions & 12 deletions src/providers/grass/qgsgrass.h
View file
Expand Up @@ -411,35 +411,35 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject
int sampleCols = 0, int timeOut = 30000 );

// ! Get location projection
static QgsCoordinateReferenceSystem crs( const QString& gisdbase, const QString& location, bool interactive = true );
static QgsCoordinateReferenceSystem crs( const QString& gisdbase, const QString& location, QString &error );

// ! Get location projection calling directly GRASS library
static QgsCoordinateReferenceSystem crsDirect( const QString& gisdbase, const QString& location );

// ! Get map extent
// @param interactive - show warning dialog on error
// @param error set to error if happens
static QgsRectangle extent( const QString& gisdbase, const QString& location,
const QString& mapset, const QString& map,
QgsGrassObject::Type type = QgsGrassObject::None, bool interactive = true );
QgsGrassObject::Type type, QString &error );

// ! Get raster map size
static void size( const QString& gisdbase, const QString& location,
const QString& mapset, const QString& map, int *cols, int *rows );
static void size( const QString& gisdbase, const QString& location, const QString& mapset,
const QString& map, int *cols, int *rows, QString &error );

// ! Get raster info, info is either 'info' or 'stats'
// extent and sampleSize are stats options
// @param interactive - show warning dialog on error
// @param error set to error if happens
static QHash<QString, QString> info( const QString& gisdbase, const QString& location,
const QString& mapset, const QString& map,
QgsGrassObject::Type type,
const QString& info = "info",
const QgsRectangle& extent = QgsRectangle(),
int sampleRows = 0, int sampleCols = 0,
int timeOut = 30000, bool interactive = true );
const QString& info,
const QgsRectangle& extent,
int sampleRows, int sampleCols,
int timeOut, QString &error );

// ! List of Color
static QList<QgsGrass::Color> colors( QString gisdbase, QString location,
QString mapset, QString map );
static QList<QgsGrass::Color> colors( QString gisdbase, QString location, QString mapset,
QString map, QString& error );

// ! Get map value / feature info
static QMap<QString, QString> query( QString gisdbase, QString location,
Expand Down
3 changes: 2 additions & 1 deletion src/providers/grass/qgsgrassprovider.cpp
View file
Expand Up @@ -443,7 +443,8 @@ bool QgsGrassProvider::isValid()

QgsCoordinateReferenceSystem QgsGrassProvider::crs()
{
return QgsGrass::crs( mGrassObject.gisdbase(), mGrassObject.location() );
QString error;
return QgsGrass::crs( mGrassObject.gisdbase(), mGrassObject.location(), error );
}

int QgsGrassProvider::grassLayer()
Expand Down
96 changes: 74 additions & 22 deletions src/providers/grass/qgsgrassrasterprovider.cpp
View file
Expand Up @@ -44,6 +44,8 @@
static QString PROVIDER_KEY = "grassraster";
static QString PROVIDER_DESCRIPTION = QString( "GRASS %1 raster provider" ).arg( GRASS_VERSION_MAJOR );

// Do not use warning dialogs, providers are also created on threads (rendering) where dialogs connot be used (constructing QPixmap icon)

QgsGrassRasterProvider::QgsGrassRasterProvider( QString const & uri )
: QgsRasterDataProvider( uri )
, mValid( false )
Expand Down Expand Up @@ -94,14 +96,21 @@ QgsGrassRasterProvider::QgsGrassRasterProvider( QString const & uri )
mRasterValue.start( mGisdbase, mLocation, mMapset, mMapName );
//mValidNoDataValue = true;

mCrs = QgsGrass::crs( mGisdbase, mLocation );
QString error;
mCrs = QgsGrass::crs( mGisdbase, mLocation, error );
appendIfError( error );
QgsDebugMsg( "mCrs: " + mCrs.toWkt() );

// the block size can change of course when the raster is overridden
// ibut it is only called once when statistics are calculated
QgsGrass::size( mGisdbase, mLocation, mMapset, mMapName, &mCols, &mRows );
error.clear();
QgsGrass::size( mGisdbase, mLocation, mMapset, mMapName, &mCols, &mRows, error );
appendIfError( error );

mInfo = QgsGrass::info( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster );
error.clear();
mInfo = QgsGrass::info( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster,
"info", QgsRectangle(), 0, 0, 3000, error );
appendIfError( error );

mGrassDataType = mInfo["TYPE"].toInt();
QgsDebugMsg( "mGrassDataType = " + QString::number( mGrassDataType ) );
Expand Down Expand Up @@ -177,6 +186,7 @@ QImage* QgsGrassRasterProvider::draw( QgsRectangle const & viewExtent, int pixe
QgsDebugMsg( "pixelWidth = " + QString::number( pixelWidth ) );
QgsDebugMsg( "pixelHeight = " + QString::number( pixelHeight ) );
QgsDebugMsg( "viewExtent: " + viewExtent.toString() );
clearLastError();

QImage *image = new QImage( pixelWidth, pixelHeight, QImage::Format_ARGB32 );
image->fill( QColor( Qt::gray ).rgb() );
Expand All @@ -198,9 +208,9 @@ QImage* QgsGrassRasterProvider::draw( QgsRectangle const & viewExtent, int pixe
}
catch ( QgsGrass::Exception &e )
{
QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n"
+ e.what() );

QString error = tr( "Cannot draw raster" ) + " : " + e.what();
QgsDebugMsg( error );
appendError( error );
// We don't set mValid to false, because the raster can be recreated and work next time
return image;
}
Expand All @@ -219,6 +229,7 @@ void QgsGrassRasterProvider::readBlock( int bandNo, int xBlock, int yBlock, void
{
Q_UNUSED( xBlock );
QgsDebugMsg( "Entered" );
clearLastError();
// TODO: optimize, see extent()

QgsDebugMsg( "yBlock = " + QString::number( yBlock ) );
Expand Down Expand Up @@ -251,9 +262,9 @@ void QgsGrassRasterProvider::readBlock( int bandNo, int xBlock, int yBlock, void
}
catch ( QgsGrass::Exception &e )
{
QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n"
+ e.what() );

QString error = tr( "Cannot read raster" ) + " : " + e.what();
QgsDebugMsg( error );
appendError( error );
// We don't set mValid to false, because the raster can be recreated and work next time
}
QgsDebugMsg( QString( "%1 bytes read from modules stdout" ).arg( data.size() ) );
Expand All @@ -263,8 +274,9 @@ void QgsGrassRasterProvider::readBlock( int bandNo, int xBlock, int yBlock, void
QgsDebugMsg( QString( "mCols = %1 mYBlockSize = %2 dataTypeSize = %3" ).arg( mCols ).arg( mYBlockSize ).arg( dataTypeSize( bandNo ) ) );
if ( size != data.size() )
{
QMessageBox::warning( 0, QObject::tr( "Warning" ),
QString( "%1 bytes expected but %2 byte were read from qgis.d.rast" ).arg( size ).arg( data.size() ) );
QString error = tr( "%1 bytes expected but %2 byte were read from qgis.d.rast" ).arg( size ).arg( data.size() );
QgsDebugMsg( error );
appendError( error );
size = size < data.size() ? size : data.size();
}
memcpy( block, data.data(), size );
Expand All @@ -276,6 +288,7 @@ void QgsGrassRasterProvider::readBlock( int bandNo, QgsRectangle const & viewEx
QgsDebugMsg( "pixelWidth = " + QString::number( pixelWidth ) );
QgsDebugMsg( "pixelHeight = " + QString::number( pixelHeight ) );
QgsDebugMsg( "viewExtent: " + viewExtent.toString() );
clearLastError();

if ( pixelWidth <= 0 || pixelHeight <= 0 )
return;
Expand All @@ -298,8 +311,9 @@ void QgsGrassRasterProvider::readBlock( int bandNo, QgsRectangle const & viewEx
}
catch ( QgsGrass::Exception &e )
{
QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n"
+ e.what() );
QString error = tr( "Cannot read raster" ) + " : " + e.what();
QgsDebugMsg( error );
appendError( error );

// We don't set mValid to false, because the raster can be recreated and work next time
return;
Expand All @@ -310,8 +324,9 @@ void QgsGrassRasterProvider::readBlock( int bandNo, QgsRectangle const & viewEx
int size = pixelWidth * pixelHeight * dataTypeSize( bandNo );
if ( size != data.size() )
{
QMessageBox::warning( 0, QObject::tr( "Warning" ),
QString( "%1 bytes expected but %2 byte were read from qgis.d.rast" ).arg( size ).arg( data.size() ) );
QString error = tr( "%1 bytes expected but %2 byte were read from qgis.d.rast" ).arg( size ).arg( data.size() );
QgsDebugMsg( error );
appendError( error );
size = size < data.size() ? size : data.size();
}
memcpy( block, data.data(), size );
Expand Down Expand Up @@ -341,9 +356,11 @@ QgsRasterBandStats QgsGrassRasterProvider::bandStatistics( int theBandNo, int th
// 0.001 / cell should be sufficient using 0.005 to be sure + constant (ms)
int timeout = 30000 + 0.005 * xSize() * ySize();

QHash<QString, QString> info = QgsGrass::info( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster, "stats", extent, sampleRows, sampleCols, timeout );
QString error;
QHash<QString, QString> info = QgsGrass::info( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster,
"stats", extent, sampleRows, sampleCols, timeout, error );

if ( info.isEmpty() )
if ( info.isEmpty() || !error.isEmpty() )
{
return myRasterBandStats;
}
Expand Down Expand Up @@ -381,7 +398,12 @@ QList<QgsColorRampShader::ColorRampItem> QgsGrassRasterProvider::colorTable( int
// for now we just believe that they are continuous, i.e. end and beginning
// of the ramp with the same value has the same color
// we are also expecting ordered CT records in the list
QList<QgsGrass::Color> colors = QgsGrass::colors( mGisdbase, mLocation, mMapset, mMapName );
QString error;
QList<QgsGrass::Color> colors = QgsGrass::colors( mGisdbase, mLocation, mMapset, mMapName, error );
if ( !error.isEmpty() )
{
return ct;
}
QList<QgsGrass::Color>::iterator i;

double v = 0.0, r = 0.0, g = 0.0, b = 0.0;
Expand Down Expand Up @@ -419,7 +441,8 @@ QgsRectangle QgsGrassRasterProvider::extent()
// The extend can change of course so we get always fresh, to avoid running always the module
// we should save mExtent and mLastModified and check if the map was modified

mExtent = QgsGrass::extent( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster );
QString error;
mExtent = QgsGrass::extent( mGisdbase, mLocation, mMapset, mMapName, QgsGrassObject::Raster, error );

QgsDebugMsg( "Extent got" );
return mExtent;
Expand Down Expand Up @@ -561,14 +584,34 @@ bool QgsGrassRasterProvider::isValid()
return mValid;
}

void QgsGrassRasterProvider::setLastError( QString error )
{
mLastErrorTitle = tr( "GRASS raster provider" );
mLastError = error;
}

void QgsGrassRasterProvider::clearLastError()
{
mLastErrorTitle.clear();
mLastError.clear();
}

void QgsGrassRasterProvider::appendIfError( QString error )
{
if ( !error.isEmpty() )
{
appendError( ERR( error ) );
}
}

QString QgsGrassRasterProvider::lastErrorTitle()
{
return QString( "Not implemented" );
return mLastErrorTitle;
}

QString QgsGrassRasterProvider::lastError()
{
return QString( "Not implemented" );
return mLastError;
}

QString QgsGrassRasterProvider::name() const
Expand Down Expand Up @@ -647,7 +690,16 @@ void QgsGrassRasterValue::start( QString gisdbase, QString location,

arguments.append( "info=query" );
arguments.append( "rast=" + mMapName + "@" + mMapset );
mProcess = QgsGrass::startModule( mGisdbase, mLocation, mMapset, module, arguments, mGisrcFile );
try
{
mProcess = QgsGrass::startModule( mGisdbase, mLocation, mMapset, module, arguments, mGisrcFile );
}
catch ( QgsGrass::Exception &e )
{
QString error = e.what();
Q_UNUSED( error )
QgsDebugMsg( error );
}
}
QgsGrassRasterValue::~QgsGrassRasterValue()
{
Expand Down

0 comments on commit 32e6d9c

Please sign in to comment.