Skip to content
Snippets Groups Projects
Commit c502e2c1 authored by Mirko Waechter's avatar Mirko Waechter
Browse files

Merge branch 'StatechartViewerV2'

* StatechartViewerV2:
  Caught some more exceptions in plotter
parents 83174751 41d27be3
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <Core/observers/ObserverObjectFactories.h> #include <Core/observers/ObserverObjectFactories.h>
#include <Core/observers/variant/DataFieldIdentifier.h> #include <Core/observers/variant/DataFieldIdentifier.h>
#include "ArmarXPlotterDialog.h" #include "ArmarXPlotterDialog.h"
#include <Core/observers/exceptions/local/InvalidChannelException.h>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
...@@ -370,6 +371,12 @@ namespace armarx ...@@ -370,6 +371,12 @@ namespace armarx
catch(Ice::NotRegisteredException &e){ catch(Ice::NotRegisteredException &e){
ARMARX_WARNING << deactivateSpam(3) << "Caught Exception: " << e.what(); ARMARX_WARNING << deactivateSpam(3) << "Caught Exception: " << e.what();
} }
catch(exceptions::local::InvalidDataFieldException &e){
ARMARX_WARNING << deactivateSpam(5) << "Caught InvalidDataFieldException: " << e.what();
}
catch(exceptions::local::InvalidChannelException &e){
ARMARX_WARNING << deactivateSpam(5) << "Caught InvalidDataFieldException: " << e.what();
}
catch(...) catch(...)
{ {
handleExceptions(); handleExceptions();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment