Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
QgsError for better error propagation to user, started using for rasters
- Loading branch information
Showing
27 changed files
with
732 additions
and
254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
/*************************************************************************** | ||
qgserror.cpp - Error container | ||
------------------- | ||
begin : October 2012 | ||
copyright : (C) 2012 Radim Blazek | ||
email : radim dot blazek at gmail dot com | ||
***************************************************************************/ | ||
|
||
/*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* it under the terms of the GNU General Public License as published by * | ||
* the Free Software Foundation; either version 2 of the License, or * | ||
* (at your option) any later version. * | ||
* * | ||
***************************************************************************/ | ||
#include "qgis.h" | ||
#include "qgsversion.h" | ||
#include "qgsconfig.h" | ||
#include "qgserror.h" | ||
#include "qgslogger.h" | ||
|
||
#include <QRegExp> | ||
|
||
QgsErrorMessage::QgsErrorMessage ( const QString & theMessage, const QString & theTag, const QString & theFile, const QString & theFunction, int theLine ) | ||
: mMessage(theMessage) | ||
, mTag(theTag) | ||
, mFile(theFile) | ||
, mFunction(theFunction) | ||
, mLine(theLine) | ||
, mFormat(Text) | ||
{ | ||
} | ||
|
||
QgsError::QgsError ( const QString & theMessage, const QString & theTag ) | ||
{ | ||
append ( theMessage, theTag ); | ||
} | ||
|
||
void QgsError::append ( const QString & theMessage, const QString & theTag ) | ||
{ | ||
mMessageList.append ( QgsErrorMessage ( theMessage, theTag ) ); | ||
} | ||
|
||
void QgsError::append ( const QgsErrorMessage & theMessage ) | ||
{ | ||
mMessageList.append ( theMessage ); | ||
} | ||
|
||
QString QgsError::message ( QgsErrorMessage::Format theFormat ) const | ||
{ | ||
QString str; | ||
int sPrefixLength = strlen( CMAKE_SOURCE_DIR ) + 1; | ||
|
||
QString srcUrl; | ||
#if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL) | ||
// TODO: verify if we are not ahead to origin (remote hash does not exist) | ||
// and there are no local not commited changes | ||
QString hash = QString(QGis::QGIS_DEV_VERSION); | ||
QString remote = QString(QGS_GIT_REMOTE_URL); | ||
QgsDebugMsg ("remote = " + remote ); | ||
if ( !hash.isEmpty () && !remote.isEmpty() && remote.contains ( "github.com" ) ) | ||
{ | ||
QString path = remote.remove( QRegExp(".*github.com[:/]" )).remove(".git"); | ||
srcUrl = "https://github.com/" + path + "/blob/" + hash; | ||
} | ||
#endif | ||
|
||
foreach ( QgsErrorMessage m, mMessageList ) | ||
{ | ||
#ifdef QGISDEBUG | ||
QString file; | ||
#ifndef _MSC_VER | ||
file = m.file().mid(sPrefixLength); | ||
#else | ||
file = m.file(); | ||
#endif | ||
#endif | ||
|
||
if ( theFormat == QgsErrorMessage::Text ) | ||
{ | ||
str += m.tag() + " " + m.message(); | ||
#ifdef QGISDEBUG | ||
str += QString( "\nat %1 : %2 : %3" ).arg( file ).arg( m.line() ).arg( m.function() ); | ||
#endif | ||
} | ||
else // QgsErrorMessage::Html | ||
{ | ||
str += "<p><b>" + m.tag() + ":</b> " + m.message(); | ||
#ifdef QGISDEBUG | ||
QString location = QString( "%1 : %2 : %3" ).arg( file ).arg( m.line() ).arg( m.function() ); | ||
if ( !srcUrl.isEmpty() ) | ||
{ | ||
QString url = QString("%1/%2#L%3").arg(srcUrl).arg(file).arg( m.line() ); | ||
str += QString( "<br>(<a href='%1'>%2</a>)" ).arg(url).arg( location ); | ||
} | ||
else | ||
{ | ||
str += QString( "<br>(%1)" ).arg( location ); | ||
} | ||
#endif | ||
} | ||
} | ||
return str; | ||
} | ||
|
||
QString QgsError::summary ( ) const | ||
{ | ||
// The first message in chain is usually the real error given by backend/server | ||
return mMessageList.first().message(); | ||
} |
Oops, something went wrong.