Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Catch geos exception in main event loop #4309

Merged
merged 2 commits into from
Mar 29, 2017
Merged

Catch geos exception in main event loop #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6431175
Catch geos exceptions
m-kuhn Mar 28, 2017
2ddcd38
Catch geos exception in event loop
m-kuhn Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions src/core/geometry/qgsgeos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,42 +250,14 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine

/// @cond PRIVATE

class GEOSException // clazy:exclude=rule-of-three

class GEOSException : public std::runtime_error
{
public:
explicit GEOSException( const QString &message )
: std::runtime_error( message.toUtf8().constData() )
{
if ( message == QLatin1String( "Unknown exception thrown" ) && lastMsg().isNull() )
{
msg = message;
}
else
{
msg = message;
lastMsg() = msg;
}
}

// copy constructor
GEOSException( const GEOSException &rhs )
{
*this = rhs;
}

~GEOSException()
{
if ( lastMsg() == msg )
lastMsg() = QString::null;
}

QString what()
{
return msg;
}

private:
QString msg;
static QString &lastMsg() { static QString sLastMsg; return sLastMsg; }
};

/// @endcond
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgstracer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ bool QgsTracer::initGraph()

mHasTopologyProblem = true;

QgsDebugMsg( "Tracer Noding Exception: " + e.what() );
QgsDebugMsg( QString( "Tracer Noding Exception: %1" ).arg( e.what() ) );
}
#endif

Expand Down