Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp

@@ -545,46 +545,51 @@ namespace armarx
 
             for (int i = 0; i < selectedChannels.size(); i++)
             {
-                ARMARX_VERBOSE << "Channel: " << selectedChannels.at(i).toStdString() << flush;
-                DataFieldIdentifierPtr identifier = new DataFieldIdentifier(selectedChannels.at(i).toStdString());
-                auto prx = getProxy<ObserverInterfacePrx>(identifier->observerName);
-
-                VariantPtr var = VariantPtr::dynamicCast(prx->getDataField(identifier));
-
-                if (VariantType::IsBasicType(var->getType()))
+                try
                 {
-                    QwtPlotCurve* curve = createCurve(selectedChannels.at(i));
-                    curves[selectedChannels.at(i).toStdString()] = curve;
-
-                    QwtThermo* bar = createBar(selectedChannels.at(i));
-                    bars[selectedChannels.at(i).toStdString()] = bar;
+                    ARMARX_VERBOSE << "Channel: " << selectedChannels.at(i).toStdString() << flush;
+                    DataFieldIdentifierPtr identifier = new DataFieldIdentifier(selectedChannels.at(i).toStdString());
+                    auto prx = getProxy<ObserverInterfacePrx>(identifier->observerName);
 
+                    VariantPtr var = VariantPtr::dynamicCast(prx->getDataField(identifier));
 
-                }
-                else
-                {
-                    auto id = identifier->getIdentifierStr();
-                    ARMARX_IMPORTANT << id;
-                    auto dict = JSONObject::ConvertToBasicVariantMap(json, var);
+                    if (VariantType::IsBasicType(var->getType()))
+                    {
+                        QwtPlotCurve* curve = createCurve(selectedChannels.at(i));
+                        curves[selectedChannels.at(i).toStdString()] = curve;
 
-                    for (auto e : dict)
+                        QwtThermo* bar = createBar(selectedChannels.at(i));
+                        bars[selectedChannels.at(i).toStdString()] = bar;
+                    }
+                    else
                     {
-                        VariantTypeId type = e.second->getType();
+                        auto id = identifier->getIdentifierStr();
+                        ARMARX_IMPORTANT << id;
+                        auto dict = JSONObject::ConvertToBasicVariantMap(json, var);
 
-                        if (type == VariantType::Double
-                            || type == VariantType::Float
-                            || type == VariantType::Int)
+                        for (auto e : dict)
                         {
-                            std::string key = id + "." + e.first;
-                            ARMARX_INFO << key << ": " << *VariantPtr::dynamicCast(e.second);
-                            QwtPlotCurve* curve = createCurve(QString::fromStdString(key));
-                            curves[key] = curve;
+                            VariantTypeId type = e.second->getType();
+
+                            if (type == VariantType::Double
+                                    || type == VariantType::Float
+                                    || type == VariantType::Int)
+                            {
+                                std::string key = id + "." + e.first;
+                                ARMARX_INFO << key << ": " << *VariantPtr::dynamicCast(e.second);
+                                QwtPlotCurve* curve = createCurve(QString::fromStdString(key));
+                                curves[key] = curve;
 
-                            QwtThermo* bar = createBar(QString::fromStdString(key));
-                            bars[key] = bar;
+                                QwtThermo* bar = createBar(QString::fromStdString(key));
+                                bars[key] = bar;
+                            }
                         }
                     }
                 }
+                catch(...)
+                {
+                    handleExceptions();
+                }
             }
 
             ui.qwtPlot->replot();